Commit Graph

12467 Commits

Author SHA1 Message Date
Fox-McCloud cbe9ec7fae Fixes Stimulants Speedbuff 2015-09-06 00:09:30 -04:00
Razharas 93b9f96cfa Merge pull request #11341 from bgobandit/suicideisnotajoke
Adds/tweaks several suicide messages.
2015-09-06 06:42:00 +03:00
Razharas 889643deae Merge pull request #11564 from Jordie0608/thisbranchnameisalie
Config announce admin login/out
2015-09-06 06:40:15 +03:00
octareenroon91 1327441478 Correct 'You inject' text
Injections will now correctly report the amount of reagent you inject. Lethal injection syringes specifically will report correctly.
2015-09-05 16:47:21 -06:00
Firecage d701946cd4 Adds do_after to the spider verbs. 2015-09-06 00:02:22 +02:00
AnturK d9073aefec Makes blob event not happen during blob
Makes abductor event happen during gang,blob or cult
2015-09-05 23:07:32 +02:00
Firecage 9642f34be2 Fixes spacevine controller not spawning during event. 2015-09-05 23:06:08 +02:00
AnturK cd7806818e whoops 2015-09-05 20:16:22 +02:00
AnturK 6df9d4975a Adds abductor event
Adds event gamemode white/blacklist
Moves and renames some helper procs
Some QoL for baton
2015-09-05 20:08:30 +02:00
Joonatan O'Rourke ecbae74695 fix turbine computer 2015-09-05 10:45:57 +03:00
Aranclanos ee458bb3db Merge pull request #11254 from duncathan/pipecleanup
Pipe code cleanup
2015-09-05 04:12:36 -03:00
Joonatan O'Rourke 77d91af82c fix turbine 2015-09-05 09:42:14 +03:00
Ergovisavi b1f3ba46a6 Swarmer revision 2 2015-09-04 22:50:46 -07:00
Cheridan a816ff5f8f Merge pull request #11385 from Aranclanos/extrapug
Fixes pugs not following their tail.
2015-09-04 23:20:25 -05:00
duncathan 4fc54c238c fixes components not gc'ing; minor tweaks to QDEL_HINT_FINDREFERENCE 2015-09-04 22:09:01 -06:00
bgobandit 261494e659 Made some changes and repathing for posters. 2015-09-04 18:30:58 -04:00
Jordie0608 b7754d5ed7 announce login message as a config 2015-09-04 21:49:09 +10:00
c0 df7386a4ec Assemblies update 2015-09-04 11:22:37 +03:00
Nerd Lord 4db08a755a Actually I think I prefer the old one, it's less red. 2015-09-03 17:28:04 -04:00
Nerd Lord bfa73cad7d ah yes, chemistry code 2015-09-03 15:39:38 -04:00
Nerd Lord 7e7b7bc491 Tweaks the fuck out of blob chemicals:
Skin Melter, Radioactive Liquid, Omnizine, and Space Drugs blob chemicals are gone.
Added Cryogenic Liquid blob chemical, which does what you might expect.
Changed effects of current blob chemicals to be either more useful or LESS useful.
Also changed the names to look better with a different change in another PR.
2015-09-03 12:34:59 -04:00
Aranclanos 8a4260a311 Merge pull request #11545 from xxalpha/crawlinginmyskin
Fixed wizard slaughter demons not getting bloodcrawl
2015-09-03 12:17:25 -03:00
Jordie0608 00123edb18 double whoops 2015-09-03 20:45:24 +10:00
Jordie0608 4e4324d9ce whoops 2015-09-03 20:44:39 +10:00
Jordie0608 9de0f3567d config announce admin login/out 2015-09-03 20:38:36 +10:00
bgobandit ca34015b85 Removes minibomb suicide message. Fixes wand suicide message. 2015-09-02 23:07:40 -04:00
Aranclanos d2903d077f Merge pull request #11530 from xxalpha/coilcablecorrection
Fixed a couple of bugs with cable coils.
2015-09-02 22:55:47 -03:00
bgobandit 77405d49b0 Tweaks numbers upward. 2015-09-02 14:15:42 -04:00
Razharas 93077ab2e3 Merge branch 'master' of https://github.com/tgstation/-tg-station 2015-09-02 19:04:16 +03:00
Razharas feb3d2adce Fixes comment
Fixes comment
2015-09-02 14:41:27 +03:00
Razharas c2d3998e82 Merge pull request #11217 from Ergovisavi/fire_in_the_disco
Small changes to mobs on fire
2015-09-02 14:38:20 +03:00
Razharas e0e5bbc978 Merge branch 'DSStuff' of git://github.com/Steelpoint/-tg-station into Steelpoint-DSStuff 2015-09-02 14:38:07 +03:00
xxalpha 4e7d0c6ed5 Fixed wizard slaughterdmssmsmsms
asdasdasd
2015-09-02 10:47:37 +01:00
Razharas 92172265e3 Merge pull request #11396 from RemieRichards/DataStructures-Stacks&LinkedLists
Datastructures: Stacks & Linked Lists
2015-09-02 10:34:19 +03:00
Ergovisavi bf69c85f71 Mobs on fire adjustments:
-You heat up faster based on fire stacks
-Reduced the amount of fire stacks you lose over time per tick
-Increased the damage you take while on fire at the highest temperature point
-Increased the amount of fire stacks you get from hotspots
2015-09-01 22:04:10 -07:00
duncathan 381139422c Merge branch 'master' of https://github.com/tgstation/-tg-station into pipecleanup
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/components_base.dm
	code/ATMOSPHERICS/components/unary_devices/cryo.dm
	code/ATMOSPHERICS/components/unary_devices/vent_pump.dm
	code/ATMOSPHERICS/components/unary_devices/vent_scrubber.dm
	code/ATMOSPHERICS/pipes/manifold.dm
	code/ATMOSPHERICS/pipes/manifold4w.dm
	code/ATMOSPHERICS/pipes/simple.dm
	code/_compile_options.dm
	code/controllers/subsystem/garbage.dm
	code/game/machinery/bots/mulebot.dm
	code/modules/mob/living/carbon/alien/say.dm
	code/modules/mob/living/simple_animal/bot_swarm/swarmer.dm
	html/changelogs/.all_changelog.yml
