Commit Graph

7166 Commits

Author SHA1 Message Date
Xhuis bb54a75d58 Fixes overlays 2015-04-30 20:59:50 -04:00
Xhuis 37d631ca57 Fixes conflicts 2015-04-30 20:40:09 -04:00
astralenigma d84bfc0f2b Putting all on github now.
Only crates is missing the overlay of the manifesto.
2015-05-01 00:33:21 +01:00
Xhuis a8222d9c50 Merge remote-tracking branch 'remotes/upstream/master' into cannons 2015-04-30 18:52:27 -04:00
Xhuis 577c68208a Adds sprites and does some polishing 2015-04-30 18:51:03 -04:00
Ikarrus 0615b4e09a Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTcodes 2015-04-30 08:56:46 -06:00
Ikarrus 68d4ffaf3f uncommitted files (+5 squashed commit)
Squashed commit:

[971e023] Lets try loosening the restrictions on territory tagging

[c55a30d] Reduced pen cost to 40

[2b83dca] Formatting and changelog

[1fe81a8] Let's make the message slightly less gamey

[3067acc] Changeloggery
2015-04-29 20:28:28 -06:00
Ikarrus 2b83dca4c5 Formatting and changelog 2015-04-29 19:29:15 -06:00
Ikarrus 1fe81a8e39 Let's make the message slightly less gamey 2015-04-29 19:21:39 -06:00
Incoming 7459238065 Merge branch 'master' of https://github.com/tgstation/-tg-station into begone_ye_jellies
Conflicts:
	code/game/machinery/teleporter.dm
2015-04-29 13:37:01 -04:00
kingofkosmos 8eec4c9199 Mop can now be wetted in the sink. 2015-04-29 20:19:41 +03:00
kingofkosmos 945df91164 Merge branch 'master' of https://github.com/tgstation/-tg-station into mopbucket 2015-04-29 18:56:57 +03:00
kingofkosmos 1f5cb56ff7 Bucket's attackby-procs combined. 2015-04-29 18:45:45 +03:00
Cheridan 64b5f8540c Merge pull request #9164 from Fayrik/TheNanoing
The Nanoing (Part One: Atmospherics)
2015-04-29 09:38:56 -05:00
Firecage 03ca264eb1 Allows you to buckle people to an operating table. 2015-04-29 16:04:22 +02:00
Cheridan 36df27ad53 Merge pull request #9205 from phil235/SpiderKnifeFixes
Spiders and kitchen tool fixes
2015-04-29 08:23:10 -05:00
MrStonedOne bd6d51a0b5 Massive MC and subsystem rewrite
MC:
	No longer tracks a subsystem's cpu usage. This was basically worthless and took up space on the stat panel
	Can calculate wait down to a tenth of a decisecond to make it fps/world.ticklag agnostic
	Now allows subsystems to have a dynamic wait, that is based on a ratio of how long that subsystem has been taking to process(cost). (This system allows for upper and lower bounds, and an changeable cost delta for each subsystem)
	MC can now be told to init a zlevel

All Subsystems:
	Stats panel now allows child subsystems to pass it a message to add to its stats entry. All subsystems have been moved over to this system - This should cut down on subsystems having to copy and paste the stats proc in order to add to it
	All subsystems now properlly handle being given a zlevel in their init proc

