Commit Graph

10907 Commits

Author SHA1 Message Date
deathride58 aa83dbf500 Merge pull request #4532 from Citadel-Station-13/upstream-merge-33759
[MIRROR] Modified the starting locations of advanced camera console eyes
2017-12-28 02:54:18 +00:00
CitadelStationBot f55cb8f9b3 Automatic changelog generation for PR #4531 [ci skip] 2017-12-27 20:53:49 -06:00
deathride58 a8154d102a Merge pull request #4531 from Citadel-Station-13/upstream-merge-33777
[MIRROR] Arena shuttle teleport fix
2017-12-28 02:53:47 +00:00
deathride58 b258879423 Merge pull request #4537 from Citadel-Station-13/upstream-merge-33828
[MIRROR] Revert "Vending TGUI"
2017-12-28 02:53:22 +00:00
deathride58 754d3d9b28 Merge pull request #4539 from Citadel-Station-13/upstream-merge-33840
[MIRROR] Logs traumas in the feedback database
2017-12-28 02:53:01 +00:00
CitadelStationBot 59c7a32e1a Automatic changelog generation for PR #4538 [ci skip] 2017-12-27 20:52:47 -06:00
deathride58 0f3e69a420 Merge pull request #4538 from Citadel-Station-13/upstream-merge-33820
[MIRROR] Material containers only insert on help intent
2017-12-28 02:52:45 +00:00
deathride58 3e741abc89 Merge pull request #4541 from Citadel-Station-13/upstream-merge-33832
[MIRROR] Improve parts of CentCom's appearance slightly
2017-12-28 02:52:30 +00:00
CitadelStationBot d87c245227 Automatic changelog generation for PR #4549 [ci skip] 2017-12-27 20:52:11 -06:00
deathride58 c286dfcefb Merge pull request #4549 from Citadel-Station-13/upstream-merge-33833
[MIRROR] Fixes ghost zoom being broken
2017-12-28 02:52:08 +00:00
CitadelStationBot c52c7e9c6f Automatic changelog generation for PR #4552 [ci skip] 2017-12-27 20:50:52 -06:00
deathride58 ca285046b0 Merge pull request #4552 from Citadel-Station-13/upstream-merge-33859
[MIRROR] Hallucinations no longer show open doors "bolting"
2017-12-28 02:50:50 +00:00
deathride58 aa8354c504 Merge pull request #4553 from Citadel-Station-13/upstream-merge-33850
[MIRROR] Radiation sign no longer has blood on it
2017-12-28 02:50:38 +00:00
deathride58 29d46e985a Merge pull request #4559 from Citadel-Station-13/upstream-merge-33888
[MIRROR] relic teleport no longer recursively calls itself
2017-12-28 02:50:11 +00:00
CitadelStationBot 300a2cdf96 relic teleport no longer recursively calls itself 2017-12-27 19:32:26 -06:00
Jordan Brown df080960d4 Merge pull request #33888 from optimumtact/dothefandangomistersantiago
relic teleport no longer recursively calls itself
2017-12-27 19:32:26 -06:00
CitadelStationBot 85fac687ac Radiation sign no longer has blood on it 2017-12-27 09:20:28 -06:00
Leo 70be709675 Merge pull request #33850 from nicbn/sprites
Radiation sign no longer has blood on it
2017-12-27 09:20:28 -06:00
CitadelStationBot ba3d7bf475 Hallucinations no longer show open doors "bolting" 2017-12-27 08:26:16 -06:00
Robustin 4a93756e6b Hallucinations no longer show open doors "bolting" (#33859)
* No more "bolting" open doors

* Update Hallucination.dm

* Update Hallucination.dm
2017-12-27 08:26:16 -06:00
LetterJay a034383e15 Merge pull request #4449 from Citadel-Station-13/upstream-merge-33627
[MIRROR] dock() re-organization
2017-12-27 07:01:40 -06:00
LetterJay c84a8cc9e1 Merge pull request #4370 from Citadel-Station-13/upstream-merge-33504
[MIRROR] Saves newscaster data and photos to round logs folder
2017-12-27 04:46:04 -06:00
LetterJay e2d2c8cda0 Merge branch 'master' into upstream-merge-33627 2017-12-27 04:41:27 -06:00
CitadelStationBot a5923374ab Automatic changelog generation for PR #4534 [ci skip] 2017-12-27 03:05:51 -06:00
LetterJay 2b77dda3e9 Merge pull request #4534 from Citadel-Station-13/upstream-merge-33780
[MIRROR] Blocks auxiliary bases from being placed on top of lava or indestructible turfs
2017-12-27 03:05:48 -06:00
LetterJay 67ef791794 Merge pull request #4535 from Citadel-Station-13/upstream-merge-33821
[MIRROR] Fixes deleting handcuffs
2017-12-27 03:05:33 -06:00
CitadelStationBot b8af7773e5 Automatic changelog generation for PR #4536 [ci skip] 2017-12-27 03:05:23 -06:00
LetterJay d33fe81662 Merge pull request #4536 from Citadel-Station-13/upstream-merge-33822
[MIRROR] Cut through handcuffs with power wirecutters
2017-12-27 03:05:21 -06:00
CitadelStationBot d70c0ea265 Automatic changelog generation for PR #4551 [ci skip] 2017-12-27 03:04:44 -06:00
LetterJay bb9e223b7d Merge pull request #4551 from Citadel-Station-13/upstream-merge-33749
[MIRROR] Maybe make R&D console icons load faster
2017-12-27 03:04:42 -06:00
LetterJay 0b2e6562af Merge pull request #4550 from Citadel-Station-13/upstream-merge-33770
[MIRROR] adds ABSTRACT_1 flag to internal magazine objects
2017-12-27 03:04:17 -06:00
LetterJay 6926e94bf8 Merge pull request #4548 from Citadel-Station-13/upstream-merge-33782
[MIRROR] Fixed shuttle docking computers not working more than once
2017-12-27 03:03:33 -06:00
CitadelStationBot 1542f1dda8 Automatic changelog generation for PR #4546 [ci skip] 2017-12-27 03:03:18 -06:00
LetterJay 11ca5afc92 Merge pull request #4546 from Citadel-Station-13/upstream-merge-33834
[MIRROR] Drones now spawn with seasonal hats depending on active holidays [VERY Important PR]
2017-12-27 03:03:16 -06:00
LetterJay 740ac71b2a Merge pull request #4545 from Citadel-Station-13/upstream-merge-33849
[MIRROR] Fixes AI camera lights not updating when tracking mobs
2017-12-27 03:02:11 -06:00
CitadelStationBot 4825bbd4b1 Automatic changelog generation for PR #4542 [ci skip] 2017-12-27 03:01:49 -06:00
LetterJay 5400b8ac0e Merge pull request #4542 from Citadel-Station-13/upstream-merge-33839
[MIRROR] Add song title display to Play Internet Sound
2017-12-27 03:01:46 -06:00
CitadelStationBot 461ec24958 Maybe make R&D console icons load faster 2017-12-27 00:06:08 -06:00
Tad Hardesty e87c591927 Maybe make R&D console icons load faster (#33749)
* Maybe make design icons load faster

* Move design icon generation to asset_cache file
2017-12-27 00:06:08 -06:00
CitadelStationBot d56b2de54b adds ABSTRACT_1 flag to internal magazine objects 2017-12-27 00:04:59 -06:00
oranges 76ccdcb94d Merge pull request #33770 from vuonojenmustaturska/internalmagfix
adds ABSTRACT_1 flag to internal magazine objects
2017-12-27 00:04:59 -06:00
CitadelStationBot ce47cc5e66 Fixes ghost zoom being broken 2017-12-26 23:50:33 -06:00
oranges 20b8f9c87f Merge pull request #33833 from deathride58/please-repoban-kev
Fixes ghost zoom being broken
2017-12-26 23:50:33 -06:00
CitadelStationBot c09881725a Fixed shuttle docking computers not working more than once 2017-12-26 23:44:16 -06:00
Cruix b0facbda47 Fixed shuttle docking computers not working more than once (#33782)
* Fixed shuttle docking computers not moving the docking port if it already existed

* Removed explicit type instantiation
2017-12-26 23:44:16 -06:00
CitadelStationBot 8df564add1 Drones now spawn with seasonal hats depending on active holidays [VERY Important PR] 2017-12-26 18:38:42 -06:00
Jordan Brown 4499ff2fad Merge pull request #33834 from Xhuis/drone_hats
Drones now spawn with seasonal hats depending on active holidays [VERY Important PR]
2017-12-26 18:38:42 -06:00
CitadelStationBot a52a4712be Fixes AI camera lights not updating when tracking mobs 2017-12-26 18:30:24 -06:00
YPOQ 752e3f7378 Fixes AI camera lights not updating when tracking mobs (#33849) 2017-12-26 18:30:24 -06:00
deathride58 dc0e3a89d5 Merge pull request #4523 from Citadel-Station-13/kevinz000-patch-3
readds shock collars
2017-12-26 22:10:09 +00:00