Commit Graph

7886 Commits

Author SHA1 Message Date
LetterJay 6b0bb7268e Merge pull request #3611 from Citadel-Station-13/upstream-merge-31945
[MIRROR] Adds ambience to the SM and portable generators
2017-10-27 02:16:02 -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
LetterJay 4facc9c04e Update pump.dm 2017-10-27 00:23:13 -05:00
LetterJay 2b699d8d73 Update volume_pump.dm 2017-10-27 00:05:28 -05:00
CitadelStationBot 3af668d697 Automatic changelog generation for PR #3610 [ci skip] 2017-10-26 15:54:34 -05:00
LetterJay bdc81de1c5 Merge pull request #3610 from Citadel-Station-13/upstream-merge-31954
[MIRROR] Changed chemical heater and smoke machine sprites
2017-10-26 16:54:33 -04:00
LetterJay 646ddb9bc2 Merge pull request #3609 from Citadel-Station-13/upstream-merge-32089
[MIRROR] Fixes light source qdel issues.
2017-10-26 16:54:17 -04:00
LetterJay bdeaa6e886 Merge pull request #3607 from Citadel-Station-13/upstream-merge-32076
[MIRROR] Fixes SoC creating braindead aliens
2017-10-26 16:53:40 -04:00
CitadelStationBot 67c93bc430 Automatic changelog generation for PR #3606 [ci skip] 2017-10-26 15:53:10 -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
CitadelStationBot 5e237e956e Automatic changelog generation for PR #3604 [ci skip] 2017-10-26 15:51:55 -05: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
CitadelStationBot 7e91156580 Automatic changelog generation for PR #3603 [ci skip] 2017-10-26 15:51:06 -05: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
LetterJay 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
CitadelStationBot 3f1857ce4f Automatic changelog generation for PR #3614 [ci skip] 2017-10-26 13:21:50 -05:00
LetterJay 02623b8e59 Merge pull request #3614 from Citadel-Station-13/upstream-merge-32057
[MIRROR] Makes luxurious emergency shuttle noteleport
2017-10-26 14:21:48 -04:00
LetterJay 1df0bc16a4 Merge pull request #3608 from Citadel-Station-13/upstream-merge-32082
[MIRROR] Fixes pipe runtime
2017-10-26 14:21:07 -04:00
LetterJay 951c75ae13 Merge pull request #3601 from Citadel-Station-13/upstream-merge-32070
[MIRROR] Corrects disabled vent in delta toxins lab.
2017-10-26 14:20:49 -04:00
CitadelStationBot 3e8fcd43fd Makes luxurious emergency shuttle noteleport 2017-10-25 23:39:41 -05:00
ShizCalev dbba59e0b5 Makes luxurious emergency shuttle noteleport 2017-10-25 23:39:41 -05:00
CitadelStationBot 129cb1acac Adds ambience to the SM and portable generators 2017-10-25 23:37:14 -05:00
Emmett Gaines c7d3696636 Adds ambience to the SM and portable generators (#31945)
* Adds aambience to the SM and portable generators

* lowered pitch of supermatter

* start and end fix
2017-10-25 23:37:14 -05:00
CitadelStationBot 196da0c15b Changed chemical heater and smoke machine sprites 2017-10-25 23:36:03 -05:00
nicbn 23871f7643 1 2017-10-25 23:36:03 -05:00
CitadelStationBot df69f38e7b Fixes light source qdel issues. 2017-10-25 23:34:52 -05:00
Kyle Spier-Swenson 671ae577f0 Fixes light source qdel issues. 2017-10-25 23:34:52 -05:00
CitadelStationBot deb9c6c5c5 Fixes pipe runtime 2017-10-25 23:32:40 -05:00
ShizCalev 6316c0d989 Fixes pipe runetime 2017-10-25 23:32:40 -05:00
CitadelStationBot 15db082b4e Fixes SoC creating braindead aliens 2017-10-25 23:32:33 -05:00
ShizCalev 7c34440a06 Fixes braindead aliums 2017-10-25 23:32:33 -05:00
Emmett Gaines ae86a75362 Greyscale cables 2017-10-25 21:46:57 -05:00
CitadelStationBot 60e338107f Fixes excessive overlay churn 2017-10-25 21:45:47 -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
CitadelStationBot 040e02f4bf Adds cogscarab shells and marauder armor into the spawners menu, and tweaks their alerts 2017-10-25 21:45:40 -05:00
Ashe Higgs 773b44e799 Cogscarab shells/construct chassis on spawn menu (#32048) 2017-10-25 21:45:40 -05:00
CitadelStationBot dd49dcec6d Fixes being able to stack stargazers on one tile 2017-10-25 21:44:29 -05:00
Ashe Higgs dc5f011c48 Fixes being able to stack stargazers on one tile (#32085) 2017-10-25 21:44:29 -05:00
CitadelStationBot 630b332848 Automatic changelog generation for PR #3596 [ci skip] 2017-10-25 20:03:12 -05:00
CitadelStationBot 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
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 b6b6c27c3f Automatic changelog generation for PR #3599 [ci skip] 2017-10-25 20:02:10 -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
CitadelStationBot 3a3a6f2903 Automatic changelog generation for PR #3600 [ci skip] 2017-10-25 20:01:54 -05:00
CitadelStationBot 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
CitadelStationBot 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
CitadelStationBot c1b679d937 Corrects disabled vent in delta toxins lab. 2017-10-25 18:55:54 -05:00
Leo 6235c66517 Merge pull request #32070 from ShizCalev/delta-vent
Corrects disabled vent in delta toxins lab.
2017-10-25 18:55:54 -05:00
CitadelStationBot 8c3a09a18c Fixes heartbeat message spam 2017-10-25 18:55:24 -05:00