Commit Graph

943 Commits

Author SHA1 Message Date
phil235
1875f3a9c2 Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere
Group of fixes
2015-05-09 16:23:46 +02:00
Jordie
a73ef787a2 Merge pull request #9380 from SconesC/spooky-faces
Replaces Plasmaman Gas Mask w/ Breath Mask
2015-05-09 22:03:34 +10:00
Remie Richards
c77fefc937 Merge pull request #9374 from AnturK/abduction_third
Abduction fixes
2015-05-09 06:25:23 +01:00
Jordie0608
e72a4fb580 Drop-Everything deletes NODROP items 2015-05-08 18:40:23 +10:00
Cheridan
95d7af4e48 Merge pull request #9277 from Ikarrus/ertbaton
Batons for Light ERP
2015-05-06 09:03:55 -05:00
SconesC
20181c37b8 Replaces Plasmaman Gas Mask w/ Breath Mask 2015-05-05 17:55:32 -07:00
Cheridan
78e25c3175 Merge pull request #9220 from RemieRichards/PlasmaaaaaaaMeeeeeeen
Ports VG's Plasmamen + Species breathing additions
2015-05-04 00:19:18 -05:00
Ikarrus
040ffc9ace Grammar for special_role 2015-05-03 15:19:43 -06:00
Ikarrus
832e19a061 Fixed a bug with admins being told it failed to create a response team if they spawned a centcom official or deathsquad 2015-05-03 14:06:16 -06:00
AnturK
63b33f40cf Fixes button created teams not adding to gamemode 2015-05-03 15:15:09 +02:00
MrStonedOne
eb7d5fefa5 Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious
Conflicts:
	code/controllers/subsystem/ticker.dm