2015-09-01 20:29:00 -06:00
Remie Richards c560841438 Moves bloody footprint code out of step_action() and into human/Move() 2015-09-02 01:48:20 +01:00
Remie Richards ff07337841 Bloody footprints! Human blood, Xeno blood, and Oil can now produce bloody footprints that fade off as the blood on the shoe fades. Affects gibs too. 2015-09-02 01:32:02 +01:00
xxalpha 4ead972306 Drying agent. Recolor dry shoes
use define
2015-09-01 22:59:30 +01:00
xxalpha 70d97ad5e4 Fixed a couple of bugs with cable coils. 2015-09-01 22:35:04 +01:00
Aranclanos 7daee1797b Fixes the latejoin message about the evacuation shuttle showing on incorrect times. 2015-09-01 15:38:56 -03:00
xxalpha 7cc6070a13 Absorbent galoshes. 2015-09-01 17:08:59 +01:00
Razharas 93ca749785 Merge pull request #11478 from xxalpha/crawlinginmyskin
Changed blood crawl to be a spell.
2015-09-01 18:36:20 +03:00
Aranclanos 87971f36c9 Merge pull request #11484 from spasticVerbalizer/swarmEmptyMessage
Adds check for empty message in guardian communicate verbs
2015-09-01 12:27:26 -03:00
Aranclanos 7d729e270b Merge pull request #11508 from Core0verload/spider
Removes unused SpiderOS icons
2015-09-01 12:25:56 -03:00
Razharas 737ee58330 Merge pull request #10830 from xxalpha/HACKERS
Made it possible to emag a cyborg more than once.
2015-09-01 17:58:53 +03:00
xxalpha a5062c812b Added emag cooldown. Added emag protection if cyborg slaved to tator AI. 2015-09-01 15:53:12 +01:00
xxalpha 75b2f53ce8 Merge remote-tracking branch 'upstream/master' into crawlinginmyskin
Conflicts:
	icons/mob/actions.dmi
2015-09-01 15:39:15 +01:00
Razharas c94085dcbe Merge pull request #11489 from Core0verload/turbine
Fixes roundstart turbine spawning broken
2015-09-01 17:39:03 +03:00
Razharas 72610973cc Merge pull request #11427 from xxalpha/magborg
Gave engineering cyborgs permanent magboots effect.
2015-09-01 17:31:15 +03:00