Commit Graph

7843 Commits

Author SHA1 Message Date
Remie Richards 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
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
LetterJay 95bae508aa Merge pull request #3595 from deathride58/roboticsurgerymanualmirror
Manual mirror of upstream robotic surgery PR
2017-10-25 14:53:01 -04:00
CitadelStationBot b1bb0948b9 Automatic changelog generation for PR #3594 [ci skip] 2017-10-25 13:52:51 -05:00
LetterJay 42939bb914 Merge pull request #3594 from Citadel-Station-13/upstream-merge-31912
[MIRROR] Heart of darkness revives non-shadow as shadowpeople
2017-10-25 14:52:49 -04:00
deathride58 d6735ad5b5 Fuck 2017-10-25 14:40:40 -04:00
deathride58 70a2c466f3 manual mirror of upstream robotic surgery pr 2017-10-25 14:29:45 -04:00
CitadelStationBot afd1155ef0 Heart of darkness revives non-shadow as shadowpeople 2017-10-25 00:13:05 -05:00
JJRcop b237b8286a heart of darkness revives non-shadow as shadowpeople 2017-10-25 00:13:05 -05:00
CitadelStationBot d0a9c56f3b Automatic changelog generation for PR #3432 [ci skip] 2017-10-24 22:04:52 -05:00
deathride58 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
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 3822aa83a3 Update new_player.dm 2017-10-24 19:49:38 -05: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 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
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
CitadelStationBot abd2c1054c Automatic changelog generation for PR #3582 [ci skip] 2017-10-24 18:28:35 -05:00
LetterJay 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
CitadelStationBot 1011caced5 Automatic changelog generation for PR #3581 [ci skip] 2017-10-24 18:24:49 -05:00
LetterJay 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
LetterJay 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
LetterJay 72bd156589 Update new_player.dm 2017-10-24 18:19:49 -05:00
LetterJay e20664dad3 Revert "Revert "[MIRROR] Late join antagonists will try to target late join players"" 2017-10-24 18:18:20 -05:00
CitadelStationBot 47af2267a6 Ratvar summoning now ends the round/triggers mass proselytize 2017-10-24 18:07:06 -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
CitadelStationBot 4fca33d408 Transit space blocks explosions 2017-10-24 15:47:53 -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
LetterJay 14ed0d84e8 kill-me 2017-10-24 11:57:08 -05:00
LetterJay cb30805b04 Update custom_items.dm 2017-10-24 11:25:30 -05:00
CitadelStationBot ae9fe441d1 adds logging to ripley gibs 2017-10-24 11:25:04 -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
CitadelStationBot 0cdab7e6be fixes pentetic acid dealing radiation damage instead of healing it 2017-10-24 10:55:22 -05:00
kevinz000 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
CitadelStationBot f0720a305e Adds hidden fingerprints to crayon paintings 2017-10-24 08:07:42 -05:00
kevinz000 0986857f18 Update crayons.dm (#32024) 2017-10-24 08:07:42 -05:00
LetterJay ffd635e209 Merge pull request #3584 from Citadel-Station-13/revert-3580-upstream-merge-31560
Revert "[MIRROR] Late join antagonists will try to target late join players"
2017-10-24 01:10:17 -04: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
CitadelStationBot 07063ad624 Fixes xenobio sentience giving the wrong name 2017-10-24 00:04:34 -05:00