2015-05-02 03:03:29 -07:00
Ikarrus
b331391aa5 Batons for Light ERT
Moved the batons from the lockers to their backpacks so light ERTs can use them
2015-05-01 21:30:34 -06:00
Cheridan
0d1cfba3b7 Merge pull request #9200 from Ikarrus/ERTcodes
[Z2 MAP] Centcom Response Team Variations
2015-05-01 14:31:22 -05:00
Cheridan
509d940746 Merge pull request #9225 from Incoming5643/Unless_its_wizbiz_bugs_will_usually_follow
Fixes Round End Sound
2015-05-01 14:13:07 -05:00
Ikarrus
0615b4e09a Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTcodes 2015-04-30 08:56:46 -06: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
Incoming
2f0ebbf810 Fixes a pretty significant bug where sounds set with set round end sound would only actually play for the person who set the sound 2015-04-28 23:15:27 -04:00
Remie Richards
fca3c0bdb5 Adds Plasmamen! Adds the ability for species to breathe other gases! 2015-04-28 20:48:14 +01:00
Ikarrus
866ad1bc62 - Re-added the centcom ferry shuttle console back on centcom, and added the admin request button to the ferry request console. 2015-04-27 20:01:59 -06: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
Ikarrus
91c52d7766 - No more searching through world
- Customizable squad size
2015-04-27 09:32:41 -06: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
Remie Richards
95e325ee7b Merge pull request #9115 from AnturK/abduction_udpate_dos
Abduction Update 2
2015-04-26 15:38:19 +01:00
AnturK
f4a7b2dbe1 Abduction Update Two:
-SPRITES SPRITES SPRITES
-Hopefully fixes create_antag and team problems
-Fixes the Inactive Eye on follow list
-Removes redundant and adds needed checks
-Neater adv camera code
-Minor balance tweaks
-Fixes instant first activation of glands
-Adds 3 mostly negative glands
-Adds anti-tracking helmet to agent equipment
-Makes experimental dissection ignore clothes
-Way out for trapped humans : Mash random buttons
-Abductors now virus immune (also golems and skeletons)
-File cleanup
-Teleporter functionality for camera
2015-04-26 01:30:59 +02:00
Xhuis
0343040de5 Some more stuff 2015-04-25 19:27:00 -04:00
hornygranny
8e8561eb3e Merge pull request #9108 from Xhuis/revenantExplosionFix
Revenant Update II
2015-04-24 20:04:39 -07:00
Xhuis
f014a81a29 Adds cultist prayer, removes sound from non-chaps 2015-04-24 22:41:46 -04:00
kingofkosmos
a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos
e371dd9f35 more spans 2015-04-24 20:52:00 +03:00
kingofkosmos
1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
Xhuis
7785351ad6 Adds prayer sound preference 2015-04-23 22:54:58 -04:00
Xhuis
5de3451d67 Prayer refactor 2015-04-23 22:14:13 -04:00
Xhuis
0798a873f2 Merge remote-tracking branch 'remotes/upstream/master' into revenant_update_ii 2015-04-23 21:17:15 -04:00
Jordie
4c575acbfe Merge pull request #9044 from Incoming5643/donks_will_be_put
Adds the "set round end sound" button to the fun tab
2015-04-22 17:50:10 +10:00
Xhuis
6eec44430a Lots of updates 2015-04-21 20:17:10 -04:00
Fayrik
000dd98573 Fixes a not-so edge case where ERTs and Deathsquads were reporting failure when they were spawned correctly. 2015-04-19 15:22:49 +01:00
Incoming
f892127b24 Adds the "set round end sound" fun button so admins can override the generic sounds to play something else if want be. 2015-04-18 15:34:03 -04:00
Fayrik
84df0192f4 Buffs Deathsquads. 2015-04-18 00:06:17 +01:00
Cheridan
d6741236b5 Merge pull request #8991 from Fayrik/AllTheSmallThings
One-Click-Antag Tweaks: Now with more jobbans!
2015-04-17 09:30:08 -05:00
AnturK
bc71b4b8b3 * Fixes observers not seeing abductor hivemind
* Fixes humans without glands getting added to experiment history
* Makes science tool marking more intuitive (Just one click to mark anything now)
* Adds small storage space
* Adds Advanced Baton - Stun,Sleep,Cuff in one tool
* Makes console landmarks search for nearby machine/pad instead of spawning them next to it for mappers
* Fixes only one team spawning
* Fixes roundend report
* Fixes adding more teams to the round
2015-04-16 12:15:41 +02:00
Fayrik
f6983f22e4 Age check works with any type of game mode, and nuke teams report failure if there aren't any candidates at all. 2015-04-16 10:13:48 +01:00
Fayrik
772b05d56b New Jobbans, and proper messages for when you fail to spawn antags. 2015-04-15 20:27:44 +01:00
AnturK
6fa8e5f02d Adds Abduction Mode 2015-04-13 18:40:15 +02:00
Fayrik
98b5f41770 As you can see, I'm an idiot that codes potential infinite loops. (But I also fix it too.) 2015-04-07 21:48:00 +01:00
Jordie
57e1274353 Merge pull request #8624 from Cheridan/day42_betsoff
Day Who-Knows: Bar Gambling Expansion!
2015-04-02 20:15:18 +11:00
Cheridan
9606763e5f Merge pull request #8583 from Fayrik/CentcomExpansion
Centcom Two: It's better now, I swear.
2015-03-30 21:35:19 -05:00
Cheridan
884e9e3774 Day Who-Knows: Bar Gambling Expansion!
Space cash is stacks
Adds dealer table to map
2015-03-29 18:09:54 -05:00
Jordie
98873da060 Merge pull request #8549 from tedward1337/Ohgodthisishard
Adds Bluespace artillery button.
2015-03-30 01:20:45 +11:00
Fayrik
7336e6ecb8 Call Centcom! ERTs got fixed! 2015-03-29 03:54:54 +01:00
Fayrik
4f43fff199 Issue fixes! All that, and more! 2015-03-29 03:54:41 +01:00