Commit Graph

12533 Commits

Author SHA1 Message Date
CitadelStationBot 19a1d3555c Fixes death report giving the wrong damage type 2017-06-09 20:06:36 -05:00
LetterJay 12ea900051 Merge pull request #1487 from Citadel-Station-13/upstream-merge-28189
[MIRROR] Fixes #8044, being able to hold defib paddles while dead, by removing NODROP from them
2017-06-09 15:55:30 -05:00
CitadelStationBot f26cf4e9ef Clown Toy Box + Wooden Crates 2017-06-09 11:02:37 -05:00
LetterJay 7fa05ca854 Merge pull request #1489 from Citadel-Station-13/upstream-merge-27960
[MIRROR] [READY] Gang Points Refactor - Now stored in the gang datum
2017-06-09 09:37:58 -05:00
LetterJay 0bd03c7fd3 Merge pull request #1504 from Citadel-Station-13/upstream-merge-28209
[MIRROR] Moves borer completion to gamemode
2017-06-09 09:36:00 -05:00
LetterJay 37c5f4858d Merge pull request #1503 from Citadel-Station-13/upstream-merge-28224
[MIRROR] Fix related CID/IPs on player panel
2017-06-09 09:35:29 -05:00
CitadelStationBot 9198b10fd3 Medical record summaries are now single inputs as well 2017-06-09 09:29:47 -05:00
LetterJay 06be53ffeb Merge pull request #1405 from Citadel-Station-13/upstream-merge-28049
[MIRROR] Only human and silicon servants can help recite multi-invoker scriptures
2017-06-09 09:13:18 -05:00
LetterJay 3f66d97005 Merge pull request #1402 from cebutris/oof
oof
2017-06-09 09:12:49 -05:00
LetterJay c3ebcf9d69 Merge pull request #1327 from Citadel-Station-13/upstream-merge-27891
[MIRROR] Fixes black carpet recipe and sprite
2017-06-09 09:10:08 -05:00
LetterJay 9babd38dc5 Merge pull request #1502 from Citadel-Station-13/upstream-merge-28219
[MIRROR] Gang - Purchasing the improvised shotgun actually spawns a gun.
2017-06-09 09:08:16 -05:00
LetterJay 662a647711 Merge pull request #1501 from Citadel-Station-13/upstream-merge-28203
[MIRROR] Fixes clockwork armor bitflags
2017-06-09 09:07:27 -05:00
LetterJay 36997bdb80 Merge pull request #1498 from Citadel-Station-13/upstream-merge-28204
[MIRROR] Security record crime details is now a single line input box
2017-06-09 09:06:58 -05:00
LetterJay d92a596b73 Merge pull request #1496 from Citadel-Station-13/upstream-merge-28198
[MIRROR] You can no longer mount borgs while stunned.
2017-06-09 09:06:39 -05:00
LetterJay 98d948e2d4 Merge pull request #1495 from Citadel-Station-13/upstream-merge-28197
[MIRROR] Diseases can now only spread to mobs with an atmos line of sight
2017-06-09 09:05:49 -05:00
LetterJay 7fe60c0012 Merge pull request #1494 from Citadel-Station-13/upstream-merge-28194
[MIRROR] Fixes deadmin player panel runtime
2017-06-09 09:05:32 -05:00
LetterJay 5f1fe8b8da cleanup 2017-06-09 09:04:31 -05:00
CitadelStationBot 9e0488d2d9 Moves borer completion to gamemode 2017-06-09 09:01:03 -05:00
CitadelStationBot 07cb1ab1de Fix related CID/IPs on player panel 2017-06-09 08:59:57 -05:00
CitadelStationBot 99ac851f46 Gang - Purchasing the improvised shotgun actually spawns a gun. 2017-06-09 03:42:22 -05:00
CitadelStationBot ff53afcd99 Fixes clockwork armor bitflags 2017-06-09 03:26:59 -05:00
CitadelStationBot 1bdda132e7 Adds Medal Commendations! 2017-06-08 20:39:15 -05:00
CitadelStationBot e034a6be50 Security record crime details is now a single line input box 2017-06-08 19:08:53 -05:00
CitadelStationBot 54d8e3a159 You can no longer mount borgs while stunned. 2017-06-08 17:18:09 -05:00
CitadelStationBot d859e3a637 Diseases can now only spread to mobs with an atmos line of sight 2017-06-08 17:18:06 -05:00
CitadelStationBot 3deb4c0eff Fixes deadmin player panel runtime 2017-06-08 17:18:01 -05:00
CitadelStationBot d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot 1658e48bc1 [READY] Gang Points Refactor - Now stored in the gang datum 2017-06-08 14:46:07 -05:00
CitadelStationBot 24bfaa9b56 Fixes #8044, being able to hold defib paddles while dead, by removing NODROP from them 2017-06-08 10:58:31 -05:00
CitadelStationBot 38a1e1d984 Removes a spawn 2017-06-08 09:46:57 -05:00
CitadelStationBot 180f0e82c8 Fixes ghosts not returning an initialize hint 2017-06-08 09:45:52 -05:00
CitadelStationBot 7b6c76525c Trims whitelist entries and makes them use ckey() 2017-06-08 09:45:45 -05:00
LetterJay 78d0ec662c cleanup 2017-06-08 03:48:22 -05:00
LetterJay 00790c0fdd Merge pull request #1315 from Citadel-Station-13/upstream-merge-27866
[MIRROR] Makes VV'ing ID cards easier.
2017-06-08 03:43:31 -05:00
LetterJay 190b47983c cleanup 2017-06-08 03:39:13 -05:00
LetterJay 9b840ae323 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27891 2017-06-08 03:36:39 -05:00
LetterJay 923c5b9035 Merge pull request #1308 from Citadel-Station-13/upstream-merge-27881
[MIRROR] Luxury Bluespace Shelter Capsules, Take 2.
2017-06-08 03:35:23 -05:00
LetterJay 3563459d15 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27891 2017-06-08 03:33:56 -05:00
LetterJay ad97147dfe Merge pull request #1314 from Citadel-Station-13/upstream-merge-27870
[MIRROR] Fixes ghosts using marker beacon
2017-06-08 03:31:22 -05:00
LetterJay f367878119 Merge pull request #1277 from Citadel-Station-13/upstream-merge-27773
[MIRROR] Splits mining_mobs.dm into separate files
2017-06-08 03:30:13 -05:00
LetterJay 1a71a52372 Merge pull request #1474 from Citadel-Station-13/upstream-merge-28174
[MIRROR] Moves station's starting state to ticker post setup, instead of gamemode's
2017-06-08 03:28:18 -05:00
LetterJay d79bd3988c Merge pull request #1473 from Citadel-Station-13/upstream-merge-28158
[MIRROR] Adds creamatoriums
2017-06-08 03:27:35 -05:00
CitadelStationBot d341334118 [s] Fixes IRC ahelps 2017-06-07 21:27:14 -05:00
CitadelStationBot 7eedaa87c5 Moves station's starting state to ticker post setup, instead of gamemode's 2017-06-07 20:54:37 -05:00
CitadelStationBot e21e4eac9d Adds creamatoriums 2017-06-07 20:45:26 -05:00
CitadelStationBot addb6aca21 Fixes ORM alloy material consumption 2017-06-07 19:26:44 -05:00
CitadelStationBot 06187dd178 Syndicate Uplink - Typos & Grammar mk2 2017-06-07 14:56:22 -05:00
CitadelStationBot cb15acf8b2 Adds another parallax layer 2017-06-07 14:18:39 -05:00
CitadelStationBot 0c2e0d5fb2 Makes processing subsystems respect qdel and PROCESS_KILL 2017-06-07 14:17:28 -05:00
CitadelStationBot c759862d4b Fixes CE's hand drill changing size 2017-06-07 14:14:18 -05:00