LetterJay
23eddf5a3c
Merge pull request #3218 from Citadel-Station-13/upstream-merge-31306
...
[MIRROR] Fixes being able to sell camera mobs to CentCom
2017-10-08 16:20:11 -04:00
LetterJay
d84ed9e9ae
Merge pull request #3217 from Citadel-Station-13/upstream-merge-31393
...
[MIRROR] Fixes wrapper being invisible
2017-10-08 16:19:55 -04: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
fe2e29f0f8
Merge pull request #3210 from Citadel-Station-13/upstream-merge-31388
...
[MIRROR] Moves assert_gas() into a define it should always have been, speeding up atmos slightly
2017-10-08 16:19:12 -04:00
LetterJay
474b66fed1
Merge pull request #3209 from Citadel-Station-13/upstream-merge-31371
...
[MIRROR] Allows editing config.allow_admin_ooccolor
2017-10-08 16:18:34 -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
LetterJay
6cb68e06e3
Update autoimplanter.dm
2017-10-08 15:07:28 -05:00
LetterJay
4c408f4541
Update give.dm
2017-10-08 14:55:37 -05:00
LetterJay
86d9e5955a
Update autoimplanter.dm
2017-10-08 14:51:27 -05:00
LetterJay
9f1c6cef0c
Merge branch 'master' into upstream-merge-31371
2017-10-08 15:37:46 -04:00
LetterJay
981c9b07bc
Merge pull request #3205 from Citadel-Station-13/upstream-merge-31374
...
[MIRROR] High pop reduced MC processing mode.
2017-10-08 15:36:39 -04:00
LetterJay
4a0d3c4d40
Update seed_extractor.dm
2017-10-08 14:35:35 -05:00
deathride58
5d0853e16a
Crew objective/miscreant system tweaks ( #3213 )
...
* Loadsa tweaks
* adds miscreant pref, other fixes
* fixes runtime
* fixes compiling errors for REAL now hopefully
* HOPEFULLY fixes compiling errors
* COMPILE!
2017-10-08 10:05:40 -07:00
CitadelStationBot
57d58163d2
[MIRROR] Overloaded leg actuators now consume at least 100 power per step ( #3211 )
...
* Merge pull request #31389 from Y0SH1M4S73R/patch-1
Overloaded leg actuators now consume at least 100 power per step
* Overloaded leg actuators now consume at least 100 power per step
2017-10-07 23:04:36 -07: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
CitadelStationBot
f579a3bf74
[MIRROR] Fix adding bad config entries ( #3219 )
...
* Fixes adding bad config entries (#31390 )
* Fix adding bad config entries
2017-10-07 23:04:14 -07:00
LetterJay
2acc990425
donation items / framework for some
2017-10-07 23:27:25 -05:00
LetterJay
cc0e5a1280
Update jetpack.dm
2017-10-07 23:07:25 -05:00
LetterJay
4a2d9f82a1
Update config.dm
2017-10-07 23:06:35 -05:00
LetterJay
2606143343
Update limb_augmentation.dm
2017-10-07 22:52:12 -05:00
LetterJay
641ffe003b
Update silicon.dm
2017-10-07 22:51:58 -05:00
LetterJay
5ce923a4d7
Update laborstacker.dm
2017-10-07 22:51:35 -05:00
LetterJay
cc3bd63d88
Update seed_extractor.dm
2017-10-07 22:51:05 -05:00
LetterJay
bc2b6b01c1
Update target_stake.dm
2017-10-07 22:50:50 -05:00
LetterJay
a7ac93dd2b
Update structures.dm
2017-10-07 22:50:38 -05:00
LetterJay
6332ae6004
Update paiwire.dm
2017-10-07 22:50:21 -05:00
LetterJay
62d2b26c7a
Update handcuffs.dm
2017-10-07 22:49:52 -05:00
LetterJay
eabe7f67f5
Update constructable_frame.dm
2017-10-07 22:49:19 -05:00
LetterJay
68fa18f489
Update PDApainter.dm
2017-10-07 22:48:55 -05:00
LetterJay
12506ade24
Update cough.dm
2017-10-07 22:48:23 -05:00
LetterJay
661c2d293b
Update client_procs.dm
2017-10-07 22:45:04 -05:00
LetterJay
398455917d
Merge pull request #3204 from Citadel-Station-13/upstream-merge-31372
...
[MIRROR] Fixes cool threads grammar issue
2017-10-07 23:44:25 -04:00
LetterJay
04846a2f66
Merge pull request #3203 from Citadel-Station-13/upstream-merge-31376
...
[MIRROR] Nightmare spawn event
2017-10-07 23:44:06 -04:00
LetterJay
f95ba7dfaa
Merge pull request #3202 from Citadel-Station-13/upstream-merge-31378
...
[MIRROR] Lets cyborgs use ladders
2017-10-07 23:43:50 -04:00
LetterJay
662a7d55cd
Merge pull request #3201 from Citadel-Station-13/upstream-merge-31383
...
[MIRROR] Fixes grammar on zippos
2017-10-07 23:43:35 -04:00
LetterJay
4cc8703a93
Merge pull request #3199 from Citadel-Station-13/upstream-merge-31375
...
[MIRROR] Fixes clockcult runtime
2017-10-07 23:42:57 -04:00
LetterJay
21f5d993d8
Merge pull request #3197 from Citadel-Station-13/upstream-merge-31337
...
[MIRROR] Nerfs shotgun darts
2017-10-07 23:42:36 -04:00
LetterJay
8fdf275b26
Merge pull request #3193 from Citadel-Station-13/upstream-merge-31309
...
[MIRROR] Config option to automatically call the shuttle for high casualties
2017-10-07 23:42:17 -04:00
ShizCalev
92ec5c11ab
Fixes being able to sell camera mobs to CentCom ( #31306 )
...
* Fixes being able to sell camera mobs to CENTCOM
* Did it Ninja's way.
2017-10-07 19:13:28 -05:00
bawhoppen
0ad78d0c44
frown emoji ( #31393 )
2017-10-07 19:11:17 -05:00
Robustin
98a34c2211
Virus Neuter Fix ( #31392 )
2017-10-07 18:01:57 -05:00
Neri
4bc4ab7fc5
Oh. That's what was missing. ( #3143 )
...
Boop.
2017-10-07 14:01:43 -07:00
Jordan Brown
4f32b7a0d4
Moves assert_gas() into a define it should always have been, speeding up atmos slightly
2017-10-07 13:37:28 -05:00
Kyle Spier-Swenson
988dd75850
Allows editing config.allow_admin_ooccolor
2017-10-07 12:38:17 -05:00
Jordan Brown
075cb673c0
Remove drop_item, drop_item_v, put_in_hands_or_del
2017-10-07 12:37:06 -05:00
Jordan Brown
91aa560f0d
High pop reduced MC processing mode.
2017-10-07 08:42:43 -05:00
Jordan Brown
20172ca2bd
Merge pull request #31372 from ShizCalev/cool-runnings
...
Fixes cool threads grammar issue
2017-10-07 08:42:36 -05:00
KorPhaeron
39728cc9b3
Nightmare spawn event ( #31376 )
...
* Nightmare Event
* Update nightmare.dm
* Standards
2017-10-07 08:41:25 -05:00
kevinz000
13aa6f8650
Lets cyborgs use ladders ( #31378 )
2017-10-07 08:40:15 -05:00
Jordan Brown
a8c4a155a5
Merge pull request #31383 from BeeSting12/youlights
...
Fixes grammar on zippos
2017-10-07 08:38:04 -05:00
