b1bb0948b9
Automatic changelog generation for PR #3594 [ci skip]
2017-10-25 13:52:51 -05:00
42939bb914
Merge pull request #3594 from Citadel-Station-13/upstream-merge-31912
...
[MIRROR] Heart of darkness revives non-shadow as shadowpeople
2017-10-25 14:52:49 -04:00
afd1155ef0
Heart of darkness revives non-shadow as shadowpeople
2017-10-25 00:13:05 -05:00
b237b8286a
heart of darkness revives non-shadow as shadowpeople
2017-10-25 00:13:05 -05:00
d0a9c56f3b
Automatic changelog generation for PR #3432 [ci skip]
2017-10-24 22:04:52 -05:00
a664384e81
Bhijn's touching dogborg balance again everyone panic ( #3432 )
...
* rebuffs everything and puts babyproof locks on scrubpup compactor
* lets it compile, removes things from the blacklist
* readds telegraphing due to popular vote, removes flash from scrubpups
* does githubs text editor work for basic thing on mobile
* reverts blacklist changes
* keeps spoolup, removes sounds + anime prepounce effects
2017-10-24 22:04:51 -05:00
bb6cbd8528
Merge pull request #3593 from Citadel-Station-13/revert-3584-revert-3580-upstream-merge-31560
...
Revert "Revert "[MIRROR] Late join antagonists will try to target late join players""
2017-10-24 21:30:11 -04:00
3822aa83a3
Update new_player.dm
2017-10-24 19:49:38 -05:00
40c2a8d40b
Merge pull request #3592 from Citadel-Station-13/upstream-merge-31956
...
[MIRROR] Ratvar summoning now ends the round/triggers mass proselytize
2017-10-24 19:35:38 -04:00
fc8a0d0211
Merge pull request #3590 from Citadel-Station-13/upstream-merge-32042
...
[MIRROR] Transit space blocks explosions
2017-10-24 19:35:27 -04:00
0c688c8ab3
Merge pull request #3588 from Citadel-Station-13/upstream-merge-32032
...
[MIRROR] adds logging to ripley gibs
2017-10-24 19:35:05 -04:00
0f9bc30e78
Merge pull request #3587 from Citadel-Station-13/upstream-merge-32027
...
[MIRROR] fixes pentetic acid dealing radiation damage instead of healing it
2017-10-24 19:34:48 -04:00
46e6d065e2
Merge pull request #3586 from Citadel-Station-13/upstream-merge-32024
...
[MIRROR] Adds hidden fingerprints to crayon paintings
2017-10-24 19:34:39 -04:00
a785e92570
Merge pull request #3583 from Citadel-Station-13/upstream-merge-32018
...
[MIRROR] Moves opened firedoors underneath opened airlocks
2017-10-24 19:34:23 -04:00
abd2c1054c
Automatic changelog generation for PR #3582 [ci skip]
2017-10-24 18:28:35 -05:00
2b30b572ac
Merge pull request #3582 from Citadel-Station-13/upstream-merge-32016
...
[MIRROR] Fixes xenobio sentience giving the wrong name
2017-10-24 19:28:34 -04:00
1011caced5
Automatic changelog generation for PR #3581 [ci skip]
2017-10-24 18:24:49 -05:00
82840f4a62
Merge pull request #3581 from Citadel-Station-13/upstream-merge-32001
...
[MIRROR] Blacklists holo injectors from surplus crates
2017-10-24 19:24:47 -04:00
40cde276f3
Merge pull request #3579 from Citadel-Station-13/upstream-merge-32007
...
[MIRROR] Selecting multiple choice polls with 1 choice now become a single option poll
2017-10-24 19:23:37 -04:00
72bd156589
Update new_player.dm
2017-10-24 18:19:49 -05:00
e20664dad3
Revert "Revert "[MIRROR] Late join antagonists will try to target late join players""
2017-10-24 18:18:20 -05:00
47af2267a6
Ratvar summoning now ends the round/triggers mass proselytize
2017-10-24 18:07:06 -05:00
514533ddaf
Ratvar summoning now ends the round/triggers mass proselytize ( #31956 )
...
* Slight changes to ratvar ending
* Tick check
* T
* Why Xhuis?
* Lots of fire
* That src made sense 10 minutes ago but no longer
* More commits than line changes
* Check Tick
2017-10-24 18:07:06 -05:00
4fca33d408
Transit space blocks explosions
2017-10-24 15:47:53 -05:00
fa433109ce
Transit space blocks explosions
2017-10-24 15:47:53 -05:00
98fbe6e813
Update shutters.dm
2017-10-24 15:26:28 -05:00
14ed0d84e8
kill-me
2017-10-24 11:57:08 -05:00
cb30805b04
Update custom_items.dm
2017-10-24 11:25:30 -05:00
ae9fe441d1
adds logging to ripley gibs
2017-10-24 11:25:04 -05:00
0090a71bea
adds logging to ripley gibs ( #32032 )
...
* maybe this works, and maybe it doesn't
* cyberfriend
* oh right
2017-10-24 11:25:04 -05:00
0cdab7e6be
fixes pentetic acid dealing radiation damage instead of healing it
2017-10-24 10:55:22 -05:00
f4bac0619b
fixes pentetic acid dealing radiation damage instead of healing it ( #32027 )
...
* Update medicine_reagents.dm
* sorry i alughed so hard i hit a key
2017-10-24 10:55:21 -05:00
f0720a305e
Adds hidden fingerprints to crayon paintings
2017-10-24 08:07:42 -05:00
0986857f18
Update crayons.dm ( #32024 )
2017-10-24 08:07:42 -05:00
ffd635e209
Merge pull request #3584 from Citadel-Station-13/revert-3580-upstream-merge-31560
...
Revert "[MIRROR] Late join antagonists will try to target late join players"
2017-10-24 01:10:17 -04:00
aa420067ba
Revert "[MIRROR] Late join antagonists will try to target late join players"
2017-10-24 00:09:11 -05:00
889d2ba74e
Moves opened firedoors underneath opened airlocks
2017-10-24 00:05:43 -05:00
07063ad624
Fixes xenobio sentience giving the wrong name
2017-10-24 00:04:34 -05:00
af71944d71
Fixes xenobio sentience giving the wrong name ( #32016 )
2017-10-24 00:04:33 -05:00
95cb834389
dupe item state for donation item
2017-10-23 23:34:15 -05:00
4b90bc6ec3
Blacklists holo injectors from surplus crates
2017-10-23 22:54:24 -05:00
9848da0544
Blacklists holo injectors from surplus crates ( #32001 )
...
* Update uplink_item.dm
* Update uplink_item.dm
2017-10-23 22:54:24 -05:00
dfe7295d4c
Merge pull request #3580 from Citadel-Station-13/upstream-merge-31560
...
[MIRROR] Late join antagonists will try to target late join players
2017-10-23 23:02:37 -04:00
1ca797a53e
Automatic changelog generation for PR #3575 [ci skip]
2017-10-23 22:02:25 -05:00
00da8a2ead
Merge pull request #3575 from deathride58/mapsyncs1
...
Map Syncs - TG-gnawed-on-too-many-cables Edition
2017-10-23 23:02:23 -04:00
4ff830bf46
Late join antagonists will try to target late join players
2017-10-23 20:08:43 -05:00
94826620fa
Late join antagonists will try to target late join players ( #31560 )
2017-10-23 20:08:43 -05:00
4cc3b31113
Selecting multiple choice polls with 1 choice now become a single option poll
2017-10-23 19:37:05 -05:00
6199191dd8
Merge pull request #32007 from lzimann/poll
...
Selecting multiple choice polls with 1 choice now become a single option poll
2017-10-23 19:37:05 -05:00
6360be2041
Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883
...
[MIRROR] Removes duplicate typecaches
2017-10-23 20:16:51 -04:00
CitadelStationBot