WJohn
4b3f578633
Readds the boxstation whiteship as a ruin. ( #31709 )
...
* Adds box's whiteship back as a broken down relic.
* And accompanying files to make it work.
* Derp
2017-10-15 11:31:48 -05:00
LetterJay
b6f69c88ea
Merge pull request #3402 from Citadel-Station-13/upstream-merge-31553
...
[MIRROR] Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-15 10:22:59 -04:00
kevinz000
b20e5916ea
Removes a bunch of sleeps/spawns and makes a few booleans defines
2017-10-14 18:53:48 -05:00
Emmett Gaines
24b9d4b9f4
Fixes camera mobs becoming contaminated and other tweaks ( #31731 )
2017-10-14 17:40:34 -05:00
LetterJay
253f1e3f1c
Merge pull request #3379 from Citadel-Station-13/upstream-merge-30570
...
[MIRROR] Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes
2017-10-14 15:37:17 -04:00
kevinz000
77d6420db0
Flying mobs now clip past non flying mobs, various flightsuit/iontrail/movement tweaks/code improvements/bugfixes
2017-10-13 19:09:45 -05:00
Emmett Gaines
55e8f6526c
Radiation rework and subsystem
2017-10-13 09:22:23 -05:00
LetterJay
2e8b198d9a
Merge branch 'master' into upstream-merge-31621
2017-10-13 03:58:03 -04:00
LetterJay
f072cac695
Merge pull request #3335 from Citadel-Station-13/upstream-merge-31618
...
[MIRROR] Fixes topic key validation
2017-10-12 23:54:03 -04:00
Jordan Brown
13bffff94b
Add require_comms_key = TRUE to some topic that need it
2017-10-12 13:23:35 -05:00
Jordan Brown
76654718f1
Fixes topic key validation
2017-10-12 12:23:00 -05:00
Jordan Brown
e595c2f2fc
Fixes adminwho having namecheck as a keyword
2017-10-12 12:22:51 -05:00
kevinz000
9deb3df6af
Update material_container.dm ( #31555 )
2017-10-12 10:39:20 -05:00
LetterJay
f93733576e
Merge pull request #3324 from Citadel-Station-13/upstream-merge-31528
...
[MIRROR] Minor refactor of how gas IDs are handled
2017-10-12 07:19:30 -04:00
LetterJay
3ad9f5dc1e
Merge pull request #3317 from Citadel-Station-13/upstream-merge-31500
...
[MIRROR] sleeping carp grabs now put out a message
2017-10-12 07:18:27 -04:00
LetterJay
9af6ffa946
Merge pull request #3311 from Citadel-Station-13/upstream-merge-31543
...
[MIRROR] Datumizes world/Topic
2017-10-12 07:16:44 -04:00
duncathan salt
c0e9cde5c2
Minor refactor of how gas IDs are handled
2017-10-12 00:30:09 -05:00
oranges
9bd56416f8
Merge pull request #31500 from Armhulen/patch-7
...
sleeping carp grabs now put out a message
2017-10-12 00:29:14 -05:00
Jordan Brown
1604f8b1d3
Datumizes world/Topic ( #31543 )
...
* Datumizes world/Topic
* active_players requires comms_key
2017-10-12 00:28:27 -05:00
AnturK
5be4669924
Datum antag wizard.
2017-10-11 05:24:17 -05:00
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
