4cc0cf3ee7
Merge pull request #3606 from Citadel-Station-13/upstream-merge-31972
...
[MIRROR] Greyscale cables
2017-10-26 16:53:08 -04:00
47b5fe53ab
Merge pull request #3605 from Citadel-Station-13/upstream-merge-32065
...
[MIRROR] Fixes excessive overlay churn
2017-10-26 16:52:19 -04:00
98ac9f27c8
Merge pull request #3604 from Citadel-Station-13/upstream-merge-32048
...
[MIRROR] Adds cogscarab shells and marauder armor into the spawners menu, and tweaks their alerts
2017-10-26 16:51:53 -04:00
f584faee51
Merge pull request #3603 from Citadel-Station-13/upstream-merge-32085
...
[MIRROR] Fixes being able to stack stargazers on one tile
2017-10-26 16:51:05 -04:00
1ecd723475
Merge pull request #3597 from Citadel-Station-13/upstream-merge-32071
...
[MIRROR] Fixes heartbeat message spam
2017-10-26 16:50:51 -04:00
dbba59e0b5
Makes luxurious emergency shuttle noteleport
2017-10-25 23:39:41 -05:00
ae86a75362
Greyscale cables
2017-10-25 21:46:57 -05:00
927dea03ce
Fixes excessive overlay churn ( #32065 )
...
* Fixes excessive overlay chern
Adding an overlay on every cross and uncross of every player (with how bloody the station gets this is called on just about every fucking movement, some times multiple times if there are multiple types of stains (oil, blood, alien, etc) is an excessive as fuck amount of chern in the overlay subsystem.
This is likely the cause of overlays being so high.
* I APOLOGIZE FOR NOTHING!
2017-10-25 21:45:46 -05:00
773b44e799
Cogscarab shells/construct chassis on spawn menu ( #32048 )
2017-10-25 21:45:40 -05:00
dc5f011c48
Fixes being able to stack stargazers on one tile ( #32085 )
2017-10-25 21:44:29 -05:00
f6331eedf8
[MIRROR] Shuttle navigation computers ignore the shuttle when placing a new location ( #3596 )
...
* Shuttle navigation computers ignore the shuttle when placing a new location (#31722 )
* Fixed the shuttle navigation computer allowing you to move stationary docking ports
* Made the shuttle navigation computer ignore the shuttle it controls when determining valid turfs
* Removed a redundant list
* Moved a var from stationary docking ports to mobile docking ports
* Removed a sanity check
* Shuttle navigation computers ignore the shuttle when placing a new location
2017-10-25 20:03:11 -05:00
2f74805a46
[MIRROR] Fixes teleporters not actually denying teleports from Centcom ( #3598 )
...
* Merge pull request #32043 from tgstation/Cyberboss-patch-3
Fixes teleporters not actually denying teleports from Centcom
* Fixes teleporters not actually denying teleports from Centcom
2017-10-25 20:02:36 -05:00
deaec38579
[MIRROR] Fixes shades hearing heartbeats ( #3599 )
...
* Merge pull request #32059 from ShizCalev/shade-heartbeat
Fixes shades hearing heartbeats
* Fixes shades hearing heartbeats
2017-10-25 20:02:09 -05:00
7ee7942aa4
[MIRROR] [s] Fixes changling golem exploit ( #3600 )
...
* Merge pull request #32061 from ShizCalev/ling-golem-exploit-fix
Fixes changling golem exploit
* [s] Fixes changling golem exploit
2017-10-25 20:01:52 -05:00
7ad3afa3c0
[MIRROR] Footprints no longer contain stupid amounts of blood ( #3602 )
...
* Footprints no longer contain stupid amounts of blood (#32056 )
* Footprints no longer contain stupid amounts of blood
2017-10-25 20:01:31 -05:00
1f83d3cbb7
Merge pull request #32071 from ShizCalev/heart-spam-fix
...
Fixes heartbeat message spam
2017-10-25 18:55:24 -05:00
95bae508aa
Merge pull request #3595 from deathride58/roboticsurgerymanualmirror
...
Manual mirror of upstream robotic surgery PR
2017-10-25 14:53:01 -04:00
d6735ad5b5
Fuck
2017-10-25 14:40:40 -04:00
70a2c466f3
manual mirror of upstream robotic surgery pr
2017-10-25 14:29:45 -04:00
b237b8286a
heart of darkness revives non-shadow as shadowpeople
2017-10-25 00:13:05 -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
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
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
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
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
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
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
0986857f18
Update crayons.dm ( #32024 )
2017-10-24 08:07:42 -05: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
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
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
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
94826620fa
Late join antagonists will try to target late join players ( #31560 )
2017-10-23 20:08:43 -05:00
LetterJay