Commit Graph

19132 Commits

Author SHA1 Message Date
xxalpha eb7e466dfe Changed facehuggers and alien eggs layers to MOB_LAYER 2015-09-11 14:31:17 +01:00
xxalpha 7cff554a15 Tweaked values. Added ability to block pounces with shields. Changelog.
Removed conflicting code.
2015-09-11 01:29:43 +01:00
xxalpha b238ac02e8 Xeno tweaks and bugfixes. 2015-09-09 17:54:59 +01:00
Aranclanos 732aa1f5be Merge pull request #11600 from octareenroon91/patch-6
Correct 'You inject' text
2015-09-06 20:29:28 -03:00
Razharas 580e889e7d Merge pull request #11590 from joonoro/turbinefix
Fix turbine
2015-09-07 00:08:30 +03:00
Swag McYolosteinen 0b15cffcad Merge pull request #11588 from Xhuis/shadowling_bugfix
Fixes a gamebreaking bug with shadowling
2015-09-06 10:55:34 +02:00
Xhuis 73f657d7af Fixes another gamebreaking bug 2015-09-06 00:32:27 -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
Razharas 3847e06903 Merge pull request #11594 from Xhuis/the_poltergeistening
Fixes being unable to buckle into chairs and beds
2015-09-06 06:33:32 +03:00
Razharas e6e0c0e769 Merge pull request #11578 from Jalleo/OrionFix
Fixes more than one prize win in Orion Trail
2015-09-06 06:26:07 +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
Xhuis d7ffc1bd7e Removes some commented code and fixes a typo 2015-09-05 14:43:12 -04:00
Xhuis 1f4313f7ad Fixes buckling 2015-09-05 14:41:08 -04:00
Cheridan cbe2e310c6 Merge pull request #11573 from Fox-McCloud/plasmagold
Fixes Gold Sheets Containing Plasma
2015-09-05 11:54:34 -05: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
duncathan 4a871c0fdd fixes a potential runtime if parent is null 2015-09-05 00:48:54 -06:00
Joonatan O'Rourke 77d91af82c fix turbine 2015-09-05 09:42:14 +03:00
duncathan 9c0ce24aea PROPERLY makes pipes GC 2015-09-05 00:17:56 -06:00
Xhuis 08cc2ee675 Fixes an extremely important bug with shadowling 2015-09-05 00:42:05 -04:00
duncathan bea187ef8d compiles the game properly 2015-09-04 22:21:58 -06: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
Cheridan 73c3e0e4f9 Merge pull request #11536 from Incoming5643/letting_old_threats_lay_fallow
Reverts #10922: ei nath nerfs 2: ayy lmao
2015-09-04 22:52:15 -05:00
bgobandit 362157a5d5 t y p o h o n k 2015-09-04 22:21:51 -04:00
Aranclanos ad9231d7d2 Merge pull request #11565 from Razharas/HEfix
Fixes HE pipes not activating turf
2015-09-04 22:46:33 -03:00
blah b407d4dcde Removes accidental whitespace 2015-09-04 17:07:31 +01:00
blah 07eaa9821e I fucked it up Miauw told me how 2015-09-04 16:50:52 +01:00
blah 35dd40e8ab Another suggestion by Miauw that might work better 2015-09-04 16:02:38 +01:00
blah de92cf5bad Better fix suggested by Razharas turns = 1 at win proc 2015-09-04 15:53:36 +01:00
blah 945e6fd07c Better fix by having a check in the if statement 2015-09-04 15:05:43 +01:00
blah 2b925a17c4 Hopefully 2015-09-04 13:53:55 +01: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
Fox-McCloud 0b8f2476b4 Fixes Gold Sheets Containing Plasma 2015-09-04 01:44:13 -04:00
Remie Richards 09e0d7cad3 Fixes inverted logic in Stack is_empty() causing NTSL crashes, caused by an inverted sign. 2015-09-04 03:43:50 +01:00
bgobandit 1748a8c261 ADDS EXTRA HONK 2015-09-03 14:34:53 -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
Razharas 5f2022acdf Fixes HE pipes not activating turf
Fixes HE pipes not activating turf
2015-09-03 16:49:58 +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
Razharas 2ab0836d6e Just some tiny fix
Just some tiny fix
Move along codizen
2015-09-03 11:59:47 +03:00
Razharas 8430304fdc Merge branch 'master' of https://github.com/tgstation/-tg-station into GhostBuckle 2015-09-03 11:42:09 +03:00
Razharas c28cae5d83 Use topic instead of old shit
Use topic instead of old shit
2015-09-03 11:41:12 +03: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
Razharas e5a045f82b Merge pull request #11526 from Aranclanos/murderbots
Fixes mulebots description mentioning them as bloody at roundstart.
2015-09-02 21:12:05 +03:00
Razharas 93077ab2e3 Merge branch 'master' of https://github.com/tgstation/-tg-station 2015-09-02 19:04:16 +03:00