Commit Graph
13226 Commits
Author SHA1 Message Date
CitadelStationBot f8344cd6f5 Automatic changelog generation for PR #5316 [ci skip] 2018-02-05 20:53:26 -06:00
deathride58andGitHub a3649fc6fe Merge pull request #5316 from improvedname/Cargo
Turns the kinkmate resupply crate into an construction kit
2018-02-06 02:53:24 +00:00
CitadelStationBot b4aca60ce1 Automatic changelog generation for PR #5307 [ci skip] 2018-02-05 20:51:56 -06:00
deathride58andGitHub 9780fc64e3 Merge pull request #5307 from Michiyamenotehifunana/Medical-Turtleneck
Adds the CMO's Turtleneck!
2018-02-06 02:51:54 +00:00
CitadelStationBot b5c92f7c1e Automatic changelog generation for PR #5332 [ci skip] 2018-02-05 20:48:54 -06:00
deathride58andGitHub 0696c9eac5 Merge pull request #5332 from Citadel-Station-13/upstream-merge-35324
[MIRROR] Fix defibrillator mount runtiming continously while empty
2018-02-06 02:48:52 +00:00
deathride58andGitHub cc78931f53 Merge pull request #5331 from Citadel-Station-13/upstream-merge-35368
[MIRROR] Starts the reconquer of the changelog from the profane infidels
2018-02-06 02:48:37 +00:00
deathride58andGitHub 5357d4bd69 Merge pull request #5328 from Citadel-Station-13/upstream-merge-35322
[MIRROR] Adds missing wrapper for abductor roundend report.
2018-02-06 02:46:05 +00:00
CitadelStationBot 6d466b25dd Automatic changelog generation for PR #5326 [ci skip] 2018-02-05 20:44:47 -06:00
deathride58andGitHub f593263a9d Merge pull request #5326 from Citadel-Station-13/upstream-merge-35295
[MIRROR] Fix holorays staying if you switch holopads
2018-02-06 02:44:45 +00:00
deathride58andGitHub 3a79a17399 Merge pull request #5325 from Citadel-Station-13/upstream-merge-35316
[MIRROR] Fixes comm message list for non-unique messages.
2018-02-06 02:44:29 +00:00
CitadelStationBot f072443a4c Automatic changelog generation for PR #5322 [ci skip] 2018-02-05 20:44:15 -06:00
deathride58andGitHub d29477f4a8 Merge pull request #5322 from Citadel-Station-13/upstream-merge-35305
[MIRROR] Fixes crematorium on meta/box.
2018-02-06 02:44:12 +00:00
CitadelStationBot de1aad2b7c Automatic changelog generation for PR #5321 [ci skip] 2018-02-05 20:43:59 -06:00
deathride58andGitHub c9f7e7f14a Merge pull request #5321 from Citadel-Station-13/upstream-merge-35152
[MIRROR] Rearranges mining vendor items and code, adds conscription kit
2018-02-06 02:43:57 +00:00
CitadelStationBot 89c73c3e5f Automatic changelog generation for PR #5320 [ci skip] 2018-02-05 20:43:37 -06:00
deathride58andGitHub 024347aff2 Merge pull request #5320 from Citadel-Station-13/upstream-merge-35282
[MIRROR] Eggs from the abductor egg gland now have a random reagent instead of acid
2018-02-06 02:43:35 +00:00
CitadelStationBot 6eba5071bc Automatic changelog generation for PR #5319 [ci skip] 2018-02-05 20:43:22 -06:00
deathride58andGitHub 85b06c800a Merge pull request #5319 from Citadel-Station-13/upstream-merge-35299
[MIRROR] fixes small grammar issue on arcades
2018-02-06 02:43:20 +00:00
CitadelStationBot 8f26d222c5 Automatic changelog generation for PR #5318 [ci skip] 2018-02-05 20:43:07 -06:00
deathride58andGitHub 52109ef2ec Merge pull request #5318 from Citadel-Station-13/upstream-merge-35000
[MIRROR] Snowdin 2.0
2018-02-06 02:43:05 +00:00
CitadelStationBot 6c037ef051 Fix defibrillator mount runtiming continously while empty 2018-02-05 17:59:24 -06:00
vuonojenmustaturskaandCitadelStationBot a7057f8331 Merge pull request #35324 from AutomaticFrenzy/patch/defibrillator-runtime
Fix defibrillator mount runtiming continously while empty
2018-02-05 17:59:24 -06:00
CitadelStationBot 291e987f0d Starts the reconquer of the changelog from the profane infidels 2018-02-05 17:58:12 -06:00
LeoandCitadelStationBot 2bb6d7c39d Merge pull request #35368 from nicbn/patch-1
Starts the reconquer of the changelog from the profane infidels
2018-02-05 17:58:12 -06:00
MichiyamenotehifunanaandGitHub acec5bc6ad Merge branch 'master' into Medical-Turtleneck 2018-02-06 07:47:29 +08:00
CitadelStationBot 32a61acafd Adds missing wrapper for abductor roundend report. 2018-02-05 15:47:36 -06:00
vuonojenmustaturskaandCitadelStationBot ef986731ab Merge pull request #35322 from AnturK/missing-wrapper
Adds missing wrapper for abductor roundend report.
2018-02-05 15:47:36 -06:00
CitadelStationBot 3915689951 Fix holorays staying if you switch holopads 2018-02-05 15:16:39 -06:00
MoreRobustThanYouandCitadelStationBot e3f5654eb7 Fix holorays staying if you switch holopads (#35295)
* Fix holorays staying if you switch holopads

* Update hologram.dm
2018-02-05 15:16:39 -06:00
CitadelStationBot ba7a59436a Fixes comm message list for non-unique messages. 2018-02-05 14:37:50 -06:00
LeoandCitadelStationBot f574bea5d1 Merge pull request #35316 from AnturK/commfix
Fixes comm message list for non-unique messages.
2018-02-05 14:37:50 -06:00
deathride58andGitHub 7b46f951cc Re-enables round autoend 2018-02-05 14:17:14 -05:00
CitadelStationBot 731748b6da Fixes crematorium on meta/box. 2018-02-05 11:01:57 -06:00
Dax DupontandCitadelStationBot 1cc06510ec Fixes crematorium on meta/box. (#35305) 2018-02-05 11:01:57 -06:00
deathride58andGitHub 389e2ac804 Update remains.dm 2018-02-05 10:54:43 -05:00
CitadelStationBot 8c18dcdf21 Rearranges mining vendor items and code, adds conscription kit 2018-02-05 09:38:46 -06:00
vuonojenmustaturskaandCitadelStationBot 33f83e3274 Merge pull request #35152 from 81Denton/mining-vendor-conscript
Rearranges mining vendor items and code, adds conscription kit
2018-02-05 09:38:46 -06:00
CitadelStationBot e1f40e75cf Eggs from the abductor egg gland now have a random reagent instead of acid 2018-02-05 09:14:08 -06:00
XDTMandCitadelStationBot bdd791f307 Eggs from the abductor egg gland now have a random reagent instead of acid 2018-02-05 09:14:08 -06:00
CitadelStationBot 8178683c1e fixes small grammar issue on arcades 2018-02-05 09:11:51 -06:00
vuonojenmustaturskaandCitadelStationBot 903ab00096 Merge pull request #35299 from ShiggyDiggyDo/arcadegrammar
fixes small grammar issue on arcades
2018-02-05 09:11:51 -06:00
MMMiraclesandCitadelStationBot 4c6bdf1a9e Snowdin 2.0 2018-02-05 09:10:40 -06:00
Improvedname 1ea5242cf4 Does a thing 2018-02-05 15:09:41 +01:00
Poojawa 40943eaa35 recompiled tgui 2018-02-05 06:28:56 -06:00
CitadelStationBot 5ea59b5c04 Automatic changelog generation for PR #5291 [ci skip] 2018-02-05 05:36:11 -06:00
CitadelStationBotandPoojawa 92212cdcb6 [MIRROR] Moves the spare ID inside the captain's locker (#5291)
* Moves the spare ID inside the captain's locker (#35219)

* Places captain's spare inside the locker

* Removes captain's spare from the map

* Added a missing (src)

* Moves the spare ID inside the captain's locker
2018-02-05 05:36:09 -06:00
CitadelStationBot 571fd8d1d2 Automatic changelog generation for PR #5302 [ci skip] 2018-02-05 05:35:46 -06:00
CitadelStationBotandPoojawa 2ab7a45cb9 If the person inside a morgue tray is clonable, they now beep. Loudly. (#5302) 2018-02-05 05:35:44 -06:00
CitadelStationBot 55741168c0 Automatic changelog generation for PR #5306 [ci skip] 2018-02-05 05:35:20 -06:00