Commit Graph

10875 Commits

Author SHA1 Message Date
Jordan Brown dbab8bbdab Adds open/close sound to blastdoors and shutters 2017-12-27 10:50:17 -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 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
CitadelStationBot 5a515ff24a Automatic changelog generation for PR #4544 [ci skip] 2017-12-26 15:58:19 -06:00
CitadelStationBot 8aed987bd9 [MIRROR] Fixes emagged cleanbot acid attack doing no damage (#4544)
* Fixes emagged cleanbot acid attack doing no damage (#33848)

* Fixes emagged cleanbot acid attack doing no damage
2017-12-26 13:58:16 -08:00
CitadelStationBot b45ae2078f Automatic changelog generation for PR #4543 [ci skip] 2017-12-26 15:58:04 -06:00
CitadelStationBot 9aa77b7df1 [MIRROR] Rebalances virus healing (#4543)
* Rebalances virus healing (#33815)

* Rebalances virus healing

* carbon

* Rebalances virus healing
2017-12-26 13:58:02 -08:00
CitadelStationBot f19abb89d1 Add song title display to Play Internet Sound 2017-12-26 15:35:05 -06:00
Tad Hardesty 2e4b622aa4 Add song title display to Play Internet Sound (#33839)
* Add song title display to Play Internet Sound

* Expands youtube-dl -J flag
2017-12-26 15:35:05 -06:00
LetterJay ab1965b3a2 Merge pull request #4398 from Citadel-Station-13/upstream-merge-32916
[MIRROR] [READY] Monkey mode overhaul
2017-12-26 08:38:42 -06:00
LetterJay 290c1e0868 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32916 2017-12-26 08:24:20 -06:00
LetterJay 14472e5139 Merge pull request #4443 from Citadel-Station-13/upstream-merge-33485
[MIRROR] code improvements from mso and co
2017-12-26 07:38:17 -06:00
CitadelStationBot d36b3e036b Automatic changelog generation for PR #4447 [ci skip] 2017-12-26 07:38:08 -06:00
LetterJay 7be17b6f12 Merge pull request #4447 from Citadel-Station-13/upstream-merge-33639
[MIRROR] Golems can wear labcoats
2017-12-26 07:38:06 -06:00
LetterJay 4cfb2e323b Merge branch 'master' into upstream-merge-33504 2017-12-26 06:08:12 -06:00
CitadelStationBot 29e221c3f9 Automatic changelog generation for PR #4503 [ci skip] 2017-12-26 05:59:54 -06:00
LetterJay 358c625ed3 Merge pull request #4503 from Citadel-Station-13/upstream-merge-33590
[MIRROR] [READY]Clownborgs - ADMIN SPAWN ONLY
2017-12-26 05:59:52 -06:00
CitadelStationBot 69a12f0557 Automatic changelog generation for PR #4472 [ci skip] 2017-12-26 05:29:44 -06:00
LetterJay e4f39a97c3 Merge pull request #4472 from Citadel-Station-13/upstream-merge-33634
[MIRROR] (probably?) Fixes being able to create two Eminences at a time + other Eminence issues
2017-12-26 05:29:42 -06:00
LetterJay 95642e631f Update shuttle.dm 2017-12-26 05:28:55 -06:00
LetterJay e51baed92e Update labcoat.dm 2017-12-26 05:27:01 -06:00
CitadelStationBot 6a15f4e575 Cut through handcuffs with power wirecutters 2017-12-26 00:14:24 -06:00
Matt Smith 7b159e204c Cut through handcuffs with power wirecutters (#33822)
* Cut through handcuffs with power wirecutters

* unbuckle is handled on delete of the handcuffs
2017-12-26 00:14:24 -06:00
CitadelStationBot 44cf8cd6ad Fixes deleting handcuffs 2017-12-26 00:13:13 -06:00