9c1effc0ff
Merge pull request #5353 from Citadel-Station-13/upstream-merge-35258
...
[MIRROR] Explosive holoparasites must now be adjacent to turn objects into bombs
2018-02-07 19:11:14 +00:00
010bebb4e6
Automatic changelog generation for PR #5351 [ci skip]
2018-02-07 13:10:39 -06:00
fc74a6a341
Merge pull request #5351 from Citadel-Station-13/upstream-merge-35303
...
[MIRROR] Holopictures and more!
2018-02-07 19:10:37 +00:00
617175fdc8
Automatic changelog generation for PR #5350 [ci skip]
2018-02-07 13:10:13 -06:00
f8a9899df4
Merge pull request #5350 from Citadel-Station-13/upstream-merge-35381
...
[MIRROR] Prevents fungal TB spores from being synthesized
2018-02-07 19:10:10 +00:00
bd9b7f3779
Automatic changelog generation for PR #5349 [ci skip]
2018-02-07 13:09:55 -06:00
e7fa382cd4
Merge pull request #5349 from Citadel-Station-13/upstream-merge-35374
...
[MIRROR] Fix pressure damage not taking effect properly
2018-02-07 19:09:52 +00:00
9865fec9f8
Automatic changelog generation for PR #5347 [ci skip]
2018-02-07 13:08:29 -06:00
830b33da59
Merge pull request #5347 from Citadel-Station-13/upstream-merge-35360
...
[MIRROR] Removes synths and androids from magic mirror
2018-02-07 19:08:27 +00:00
778ff7889a
Automatic changelog generation for PR #5346 [ci skip]
2018-02-07 13:08:11 -06:00
41bacce125
Merge pull request #5346 from Citadel-Station-13/upstream-merge-35356
...
[MIRROR] Makes the posibrain play a ping sound on success.
2018-02-07 19:08:09 +00:00
7736dddcf6
Merge pull request #5345 from Citadel-Station-13/upstream-merge-35371
...
[MIRROR] doppler arrays no longer runtime when processing < 5/10/20 bombs
2018-02-07 19:07:53 +00:00
3da6459362
Automatic changelog generation for PR #5344 [ci skip]
2018-02-07 13:07:41 -06:00
4600ace2bd
Merge pull request #5344 from Citadel-Station-13/upstream-merge-35363
...
[MIRROR] Kills tactical brass chairs; alternatively, "this is why we can't have nice things"
2018-02-07 19:07:39 +00:00
df02631dc4
Automatic changelog generation for PR #5343 [ci skip]
2018-02-07 13:07:26 -06:00
1e0155d1c8
Merge pull request #5343 from Citadel-Station-13/upstream-merge-35353
...
[MIRROR] Reduced shards and shells for the cult
2018-02-07 19:07:24 +00:00
e63c61ab59
Automatic changelog generation for PR #5342 [ci skip]
2018-02-07 13:07:04 -06:00
2732823a68
Merge pull request #5342 from Citadel-Station-13/upstream-merge-35277
...
[MIRROR] Forces gases to obey certain laws of nature
2018-02-07 19:07:01 +00:00
65a470611d
Merge pull request #5341 from Citadel-Station-13/upstream-merge-35361
...
[MIRROR] Re-enables space runes on Station Z-Level
2018-02-07 19:06:12 +00:00
3819e8088b
Merge pull request #5340 from Citadel-Station-13/upstream-merge-35212
...
[MIRROR] Squashes silicon HUDs together
2018-02-07 19:05:56 +00:00
62f5e579e8
Explosive holoparasites must now be adjacent to turn objects into bombs
2018-02-07 05:40:34 -06:00
b678bcf8eb
Merge pull request #35258 from kevinz000/patch-441
...
Explosive holoparasites must now be adjacent to turn objects into bombs
2018-02-07 05:40:34 -06:00
53b2c4716e
Holopictures and more!
2018-02-07 05:17:41 -06:00
ed18c63441
Holopictures and more! ( #35303 )
...
* Holopictures and more!
* Remiedation
2018-02-07 05:17:41 -06:00
643ae22310
Prevents fungal TB spores from being synthesized
2018-02-07 04:57:59 -06:00
d68cd9fe9a
Prevents fungal TB spores from being synthesized ( #35381 )
...
* can_synth 0 for fungal TB
* 0 -> FALSE
2018-02-07 04:57:58 -06:00
7e09c3ff65
Fix pressure damage not taking effect properly
2018-02-07 04:56:44 -06:00
9bb3ce1931
Merge pull request #35374 from AutomaticFrenzy/patch/pressure
...
Fix pressure damage not taking effect properly
2018-02-07 04:56:44 -06:00
5c297eff77
Removes synths and androids from magic mirror
2018-02-07 04:42:01 -06:00
ca5f5f6f1f
Merge pull request #35360 from Robustin/blackmirror
...
Removes synths and androids from magic mirror
2018-02-07 04:42:01 -06:00
bcacd9859b
Makes the posibrain play a ping sound on success.
2018-02-07 04:41:52 -06:00
23843241b4
Merge pull request #35356 from DaxDupont/chime
...
Makes the posibrain play a ping sound on success.
2018-02-07 04:41:52 -06:00
e02c6a31cf
doppler arrays no longer runtime when processing < 5/10/20 bombs
2018-02-07 04:39:33 -06:00
a93f9509fc
Merge pull request #35371 from kevinz000/patch-444
...
doppler arrays no longer runtime when processing < 5/10/20 bombs
2018-02-07 04:39:33 -06:00
afbaf770ee
Kills tactical brass chairs; alternatively, "this is why we can't have nice things"
2018-02-07 04:39:21 -06:00
192e548bb3
Merge pull request #35363 from Xhuis/chair_nerf
...
Kills tactical brass chairs; alternatively, "this is why we can't have nice things"
2018-02-07 04:39:21 -06:00
d6f916f37b
Automatic changelog generation for PR #5338 [ci skip]
2018-02-07 02:33:48 -06:00
85659b2975
Merge pull request #5338 from deathride58/widescreentoggle
...
[Ready for speedmerge] Adds a button in the game options menu to toggle widescreen on/off
2018-02-07 02:33:46 -06:00
8bc286cefb
Reduced shards and shells for the cult
2018-02-07 02:32:39 -06:00
5be63dbaab
Merge pull request #35353 from Robustin/constructlimit
...
Reduced shards and shells for the cult
2018-02-07 02:32:39 -06:00
80a909314f
Forces gases to obey certain laws of nature
2018-02-07 02:32:31 -06:00
9b910552fd
Forces gases to obey certain laws of nature ( #35277 )
...
* - Fixes most gas reactions deleting more gas than exists and thus making gas out of nowhere.
- Makes Noblium formation no longer multiplicative.
- Expunges invocation of a byond bug by stimulum production.
* - Redundant parenthesis
- I'm going back to sleep
* - Sends fire and fusion to jail
* - Deletes redundant line in lung code
- Adds garbage_collect and clamp to cryocells
- Adds clamp to collectors
* - Reverted the tritium burn changes because apparently I'm dumb
* - FUCK
* - Fixes division by zero when fusion has no impurities
* - Adds extra commentary for the next unlucky sod
- Compresses lines for performance or so they say
- Adds ..() to rad_act on turfs
* - Fuck it, fixes rad collectors, open turfs, geiger counters and living mobs not signalling rad_act components
2018-02-07 02:32:31 -06:00
ef89606f43
Re-enables space runes on Station Z-Level
2018-02-07 02:32:22 -06:00
6db2219f20
Reverts oysters ( #35361 )
2018-02-07 02:32:22 -06:00
47751a97fa
Squashes silicon HUDs together
2018-02-07 02:32:14 -06:00
afcdb771b3
Squashes silicon HUDs together ( #35212 )
...
* Squashes silicon sensors together
* Fixes proc names
* Brings back individual sec/med huds for pai usage
* This fixes the pai
* Fixes toggle text
2018-02-07 02:32:14 -06:00
d236b75ca0
adds widescreen pref
2018-02-07 01:42:31 -05:00
52ed449741
Merge pull request #5010 from Citadel-Station-13/upstream-merge-34708
...
[MIRROR] Switches database connector over to mariadb
2018-02-06 23:21:56 -06:00
f774a07833
Automatic changelog generation for PR #5269 [ci skip]
2018-02-06 19:08:11 -06:00
389e6de8f5
FINALLY modularizes Polychromic Clothes AND modernizes all polychromic code! ( #5269 )
...
* FINALLY AFTER 2 MONTHS
WOOOOOOOOOOOOOOO
* Updates all polychromic code
This makes the default argument of all polychromic color input menus the last chosen color.
2018-02-06 19:08:08 -06:00
deathride58