Subsystem changes:
	Air:
		Added air to the dynamic wait subsystem. upper bound: 50, lower bound: 5, cost delta: 3 times process cost
		Air now fires 4 times faster when it can do so without lagging things up
		Pipenet has been merged into air
		Atmos machinery now processes with process_atmos(), ticked by air, not machinery.
		Hotspots (the fire object) are now object pooled
	Pipenet:
		Deleted, added to air
	Machinery:
		Moved all atmos calcualtions in all objects's process() to process_atmos().
	Lighting:
		Added Lighting to the dynamic wait subsystem. upper bound: 20, lower bound: 5, cost delta: 3 times process cost
	Ticker:
		Fixed ticker not updating the lobby panel when game start delayed
		Fixed the game start timer updating rapidly from queued fires when game start delay is removed
	Garbage/qdel:
		qdel will now limit its process time to 2ds a fire.
		qdel can now be given hints as a return to Destroy() as to what should be done with the object.
		the options are:
			queue: (default) this is the normal behavior.
			letmelive: old default to non-null/zero. does nothing with the object
			iwillgc: functionally the same as above, mainly to let people working with objects know that the object will not be queued for GC checking
			harddel: this will queue the object to be deleted without storing a soft reference, mainly to save locate() processing time.
			harddel_now: this will del() the object. To allow for a clean removal of every del() not in qdel
		All objects have been updated to the new system, harddel and iwillgc was not added to any new objects.
		Fixed some objects not GCing because they didn't properlly clear references in Destory()
		Fixed some objects getting qdel'ed preventing other objects from getting GCed because they did not null their reference to that object.
2015-04-29 02:00:25 -07:00
Ikarrus fceaa8f969 Gang Update
- Bosses can now summon their gangsters to a location with the gangtool
- Gangtools cannot recall the shuttle if the station is too damaged (<70% Integrity)
- Fixed SSshuttle.emergencyLastCallLoc not being handled or stored properly. Fukken Carn breaking my shuttle features.
- Fixed a potential injection exploit in gangtool's can_use()
- Jobbanned players cannot be promoted
2015-04-28 22:25:55 -06:00
phil235 9b90645cec Merge pull request #9199 from TheVekter/buggate2015
Buggate 2015 PART 1: Slimes, drinks, and more!
2015-04-28 22:01:13 +02:00
phil235 e846b9c21d Merge pull request #9195 from TheVekter/stunofholding
No longer able to BoH bomb while stunned
2015-04-28 21:57:07 +02:00
Remie Richards fca3c0bdb5 Adds Plasmamen! Adds the ability for species to breathe other gases! 2015-04-28 20:48:14 +01:00
xxalpha 832bca822f Fixes world hunger. 2015-04-28 20:13:59 +01:00
Jordie 877e2e8f56 Merge pull request #9176 from JJRcop/TEAenhancement
TED and Chronosuit tweaks
2015-04-28 23:49:40 +10:00
Jordie ba0f89b7f1 Merge pull request #9186 from phil235/AutoDrobeSupplyFix
Autodrobe and cult construct bugfixes
2015-04-28 23:49:20 +10:00
Jordie 4da4d09ffb Merge pull request #9190 from phil235/XenoManipFix
Xenomorphs with has_fine_manipulation  can now pick up even big items
2015-04-28 23:48:46 +10:00
Jordie 29a56c547d Merge pull request #9150 from AndroidSFV/Carpops
Carp Ops: Team-Building Edition
2015-04-28 23:48:13 +10:00
Jordie 4463bcfec3 Merge pull request #9193 from Ikarrus/gang5.1
Gang Update 5.1
2015-04-28 23:46:27 +10:00
Jordie 641db847cc Merge pull request #9133 from phil235/ClownNamePreferences
Changes clown/mime naming to use preferences.
2015-04-28 23:45:52 +10:00
Jordie 6bbc274789 Merge pull request #9073 from RemieRichards/DrawPixel
Adds DrawPixel() + Easels + Canvases!
2015-04-28 23:45:38 +10:00
Jordie0608 a6b3deda96 Merge branch 'master' of https://github.com/tgstation/-tg-station into doesrussellsteapotapplytorussellsteapot
Conflicts:
	icons/obj/closet.dmi
