deathride58
70a2c466f3
manual mirror of upstream robotic surgery pr
2017-10-25 14:29:45 -04:00
deathride58
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
LetterJay
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
LetterJay
3822aa83a3
Update new_player.dm
2017-10-24 19:49:38 -05:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
72bd156589
Update new_player.dm
2017-10-24 18:19:49 -05:00
LetterJay
e20664dad3
Revert "Revert "[MIRROR] Late join antagonists will try to target late join players""
2017-10-24 18:18:20 -05:00
KorPhaeron
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
Jordan Brown
fa433109ce
Transit space blocks explosions
2017-10-24 15:47:53 -05:00
LetterJay
98fbe6e813
Update shutters.dm
2017-10-24 15:26:28 -05:00
LetterJay
14ed0d84e8
kill-me
2017-10-24 11:57:08 -05:00
LetterJay
cb30805b04
Update custom_items.dm
2017-10-24 11:25:30 -05:00
Armhulen
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
kevinz000
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
kevinz000
0986857f18
Update crayons.dm ( #32024 )
2017-10-24 08:07:42 -05:00
LetterJay
aa420067ba
Revert "[MIRROR] Late join antagonists will try to target late join players"
2017-10-24 00:09:11 -05:00
ShizCalev
889d2ba74e
Moves opened firedoors underneath opened airlocks
2017-10-24 00:05:43 -05:00
ShizCalev
af71944d71
Fixes xenobio sentience giving the wrong name ( #32016 )
2017-10-24 00:04:33 -05:00
LetterJay
95cb834389
dupe item state for donation item
2017-10-23 23:34:15 -05:00
jughu
9848da0544
Blacklists holo injectors from surplus crates ( #32001 )
...
* Update uplink_item.dm
* Update uplink_item.dm
2017-10-23 22:54:24 -05:00
LetterJay
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
LetterJay
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
Jordan Brown
94826620fa
Late join antagonists will try to target late join players ( #31560 )
2017-10-23 20:08:43 -05:00
Jordan Brown
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
LetterJay
6360be2041
Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883
...
[MIRROR] Removes duplicate typecaches
2017-10-23 20:16:51 -04:00
LetterJay
74580efe35
Merge pull request #3572 from Citadel-Station-13/upstream-merge-31876
...
[MIRROR] Makes cleanbots clean up remains
2017-10-23 17:49:09 -04:00
LetterJay
3243eaa6b8
Merge pull request #3573 from Citadel-Station-13/upstream-merge-32003
...
[MIRROR] fixes AIs being able to teleport the id card console inserted cards to their core
2017-10-23 16:54:57 -04:00
LetterJay
889d96269e
Merge pull request #3574 from Citadel-Station-13/upstream-merge-32000
...
[MIRROR] Fixes get_turf_pixel returning null when called on turfs
2017-10-23 16:54:27 -04:00
LetterJay
434d7d0a0b
Merge pull request #3576 from Citadel-Station-13/upstream-merge-32002
...
[MIRROR] Removes mob references from camera motion tracking
2017-10-23 16:54:12 -04:00
LetterJay
ad3bafcb42
Update motion.dm
2017-10-23 14:16:15 -05:00
LetterJay
dd53de8859
Update mob.dm
2017-10-23 14:15:43 -05:00
LetterJay
f0a32458bb
Update human_defines.dm
2017-10-23 14:15:30 -05:00
LetterJay
9367eb23c5
Update iv_drip.dm
2017-10-23 14:15:20 -05:00
LetterJay
9a86385a23
Merge pull request #3569 from Citadel-Station-13/upstream-merge-31834
...
[MIRROR] mechs no longer spam deflect attack messages for attacks with no damage
2017-10-23 15:08:45 -04:00
LetterJay
97929ff3f1
Merge pull request #3570 from Citadel-Station-13/upstream-merge-31885
...
Fixes #3397
2017-10-23 15:08:11 -04:00
LetterJay
9436a60b8f
Merge pull request #3567 from Michiyamenotehifunana/ears-fix
...
Fixes several ears
2017-10-23 15:07:03 -04:00
LetterJay
f2860a7760
Merge pull request #3565 from Citadel-Station-13/upstream-merge-31990
...
[MIRROR] Removes golem rune code
2017-10-23 14:52:58 -04:00
LetterJay
fc07e15f61
Merge pull request #3563 from Citadel-Station-13/upstream-merge-31992
...
[MIRROR] Fixes being unable to merge full stacks
2017-10-23 14:52:28 -04:00
LetterJay
06942978b1
Merge pull request #3561 from Citadel-Station-13/upstream-merge-32017
...
[MIRROR] Fixes a SET_CONFIG bug
2017-10-23 14:51:06 -04:00
LetterJay
9f08b1898b
Merge pull request #3560 from Citadel-Station-13/upstream-merge-31923
...
[MIRROR] Composting plants/pills transfers all reagents
2017-10-23 14:50:52 -04:00
LetterJay
c17d1dce40
Merge pull request #3559 from Citadel-Station-13/upstream-merge-31948
...
[MIRROR] Fixes champrojector camera bugs
2017-10-23 14:50:34 -04:00
LetterJay
4136be0361
Merge pull request #3558 from Citadel-Station-13/upstream-merge-31978
...
[MIRROR] Cleans up datum traitor minimally.
2017-10-23 14:50:05 -04:00
