Commit Graph

822 Commits

Author SHA1 Message Date
Mark van Alphen
94eb652f15 Fix alarms triggering on non-contact levels, spectral blade ghost fix, assigning outfits runtime fix 2019-06-03 17:39:23 +02:00
AffectedArc07
510c210930 Merge 2019-05-09 17:06:35 +01:00
Mark van Alphen
d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
2019-05-03 18:30:07 +02:00
Mark van Alphen
a03603775b Initialize fix 2019-05-01 02:35:26 +02:00
Mark van Alphen
0d73736be2 Make the traitor reviver implant EMP-proof 2019-05-01 02:34:16 +02:00
Mark van Alphen
ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
joep van der velden
5cff279430 IRC's and the like now get checked to be revived when their vital organs are in 2019-04-27 23:29:52 +02:00
Mark van Alphen
40c1a25eb5 Lighting fixes 2019-04-27 01:08:17 +02:00
Mark van Alphen
e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	paradise.dme
2019-04-26 22:58:56 +02:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen
20b9285fc4 Wisp/meson implant fixes 2019-04-24 01:36:56 +02:00
Mark van Alphen
0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +02:00
Fox McCloud
42a6f4ef30 tweak 2019-04-09 11:32:21 -04:00
variableundefined
86ea35c25b Merge pull request #11161 from Kyep/terrorspider_patch_post_newcrit
Terror Spider tweaks
2019-04-07 20:30:48 +08:00
Fox McCloud
4a74ea8fea Fixes Mob Performance Issue 2019-04-02 20:34:48 -04:00
Kyep
552b52d859 eggs self-delete, no greens in first wave, no heals 2019-04-01 03:52:42 -07:00
Kyep
d685e16725 balance: removes a white spider technique to make infections faster 2019-04-01 03:15:25 -07:00
variableundefined
e6ef2e9bbc Merge pull request #11151 from Fox-McCloud/suicide-refactor
Suicide Refactor
2019-03-29 20:49:18 +08:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Fox McCloud
814e492a55 Suicide Refactor 2019-03-27 22:54:26 -04:00
variableundefined
6a2067f9c4 Merge pull request #10795 from Quantum-M/alienOrgans
[Ready for Review]Adds different looking organs to each species, some blood color changes, and MMI changes
2019-03-14 15:04:29 +08:00
AzuleUtama
a5cd29f17b Fixed two bugs with the cyber implant bundle, ammo bag and cyber bundle no longer discountable 2019-03-04 19:40:23 +00:00
variableundefined
2ddc16970c Merge pull request #10947 from Fox-McCloud/adds-upgraded-heart
Adds Upgraded Cybernetic Heart
2019-02-26 17:01:50 +08:00
variableundefined
356feaca7d Merge pull request #10944 from Kyep/ts_princess_and_white_update
Terror spider princess and white update
2019-02-26 08:10:26 +08:00
Fox McCloud
71a48d803b nope 2019-02-25 01:32:02 -05:00
Fox McCloud
b8a9f127bf Adds Upgraded Cybernetic Heart 2019-02-25 01:15:53 -05:00
Kyep
bd10bbe3ad new infection functionality 2019-02-23 23:41:50 -08:00
Fox McCloud
a24c8d2c25 Adds Stable Mutagen 2019-02-21 19:40:14 -05:00
variableundefined
0d2a47b0e3 Merge pull request #10847 from Kyep/terrorspider_ai_and_princess
Terror Spider Update (pink terrors, spiderling AI, green spiders, etc)
2019-02-12 09:06:36 +08:00
variableundefined
943a21a776 Merge pull request #10818 from datlo/freegolems
Port Mineral golems and Free Golems
2019-02-11 20:37:07 +08:00
Ty-Omaha
819042597f reviver sleep 2019-02-09 13:25:38 -05:00
Kyep
ae01a5c808 minor story fix for white spider infection 2019-02-08 09:12:12 -08:00
Kyep
342434d5e4 removes fakelings from white spider bites 2019-02-08 02:43:17 -08:00
B.A.L
f063c42f70 Fixes bugs and touches vox lungs 2019-02-05 21:06:31 -07:00
B.A.L
e6e634a218 More and more and more organ and other things work 2019-02-04 23:01:20 -07:00
B.A.L
95448b3903 More organ work 2019-02-03 20:23:00 -07:00
datlo
224f32bab3 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into freegolems 2019-02-03 06:41:02 +00:00
datlo
74a3631741 compilin and mostly workin
has runtimes due to body color
need to wrap up commented procs
2019-02-03 06:40:50 +00:00
alex-gh
7c57d652e1 Fixed non-breating mobs adding to germ_level in surgery. 2019-02-02 13:40:05 +01:00
B.A.L
5f1c8de4c4 Continued work 2019-01-30 20:30:18 -07:00
variableundefined
e19b61662f Merge pull request #10736 from datlo/ghettosurgeryfix
Refactor surgery early cautery, add cyborg medical grip, misc surgery fix/changes
2019-01-31 11:29:09 +08:00
B.A.L
67e62ea7bf Initial codework 2019-01-29 22:24:06 -07:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00
datlo
f6728186c1 Abductors now use the alien (grey) brain sprite 2019-01-27 13:55:43 +00:00
datlo
9f4e602881 remove extra var, floor surgery, add med gripper 2019-01-26 02:47:38 +00:00
datlo
33112e32e3 fix compile error 2019-01-26 01:50:43 +00:00
datlo
fdc841be8e whole bunch of surgery changes
early cautery not compiling yet
2019-01-26 00:50:18 +00:00
Jazz23
54d4397474 Easier to access bone setter (nobody uses surgical drill) 2019-01-24 13:29:46 -08:00
Aurorablade
b812736517 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-19 23:35:15 -05:00