2015-04-28 22:31:11 +10:00
phil235 0eb80a8607 Makes the standard kitchen knife fit inside your pocket. 2015-04-28 00:36:39 +02:00
phil235 752032628f Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.
Butchering spiders now is done in one step, not leg after leg. Changed simple_animal/harvest proc.
Kitchen knives are now weapon/kitchen/knife.
Fixes eating omelette with fork.
Changed some code to use is_sharp() instead of multiple type checks (spacevines and leather code).
Removes utensil/knife (we already have kitchen/knife).
2015-04-27 23:54:28 +02:00
Boggart e474a7b084 Fixes being unable to switch back to the previous pipe type without switching off it and back after using the delete or paint modes. 2015-04-27 13:48:36 -06:00
Boggart 21b148d1d3 Makes ghosting after someone defibs you cause the process to fail by checking just before the revive. 2015-04-27 13:04:25 -06:00
TheVekter edd3daab24 Fixes #9066, removes description on Noslips 2015-04-27 14:03:51 -05:00
Cheridan 98e70f8d7a Merge pull request #9166 from Xhuis/into_the_morgue_with_you
Changes timing of defibrillator message to target ghost
2015-04-27 09:22:38 -05:00
Cheridan 0d07b0130e Merge pull request #9178 from GunHog/EUK_are_dead_so_this_needs_its_own_PR
Acid_Act() fix
2015-04-27 08:41:42 -05:00
Ikarrus 671bee5027 Centcom Response Team Variations
- The button is now labelled "Make Centcom Response Team"
- Added different response teams of varying strength, to give admins more options than balls-to-the-walls all the time
- Code Green: Centcom Official
- Code Blue: Light ERT - No access to lockers or admin weapons
- Code Amber: Full ERT - Access to lockers, but not admin weapons
- Code Red: Elite ERT - What we have now.
- Code Delta: Deathsquad
- Removed Make Deathsquad button as it's all collapsed into this one button now
2015-04-27 01:08:47 -06:00
TheVekter 07afe76f8c Fixes #9098 and #9077. 2015-04-27 01:41:12 -05:00
Cheridan b27f145f81 Merge pull request #9172 from GunHog/NTSL_Fix
Fixes NTSL Artifical Broadcasts
2015-04-26 22:50:53 -05:00
Ikarrus 9e805710ae - Tweaks to instructional text
- Promotion costs reduced to 10, 30, 50 influence each
- changelog
2015-04-26 18:00:35 -06:00
TheVekter b6191925bd Fixes #9173 2015-04-26 17:59:05 -05:00
phil235 c2151180eb Merge branch 'master' of https://github.com/tgstation/-tg-station into ClownNamePreferences
Conflicts:
	code/modules/mob/transform_procs.dm
2015-04-27 00:11:49 +02:00
Ikarrus 4746fe34f5 Gang Update 5.1
I'm quite satisfied in the current state of gang and I feel that I no longer have any more significant changes to make. Gang 5.1 includes primarily minor tweaks.
- Goal reduced back down to 50%
- Boss icon made more obvious. They're now red Gs
- Better descriptions for distributing spraycans and victory conditions
- Lieutenants receive objectives now
- Increased spraycan use to 20
- Poseur tags no longer pick gang B's tag
2015-04-26 16:02:32 -06:00
phil235 de7724f8d4 Xenomorphs with has_fine_manipulation (admin var edit only) can now pick up even big items of w_class 4 and 5. 2015-04-26 21:59:12 +02:00
Cheridan 6bce2db70d Merge pull request #9159 from Ikarrus/gang5
Gang Update 5
2015-04-26 14:29:50 -05:00
phil235 9e94f56103 Fixes Autodrobe not having any contraband/deluxe items in stock. Adding a warning to prevent future bug.
Fixes dropped resuply canisters having most charges go in a single canister (and going above the initial charge amount).
Fixes exploit with cult constructs creation.
2015-04-26 19:23:22 +02:00
GunHog 3ed9dc50bc Acid_Act() fix
acid_act() now respects the unacidable flag for items exposed to acid,
but are not worn on a mob.
2015-04-26 02:29:04 -05:00
JJRcop febebbd4e3 TED and Chronosuit tweaks
- TED time to kill has been halved
- TED now continually warps you back if you manage to escape, instead of killing you
- TED field is no longer dense
- Chronosuit now does not carry items with you if they are outside the suit, which is the belt, back, and hands.
  \ The TED is an exception
2015-04-26 02:59:11 -04:00
GunHog 8974fe23fe Fixes NTSL!
Radio transmissions made via NTSL now work again.
Moved the Centcom radio checks from 4 to 5 so it does not override other
things.
2015-04-25 22:31:51 -05:00