Commit Graph
5474 Commits
Author SHA1 Message Date
LetterJayandGitHub 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
LetterJayandGitHub 4ab8e0d8f1 Merge pull request #3625 from Citadel-Station-13/upstream-merge-31987
[MIRROR] Inlines and optimizes compile_overlays
2017-10-27 02:44:48 -04:00
LetterJayandGitHub 31ee6947ee Merge pull request #3624 from Citadel-Station-13/upstream-merge-32039
[MIRROR] Rebalances clockwork marauders
2017-10-27 02:44:17 -04:00
LetterJayandGitHub 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
LetterJayandGitHub ab12387ebd Merge pull request #3622 from Citadel-Station-13/upstream-merge-32029
[MIRROR] Actual performance improvements for GetAllContents
2017-10-27 02:43:16 -04:00
LetterJayandGitHub a7b464e47e Merge pull request #3620 from Citadel-Station-13/upstream-merge-32030
[MIRROR] Allows components to qdel from Initialize
2017-10-27 02:19:07 -04:00
LetterJayandGitHub 9a1db237d2 Merge pull request #3618 from Citadel-Station-13/upstream-merge-32058
[MIRROR] Fixes lightgeist spawning
2017-10-27 02:18:48 -04:00
LetterJayandGitHub 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
LetterJayandGitHub 6713634146 Merge pull request #3616 from Citadel-Station-13/upstream-merge-32084
[MIRROR] Fixes minor runtime
2017-10-27 02:18:02 -04:00
LetterJayandGitHub 3202baec26 Merge pull request #3615 from Citadel-Station-13/upstream-merge-32075
[MIRROR] Makes staff of change randomly assign a borg module
2017-10-27 02:17:45 -04:00
LetterJayandGitHub 4fee09e236 Merge pull request #3613 from Citadel-Station-13/upstream-merge-32098
[MIRROR] Fixes a runtime on organ replacement
2017-10-27 02:16:47 -04:00
LetterJayandGitHub 3b82c26cb5 Merge pull request #3612 from Citadel-Station-13/upstream-merge-32083
[MIRROR] Prevents inappropriate slapping
2017-10-27 02:16:34 -04:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 4facc9c04e Update pump.dm 2017-10-27 00:23:13 -05:00
LetterJayandGitHub 2b699d8d73 Update volume_pump.dm 2017-10-27 00:05:28 -05:00
as334andCitadelStationBot eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 4cc0cf3ee7 Merge pull request #3606 from Citadel-Station-13/upstream-merge-31972
[MIRROR] Greyscale cables
2017-10-26 16:53:08 -04:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
orangesandCitadelStationBot c3dbb8925b Merge pull request #31987 from Cyberboss/InlineCO
May as well shave some yaks
2017-10-26 05:05:09 -05:00
orangesandCitadelStationBot 60102f9b76 Merge pull request #32039 from Xhuis/marauders
Rebalances clockwork marauders
2017-10-26 05:03:59 -05:00
orangesandCitadelStationBot 28053a603a Merge pull request #31991 from ShizCalev/reflector-stack-fix
fixes reflectors dropping extra mats
2017-10-26 05:03:48 -05:00
Remie RichardsandCitadelStationBot 649fe581fd Actual performance improvements for GetAllContents (#32029)
* Actual performance improvements for GetAllContents

* Shaving off literal tens of clock cycles
2017-10-26 05:02:36 -05:00
Jordan BrownandCitadelStationBot 50f942ef4e Allows components to qdel from Initialize 2017-10-26 00:01:52 -05:00
ShizCalevandCitadelStationBot c016e1e830 Fixes lightgeist spawning 2017-10-25 23:43:20 -05:00
ShizCalevandCitadelStationBot e92dec4e4c Fixes defib ghost prompt (#32019)
* Fixes #32013

* proc instead.
2017-10-25 23:42:10 -05:00
AnturKandCitadelStationBot 6c89f2c8aa Fixes minor runtime 2017-10-25 23:40:59 -05:00
ShizCalevandCitadelStationBot 6fc3da14d4 Makes staff of change randomly assign a borg module 2017-10-25 23:39:48 -05:00
ShizCalevandCitadelStationBot dbba59e0b5 Makes luxurious emergency shuttle noteleport 2017-10-25 23:39:41 -05:00
ACCountandCitadelStationBot 1c1f39d1d3 Fixes a runtime on organ replacement 2017-10-25 23:38:31 -05:00
Jordan BrownandCitadelStationBot ddbd1fcf85 --no-edit 2017-10-25 23:38:24 -05:00
Emmett GainesandCitadelStationBot 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
Kyle Spier-SwensonandCitadelStationBot 671ae577f0 Fixes light source qdel issues. 2017-10-25 23:34:52 -05:00
ShizCalevandCitadelStationBot 7c34440a06 Fixes braindead aliums 2017-10-25 23:32:33 -05:00
Emmett GainesandCitadelStationBot ae86a75362 Greyscale cables 2017-10-25 21:46:57 -05:00
Kyle Spier-SwensonandCitadelStationBot 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 HiggsandCitadelStationBot 773b44e799 Cogscarab shells/construct chassis on spawn menu (#32048) 2017-10-25 21:45:40 -05:00
Ashe HiggsandCitadelStationBot dc5f011c48 Fixes being able to stack stargazers on one tile (#32085) 2017-10-25 21:44:29 -05:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
LeoandCitadelStationBot 1f83d3cbb7 Merge pull request #32071 from ShizCalev/heart-spam-fix
Fixes heartbeat message spam
2017-10-25 18:55:24 -05:00
LetterJayandGitHub 95bae508aa Merge pull request #3595 from deathride58/roboticsurgerymanualmirror
Manual mirror of upstream robotic surgery PR
2017-10-25 14:53:01 -04:00