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
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
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
70a2c466f3
manual mirror of upstream robotic surgery pr
2017-10-25 14:29:45 -04: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
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
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
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
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
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
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
6360be2041
Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883
...
[MIRROR] Removes duplicate typecaches
2017-10-23 20:16:51 -04:00
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
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
ad3bafcb42
Update motion.dm
2017-10-23 14:16:15 -05:00
9367eb23c5
Update iv_drip.dm
2017-10-23 14:15:20 -05:00
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
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
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
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
ce2f1cc672
Merge pull request #3554 from Citadel-Station-13/upstream-merge-31981
...
[MIRROR] Removes mob.lastattacked and replaces lastattacker with a string
2017-10-23 14:48:10 -04:00
636ab7d156
Removes mob references from camera motion tracking
2017-10-23 13:32:32 -05:00
23765d9ddd
Update stunbaton.dm
2017-10-23 13:17:35 -05:00
c1bd7bc6ba
Map syncs 1 - Code syncs
2017-10-23 12:56:26 -04:00
f4e0eab993
fixes AIs being able to teleport the id card console inserted cards to their core ( #32003 )
...
* Update card.dm
* Update card.dm
2017-10-23 08:59:24 -05:00
c51edc3bcd
Removes duplicate typecaches
2017-10-23 08:25:30 -05:00
82f58c4ae2
Update mecha_defense.dm ( #31834 )
2017-10-23 08:20:02 -05:00
095839becf
Merge pull request #3553 from Citadel-Station-13/upstream-merge-31969
...
[MIRROR] Gets rids of spawns in airlock code
2017-10-23 04:05:19 -04:00
a1236008f3
Merge pull request #3552 from Citadel-Station-13/upstream-merge-31355
...
[MIRROR] Code Consistency: luminosity --> light_range
2017-10-23 03:44:46 -04:00
4dc2ac3d94
Merge branch 'master' into upstream-merge-31913
2017-10-23 01:25:35 -04:00
2c251f929f
Fixes being unable to merge full stacks ( #31992 )
2017-10-23 00:09:29 -05:00
5504b4c1e2
Fixes champrojector camera bug ( #31948 )
2017-10-22 17:50:11 -05:00
LetterJay