LetterJay
822f15f4ae
Merge pull request #3292 from Citadel-Station-13/upstream-merge-31494
...
[MIRROR] In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 22:32:52 -04:00
LetterJay
8d604a3922
Merge pull request #3290 from Citadel-Station-13/upstream-merge-31462
...
[MIRROR] Fixes headrev TP
2017-10-10 22:32:12 -04:00
Jordan Brown
7b30be0058
Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war
...
In which the stoner one gets stoned and tries to address tick contention... again
2017-10-10 13:28:38 -05:00
AnturK
724b0d24fe
Fixes headrev TP ( #31462 )
...
* Fixes headrev TP
* Mhm
2017-10-10 13:20:12 -05:00
MoreRobustThanYou
bc318af840
Diseases will now cure if species is changed ( #31495 )
...
* Diseases will now cure if species is changed
* Update _disease.dm
* Update _disease.dm
* Update species.dm
2017-10-10 12:41:42 -05:00
kevinz000
a6ac800db0
Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser ( #31399 )
...
* precision
* precision
* sanity checks
* itt kevinz doesn't know how cyberboss procs work
* fixes
* allows user cancellation
* im dumb
* itt: im still dumb
* fixes stuff, makes it set on init
* refactors reagentgrinder code
* more fixes, prevents melee attacks from going anyways
* ...? wtf is with usetopic
* Finally found out what's wrongw ith this thing.
* fixes a mistake
2017-10-10 03:11:50 -05:00
LetterJay
8596fa93e4
Update transformation.dm
2017-10-09 21:27:12 -05:00
LetterJay
fc1b2c4e75
Update rhumba_beat.dm
2017-10-09 21:26:46 -05:00
LetterJay
2d3b4225d9
Update retrovirus.dm
2017-10-09 21:26:33 -05:00
LetterJay
9304ae1a38
Update pierrot_throat.dm
2017-10-09 21:26:20 -05:00
LetterJay
3a5ac95c4e
Update magnitis.dm
2017-10-09 21:26:09 -05:00
LetterJay
e5c2284213
Update gbs.dm
2017-10-09 21:25:59 -05:00
LetterJay
a93240f6a1
Update fluspanish.dm
2017-10-09 21:25:47 -05:00
LetterJay
b1b3673fe9
Update flu.dm
2017-10-09 21:25:35 -05:00
LetterJay
93a0f5fe8c
Update fake_gbs.dm
2017-10-09 21:24:54 -05:00
LetterJay
43ced58616
Update cold9.dm
2017-10-09 21:24:45 -05:00
LetterJay
8cc5186cf4
Update cold.dm
2017-10-09 21:24:35 -05:00
LetterJay
05250b3ce9
Update brainrot.dm
2017-10-09 21:24:23 -05:00
LetterJay
c3d6ce6bc6
Update beesease.dm
2017-10-09 21:24:14 -05:00
XDTM
7a0ce217db
Refactors virus spreading
2017-10-09 08:55:57 -05:00
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
