62f633a1ad
Drakes dying during the brief part of the swoop where they can be damaged will properly reset transform and alpha
2017-07-19 11:19:35 -05:00
85f1b25bcd
Merge pull request #1986 from Citadel-Station-13/upstream-merge-28556
...
[MIRROR] [Seriously, it's ready]Virology Rework: The Thresholdening
2017-07-19 06:29:06 -05:00
95d2969339
Merge pull request #2068 from Citadel-Station-13/upstream-merge-29283
...
[MIRROR] Cyborgs regenerate oxygen damage, and can heal toxin damage with cable coils
2017-07-19 05:34:56 -05:00
7cbdc0e2ae
Merge pull request #2070 from Citadel-Station-13/upstream-merge-29356
...
[MIRROR] Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc
2017-07-19 05:34:24 -05:00
5e8bee0d9b
Merge pull request #2062 from Citadel-Station-13/upstream-merge-29313
...
[MIRROR] Adds a move delay when resisting out of cryo
2017-07-19 05:00:03 -05:00
11772ffa74
Merge pull request #2057 from Citadel-Station-13/upstream-merge-29299
...
[MIRROR] Prevents the anomalous crystal from making fantasy into reality
2017-07-19 04:59:02 -05:00
0b7d08d5ac
Fixes the baseturf bad arg runtime and fixes the jumpToNullSpace proc
2017-07-19 04:05:53 -05:00
5801f6211f
Cyborgs regenerate oxygen damage, and can heal toxin damage with cable coils
2017-07-18 18:45:30 -05:00
20070c370c
Adds a move delay when resisting out of cryo
2017-07-18 09:43:34 -05:00
8d9dc6dd13
[MIRROR] Fixes a ... likely important bug with shuttle code.... ( #2061 )
...
* Fixes a ... likely important bug with shuttle code....
* Delete turf.dm.rej
* Update turf.dm
2017-07-18 06:01:02 -07:00
228f539eca
Prevents the anomalous crystal from making fantasy into reality
2017-07-18 06:46:00 -05:00
e522f715a2
[Ready] Shuttle dock() rewrite ( #2040 )
2017-07-17 22:52:18 -07:00
bbc28aa856
Energy swords and other transforming energy weapons are now subtypes of transforming weapons ( #2049 )
2017-07-17 22:51:51 -07:00
b2c8115ca5
Winter coats now properly hold flashlights ( #2043 )
2017-07-17 22:51:14 -07:00
61640eaf72
Merge pull request #2048 from Citadel-Station-13/upstream-merge-29284
...
[MIRROR] [s] Fixes goonchat cookie false positives
2017-07-17 07:41:29 -05:00
9c76e88952
[s] Fixes goonchat cookie false positives
2017-07-17 07:18:00 -05:00
956f10f2d2
[s]Fixes panic bunker
2017-07-17 07:13:45 -05:00
260a140f97
Ports instruments from /VG/station, including harmonicas, xylophones, saxophones, trombones, and a BIKE HORN. Repaths instruments to sound/instruments. Also, allows piano synth to play all instruments but eguitar and gives cargo a crate with everything. Clown gets the bike horn trumpet at roundstart. ( #2034 )
2017-07-17 00:52:43 -07:00
344dc1a061
Merge pull request #2032 from Citadel-Station-13/upstream-merge-29257
...
[MIRROR] Fixes monkeys trying to take offhands
2017-07-15 23:19:59 -05:00
c3857fe264
Merge pull request #2031 from Citadel-Station-13/upstream-merge-29269
...
[MIRROR] Fixes missiles being able to ricochet
2017-07-15 23:19:41 -05:00
44473643bb
Merge pull request #2029 from Citadel-Station-13/upstream-merge-29267
...
[MIRROR] Makes round end delay message optional
2017-07-15 23:19:08 -05:00
8d31153fdc
Merge pull request #2005 from Citadel-Station-13/upstream-merge-29223
...
[MIRROR] Organ Update [Cloning isn't broken edition]
2017-07-15 23:18:53 -05:00
f634966a34
Fixes monkeys trying to take offhands
2017-07-15 22:33:14 -05:00
a4d968ec82
Fixes missiles being able to ricochet
2017-07-15 22:31:05 -05:00
2cbfec38a2
Makes round end delay message optional
2017-07-15 22:19:46 -05:00
d21766956e
[MIRROR] Cleaned up some emag_acts ( #2018 )
...
* Cleaned up some emag_acts
* Delete port_gen.dm.rej
* Update port_gen.dm
2017-07-15 13:17:56 -07:00
099b908d64
Fixes traitor holoparasites ( #1904 )
...
* fixes holoparasites
* adds #1051 and #1066
* as it turns out I'm blind
* fixes line 500 indentation
2017-07-15 11:48:56 -07:00
b025182955
Possibly fix player_list sometimes having a null ( #2022 )
2017-07-15 11:45:33 -07:00
b2f20fffd8
Fixes timestop! (and tweaks its sounds) ( #2019 )
2017-07-15 11:45:11 -07:00
dcf957f0b2
adds icons for PDAs by Cecily and the hunter hat ( #2015 )
...
* adds icons for PDAs by Cecily and the hunter hat
* Update cit_hats.dm
2017-07-15 11:44:26 -07:00
54da14ea6b
Rename Bumped to CollidedWith ( #2017 )
2017-07-15 11:44:12 -07:00
44742cb115
im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" ( #2025 )
...
* Revert "Automatic changelog generation for PR #2021 [ci skip]"
This reverts commit 9d0cd37dd3#2021 )"
This reverts commit f2ac487927
2017-07-15 11:41:36 -07:00
f2ac487927
Disease Refactor ( #2021 )
2017-07-15 11:40:49 -07:00
2ae38397c9
removes current method of handling flightsuit pulling ( #2023 )
2017-07-15 11:40:34 -07:00
3ed842376e
Update species.dm
2017-07-15 10:06:30 -05:00
2d3905457e
[MIRROR] Rename Bump to Collide ( #2002 )
...
* Rename Bump to Collide
* Delete bubblegum.dm.rej
* Update bubblegum.dm
2017-07-14 21:35:56 -07:00
bd3c3e9de4
Removes the entry in sound.dm for servostep.ogg ( #2004 )
2017-07-14 19:35:48 -07:00
a0a77f5a41
Refactors screwdriver coloring to use greyscale ( #2003 )
2017-07-14 19:34:03 -07:00
6e72c48115
Added " say_mod = "chirps" " to the avian species entry to allow the say prefix to be "chirps" instead of "says" ( #2008 )
2017-07-14 19:30:17 -07:00
63ffbdf090
Fixes cleave conditions for the cleaving saw ( #2006 )
2017-07-14 19:30:06 -07:00
106cdfc37b
[MIRROR] Fixes the maid costume's apron ( #2010 )
...
* Fixes the maid costume's apron
* Delete admins.txt.rej
2017-07-14 19:29:55 -07:00
6d3123f63c
Readds borers ( #1999 )
...
Readds the cortical borers and also syndi-borers.
Syndi-borers now gives a response if you try to use it multiple times
too quickly, and also prevents usage more than once while it's still
waiting for ghost responses.
2017-07-14 19:28:52 -07:00
df26bdd9cf
cleanup
2017-07-14 10:22:43 -05:00
3ee26917bd
Organ Update [Cloning isn't broken edition]
2017-07-14 09:00:36 -05:00
798050317f
Merge pull request #1991 from Citadel-Station-13/upstream-merge-28826
...
[MIRROR] Adds a 'nemesis faction' system to transforming weapons
2017-07-13 23:59:06 -05:00
9d3c4d4702
Merge pull request #1989 from Citadel-Station-13/upstream-merge-29215
...
[MIRROR] Replaces ex_act and emp_act numbers with defines
2017-07-13 23:57:35 -05:00
92c6b7b445
Adds a 'nemesis faction' system to transforming weapons
2017-07-13 17:46:51 -05:00
55462ed7d1
Replaces ex_act and emp_act numbers with defines
2017-07-13 17:46:41 -05:00
1da785ffb5
Removes old height parameter from CanPass proc
2017-07-13 17:46:36 -05:00
194a6b7aa9
[Seriously, it's ready]Virology Rework: The Thresholdening
2017-07-13 17:46:25 -05:00
CitadelStationBot