Commit Graph

480 Commits

Author SHA1 Message Date
LetterJay
6f2b89ae88 Merge pull request #3246 from Citadel-Station-13/upstream-merge-31434
[MIRROR] Prioritizes the PDA pen as a traitor uplink location when the pen is selected
2017-10-09 06:24:02 -04:00
LetterJay
067b7fc6df Update genetics.dm 2017-10-08 22:39:42 -05:00
LetterJay
271b332928 Update flesh_eating.dm 2017-10-08 22:39:19 -05:00
LetterJay
3b00d7c3ea Update fever.dm 2017-10-08 22:39:02 -05:00
LetterJay
3778b8bfc0 Update dizzy.dm 2017-10-08 22:38:53 -05:00
LetterJay
d1d671da47 Update choking.dm 2017-10-08 22:38:44 -05:00
LetterJay
e65943276d Update weight.dm 2017-10-08 22:38:28 -05:00
LetterJay
0bf4fc091d Update voice_change.dm 2017-10-08 22:38:11 -05:00
LetterJay
2333f5ee11 Update symptoms.dm 2017-10-08 22:38:01 -05:00
LetterJay
73bbc4d4f9 Update shivering.dm 2017-10-08 22:37:45 -05:00
LetterJay
f239efcd45 Update oxygen.dm 2017-10-08 22:37:34 -05:00
LetterJay
9ca3d0fd3d Update itching.dm 2017-10-08 22:37:23 -05:00
LetterJay
53a3644f48 Update headache.dm 2017-10-08 22:37:14 -05:00
LetterJay
631b98dad5 Update hallucigen.dm 2017-10-08 22:37:02 -05:00
vuonojenmustaturska
8b040dddb2 Prioritizes the PDA pen as a traitor uplink location when the pen is selected (#31434)
* you too can be a commit

* requested changes
2017-10-08 19:10:50 -05:00
XDTM
6e24ca43be Fixes Start() of symptoms still working when neutered 2017-10-08 19:10:43 -05:00
LetterJay
e9f481e4e4 Merge pull request #3215 from Citadel-Station-13/upstream-merge-31392
[MIRROR] Fix: Prevents PANDEMIC Neutering Lockout
2017-10-08 16:19:33 -04:00
LetterJay
a35b84cc2e Merge pull request #3208 from Citadel-Station-13/upstream-merge-31386
[MIRROR] Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-08 16:18:18 -04:00
CitadelStationBot
d1dcfb63f8 [MIRROR] Miscellaneous virus fixes (#3216)
* Miscellaneous virus fixes (#31391)

* Probably fixes neutering bugs

* Proper targeting for healing

* Fixes itching affecting roboparts

* Miscellaneous virus fixes
2017-10-07 23:04:26 -07:00
LetterJay
12506ade24 Update cough.dm 2017-10-07 22:48:23 -05:00
Robustin
98a34c2211 Virus Neuter Fix (#31392) 2017-10-07 18:01:57 -05:00
Jordan Brown
075cb673c0 Remove drop_item, drop_item_v, put_in_hands_or_del 2017-10-07 12:37:06 -05:00
LetterJay
020b3b1160 Merge pull request #3163 from Citadel-Station-13/upstream-merge-31240
[MIRROR] Emotes now shatter 80% less immersions
2017-10-06 02:12:43 -04:00
Robustin
c8e5928517 Emotes now shatter 80% less immersions (#31240)
* Emote Checks by Default

* Removes emote argument

* More emote fixes

* Overhauled emote check

* Closed Spans
2017-10-05 15:11:28 -05:00
XDTM
5b0b2fd5bb Adds H.E.C.K. suits, spraycan_paintable component, and reworks item's attackby() 2017-10-05 10:53:47 -05:00
LetterJay
40b8365924 Merge pull request #3154 from Citadel-Station-13/upstream-merge-31294
[MIRROR] Fix abductor scientist being unable to use science tool
2017-10-05 09:13:06 -04:00
Leo
5a0d1e5aeb Merge pull request #31294 from YPOQ/sciencetoolfix
Fix abductor scientist being unable to use science tool
2017-10-05 06:49:54 -05:00
oranges
bb9982e772 Merge pull request #31296 from ShizCalev/landmark-cleanup
Cleans up and fixes old landmarks
2017-10-05 03:05:40 -05:00
LetterJay
365adf852c Merge branch 'master' into upstream-merge-31222 2017-10-04 21:50:07 -04:00
LetterJay
1a70aa0227 Merge pull request #3041 from Citadel-Station-13/upstream-merge-30887
[MIRROR] 2H Sword to the Cult Forge - Robustin's Github Adventure
2017-10-04 19:06:02 -04:00
LetterJay
d483932395 Merge pull request #3109 from Citadel-Station-13/upstream-merge-31232
[MIRROR] Fixes mech fab runtime
2017-10-03 20:13:06 -04:00
AnturK
67f0c2f41c Fixes mech fab runtime (#31232)
* Dunno what the initial was about, it's a list.

* Proper fixup

* Typo
2017-10-03 18:19:40 -05:00
oranges
5c49bab3c5 Merge pull request #31135 from KorPhaeron/unconvertable
Adds a var to minds that makes them immune to conversion
2017-10-03 18:15:20 -05:00
KorPhaeron
4e648765db Ports dash weapons to the dash datum 2017-10-03 18:11:42 -05:00
LetterJay
f03df4f7bb Merge pull request #3082 from ktccd/fixes_flavor_text_and_changeling_dicks
Fixes flavor_text and changeling genitals
2017-10-02 21:26:15 -04:00
ktccd
3a72023532 Fixes flavor_text and changeling genitals
flavor_text is now, again, set from DNA once cloned/podded/whatever.
Changelings should do the same, and also get appropriate genitals.
Thanks TG, for overwriting this code. But really, thanks Byond, for
making extending this functionality so fucking hard.
2017-10-03 02:25:53 +02:00
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay
acf08df884 Merge pull request #3071 from Citadel-Station-13/upstream-merge-31190
[MIRROR] Fixes Vanguard never stunning for more than 2 seconds
2017-10-01 23:40:49 -04:00
LetterJay
ea493d3f3d Merge pull request #3063 from Citadel-Station-13/upstream-merge-31175
[MIRROR] Fixes viruses not calling Start on their symptoms when spreading
2017-10-01 23:39:41 -04:00
Joan Lung
02987715b0 Fixes Vanguard never stunning for more than 2 seconds 2017-10-01 19:29:34 -05:00
LetterJay
1ecebee19d Merge pull request #3057 from Citadel-Station-13/upstream-merge-31171
[MIRROR] Lastest
2017-10-01 16:55:54 -04:00
LetterJay
5b81614e87 Merge pull request #3051 from Citadel-Station-13/upstream-merge-31200
[MIRROR] Fixes warning spam
2017-10-01 16:32:46 -04:00
XDTM
d274843958 Fixes viruses not calling Start on their symptoms when spreading 2017-10-01 15:22:19 -05:00
LetterJay
e572d2e529 Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138
[MIRROR] Structure istype define
2017-10-01 16:20:56 -04:00
LetterJay
6572781b63 Update forced_movement.dm 2017-10-01 14:43:06 -05:00
LetterJay
40f541b9da Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117
[MIRROR] Fixes liches losing spells
2017-10-01 15:42:12 -04:00
LetterJay
4e80c2574a Merge pull request #3023 from Citadel-Station-13/upstream-merge-31069
[MIRROR] Cleanup to various loc assignments and nearby code
2017-10-01 15:08:21 -04:00
kevinz000
d76eb00634 Update viral.dm 2017-10-01 13:11:05 -05:00
Jordan Brown
9082c8d241 Merge pull request #31200 from AnturK/pleasestop
Fixes warning spam
2017-10-01 08:43:36 -05:00
LetterJay
ef10ac589a Update getrev.dm 2017-10-01 02:39:07 -05:00