Commit Graph

850 Commits

Author SHA1 Message Date
Putnam3145 4e022af46f Merge pull request #10056 from Ghommie/Ghommie-cit430
Ports "Slightly improves visible and audible messages."
2019-12-05 21:16:47 -08:00
Putnam3145 6b2d3b116d Merge branch 'master' into Ghommie-cit430 2019-12-05 20:53:14 -08:00
kevinz000 a65588009c Merge pull request #10038 from Trilbyspaceclone/patch-240
Makes trash carts craftable with plastic
2019-12-05 21:51:30 -07:00
kevinz000 5048995a58 Merge pull request #9993 from Ghommie/Ghommie-cit412
Ports tgstation loom changes, and durathred golems.
2019-12-05 21:44:25 -07:00
kevinz000 70d305611c Merge pull request #10042 from Ghommie/Ghommie-cit422
fixes sofa overlays doing nothing, because their layer wasn't properly set.
2019-12-05 21:28:24 -07:00
Ghommie 9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
Trilbyspaceclone 8ecb920c7f Update bins.dm 2019-12-04 12:20:24 -05:00
Ghommie 3d7ef827a9 better. 2019-12-04 06:31:48 +01:00
Ghommie dc91114e8b fixes sofa overlays doing jackshit, because their layer wasn't properly set. 2019-12-04 06:26:11 +01:00
TrilbySpaceClone e1717bb534 Merge branch 'master' into crow 2019-12-03 23:45:05 -05:00
Lin b501321362 Merge pull request #9941 from Putnam3145/personal-closet-fix
Personal closets can use PDAs/tablets now
2019-12-03 01:38:42 +00:00
Putnam3145 af31fe12c7 Merge pull request #9976 from Ghommie/Ghommie-cit405
Ports "Fixes transit tube barricade spam"
2019-12-01 23:07:53 -08:00
Ghommie 0bfa2e1438 -hit 2019-11-29 05:36:55 +01:00
Ghommie 77201406bc Oh sh- 2019-11-29 05:35:53 +01:00
Ghommie e6484a22a8 Ports tgstation loom changes, and durathred golems. 2019-11-29 05:34:17 +01:00
Lin 46c02af86e Merge pull request #9948 from Ghommie/Ghommie-cit393
Morgues no longer go "ammunition depleted"
2019-11-28 19:12:25 +00:00
Ghommie 60b8688674 Ports "Fixes transit tube barricade spam" 2019-11-28 07:10:00 +01:00
Ghommie d6d830b2ec Morgues no longer go "ammunition depleted" 2019-11-26 22:20:52 +01:00
Putnam 66d1b88725 Get 2019-11-25 22:23:50 -08:00
Putnam 1283149fb2 also allowed wallets 2019-11-25 22:22:16 -08:00
Unknown 4e20f576e6 Merge branch 'master' into xantholne-berets02 2019-11-25 20:16:15 -07:00
Putnam 639c07665d Personal closets can use PDAs/tablets now 2019-11-25 02:00:03 -08:00
BlackMajor c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Lin 028fa518e4 Merge pull request #9879 from Ghommie/Ghommie-cit383
Unmodularize closets.
2019-11-23 05:39:33 +00:00
TrilbySpaceClone b01be3b1ff Merge branch 'master' into crow 2019-11-22 05:48:36 -05:00
TrilbySpaceClone 2136968585 Ring ring 2019-11-21 21:55:17 -05:00
Lin 1ddb9935ff Merge pull request #9530 from Ghommie/Ghommie-cit245
Touching up job outfits equip procs, little PDA fix.
2019-11-22 02:37:49 +00:00
Lin 3979079fde Merge pull request #9518 from Ghommie/Ghommie-cit243
Ports "You can now click on objects and mobs below flaps and signs"
2019-11-22 01:36:47 +00:00
Unknown 4974400ccb Merge branch 'master' into xantholne-berets01 2019-11-21 11:01:42 -07:00
Unknown 71b3b8fdc6 Ports/Adds new Berets
Ports some berets adds even more to most jobs
2019-11-20 22:21:20 -07:00
Seris02 60def2a9fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-21 13:08:23 +08:00
Ghommie 10373c7c96 Unmodularize closets. 2019-11-20 06:41:59 +01:00
Ghommie 21f15e411d Part 3 2019-11-19 19:34:42 +01:00
Ghommie a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
KathrinBailey 05c74c731b Ports TG pew files 2019-11-17 14:20:44 +00:00
Seris02 b146fd14f3 actually adds the winter coats 2019-11-16 18:25:05 +08:00
kevinz000 ca99a8285c Merge pull request #9803 from Ghommie/Ghommie-cit350
Ports Improved beach away mission and some fluff mapping items.
2019-11-14 16:36:19 -07:00
kevinz000 6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
kevinz000 2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00
kevinz000 af0962088c Merge pull request #9453 from Ghommie/Ghommie-cit226
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
2019-11-14 15:47:18 -07:00
Ghommie 2c1740f56e #43012 and missing typepaths aaaa 2019-11-13 23:26:03 +01:00
Ghommie aa441fba5d Ports Improved beach away mission. 2019-11-13 22:52:39 +01:00
kevinz000 4e3147b228 Merge pull request #9755 from Ghommie/Ghommie-cit331
lentext to length, yet another 513 requirement.
2019-11-12 23:59:31 -07:00
Ghommie 4ef1d64356 PR #47500, #47501, #47557, #47588. 2019-11-12 19:00:45 +01:00
Ghommie c5a7c28a1b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-11-12 16:04:05 +01:00
Ghommie 4c1eba0d81 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226 2019-11-10 23:52:48 +01:00
Ghommie e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
Dap 041c35202b Ports Closet & Crate Initialization Fixes
Ports a similarly named pull request (thank you cool cat).
2019-11-10 14:17:34 -07:00
kevinz000 e0626d12b1 Merge pull request #9707 from BonniePandora/Weldhelmets
Port Welding Hard Hats from /tg/
2019-11-10 11:30:54 -07:00
Ghommie 279c22b781 lentext to length. 2019-11-09 23:17:04 +01:00