LetterJay
d6c143c860
Merge pull request #3643 from Citadel-Station-13/upstream-merge-32121
...
[MIRROR] Fixes motion cameras runtiming when a target is deleted before they are detected to be leaving the range/dead.
2017-10-29 03:44:55 -04:00
LetterJay
c62f6ec353
Merge pull request #3632 from Citadel-Station-13/upstream-merge-32093
...
[MIRROR] Roundstart species pref fixes/removes redundant species config
2017-10-29 03:41:59 -04:00
LetterJay
74a33169cb
Merge pull request #3642 from Citadel-Station-13/upstream-merge-32051
...
[MIRROR] More radiation balance changes and fixes
2017-10-29 02:41:44 -04:00
LetterJay
bea9365ea9
Merge branch 'master' into upstream-merge-32093
2017-10-29 02:27:52 -04:00
LetterJay
e150fe28b6
Merge branch 'master' into upstream-merge-31877
2017-10-28 23:57:51 -04:00
CitadelStationBot
4e4634649e
[MIRROR] [Review Again] Updates the cloning manual ( #3663 )
...
* [Review Again] Updates the cloning manual
* Update manuals.dm
2017-10-28 01:19:38 -07:00
LetterJay
0e553b26db
Merge branch 'master' into upstream-merge-31737
2017-10-28 02:20:25 -04:00
kevinz000
1110cca542
Fixes motion runtimes from deleted targets ( #32121 )
2017-10-27 04:47:45 -05:00
Emmett Gaines
ea36d5944e
More radiation balance changes and fixes ( #32051 )
...
* more balance changes and fixes
* cleanup
2017-10-27 03:08:03 -05:00
LetterJay
af96c29a0c
Merge pull request #3635 from ktccd/Undo_Borer_HUDS
...
Undoes Borer HUDs
2017-10-27 02:49:03 -04:00
LetterJay
141de52658
Merge pull request #3641 from Citadel-Station-13/upstream-merge-30791
...
[MIRROR] Assmos part 1, #2
2017-10-27 02:47:56 -04:00
LetterJay
31ee6947ee
Merge pull request #3624 from Citadel-Station-13/upstream-merge-32039
...
[MIRROR] Rebalances clockwork marauders
2017-10-27 02:44:17 -04:00
LetterJay
3ad1ac335f
Merge pull request #3623 from Citadel-Station-13/upstream-merge-31991
...
[MIRROR] fixes reflectors dropping extra mats
2017-10-27 02:43:35 -04:00
LetterJay
f268112af1
Merge pull request #3617 from Citadel-Station-13/upstream-merge-32019
...
[MIRROR] Fixes defib ghost prompt
2017-10-27 02:18:14 -04:00
LetterJay
3b82c26cb5
Merge pull request #3612 from Citadel-Station-13/upstream-merge-32083
...
[MIRROR] Prevents inappropriate slapping
2017-10-27 02:16:34 -04:00
LetterJay
49fa09d1bd
Merge pull request #3578 from Citadel-Station-13/upstream-merge-31944
...
[MIRROR] Atmos construction rework again
2017-10-27 02:00:11 -04:00
as334
eb4f6326d7
Assmos part 1, #2
2017-10-26 23:12:27 -05:00
LetterJay
4cc0cf3ee7
Merge pull request #3606 from Citadel-Station-13/upstream-merge-31972
...
[MIRROR] Greyscale cables
2017-10-26 16:53:08 -04:00
LetterJay
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
LetterJay
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
LetterJay
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
ktccd
ad911c2b1b
Undoes Borer HUDs
...
Critical flaw in antag-HUD system prevented proper use, since automatic
reverting of original PR is no longer possible, (Probably due to another
antag-hud being added afterwards), this is a manual one.
2017-10-26 21:19:34 +02:00
KorPhaeron
ef9c27ef0a
Roundstart species pref fixes/removes redundant species config
2017-10-26 12:00:56 -05:00
oranges
60102f9b76
Merge pull request #32039 from Xhuis/marauders
...
Rebalances clockwork marauders
2017-10-26 05:03:59 -05:00
oranges
28053a603a
Merge pull request #31991 from ShizCalev/reflector-stack-fix
...
fixes reflectors dropping extra mats
2017-10-26 05:03:48 -05:00
ShizCalev
e92dec4e4c
Fixes defib ghost prompt ( #32019 )
...
* Fixes #32013
* proc instead.
2017-10-25 23:42:10 -05:00
ShizCalev
dbba59e0b5
Makes luxurious emergency shuttle noteleport
2017-10-25 23:39:41 -05:00
Jordan Brown
ddbd1fcf85
--no-edit
2017-10-25 23:38:24 -05:00
Emmett Gaines
ae86a75362
Greyscale cables
2017-10-25 21:46:57 -05:00
Kyle Spier-Swenson
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
Ashe Higgs
773b44e799
Cogscarab shells/construct chassis on spawn menu ( #32048 )
2017-10-25 21:45:40 -05:00
Ashe Higgs
dc5f011c48
Fixes being able to stack stargazers on one tile ( #32085 )
2017-10-25 21:44:29 -05:00
CitadelStationBot
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
CitadelStationBot
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
deathride58
70a2c466f3
manual mirror of upstream robotic surgery pr
2017-10-25 14:29:45 -04: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
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
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
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
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
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
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
