Commit Graph

273 Commits

Author SHA1 Message Date
Ghom 89f256866d Merge pull request #11033 from kevinz000/cmo_drapes
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
2020-02-20 11:24:50 +01:00
Ghom 0619521418 Merge pull request #10980 from Trilbyspaceclone/cargo_memes_4
Corrects a few cargo crates/exports (and nerfs some)
2020-02-19 02:10:25 +01:00
kevinz000 7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
Ghom 121b37410a Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20
Sprites, Tweaks, and Snacks, QoL
2020-02-13 16:40:12 +01:00
Ghom 5730b717c5 Merge pull request #10969 from Seris02/crowbarcrate
allows you to wirecutters the manifests off crates without opening them
2020-02-13 09:41:10 +01:00
Seris02 4ac7fff7e3 ye 2020-02-13 13:37:47 +08:00
kevinz000 70e752dbc9 this is totally not laggy 2020-02-11 23:45:22 -07:00
ShadeAware bbedf617f5 Declutters the Locker 2020-02-11 17:33:18 -05:00
Ghommie c34714cb90 Something about the in operator and spaceDMM version update. 2020-02-10 07:37:59 +01:00
Winter Flare bb641fecf8 Sprites, Tweaks, and Snacks
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.

Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
2020-02-09 23:07:32 -05:00
TrilbySpaceClone e5236eebb1 hey lets do corrections 2020-02-08 17:39:00 -05:00
Seris02 6d8bfd2a38 tru 2020-02-08 14:01:51 +08:00
Seris02 6af421994a yay 2020-02-08 13:53:43 +08:00
kevinz000 97583bd98f Merge pull request #10853 from Ghommie/Ghommie-cit549
A PR about runtime errors
2020-02-04 03:20:34 -07:00
Ghom 96a38e6c18 Merge pull request #10837 from Owai-Seek/tinytweaks
Tweaking Chef Vendor, Blood Crate, and Cake Recipe
2020-02-02 18:07:25 +01:00
kevinz000 2cdf7fa0bb Merge pull request #10784 from Seris02/polycoats
polychromic winter coats
2020-02-02 01:46:58 -07:00
Ghommie fedb05b3be A PR about runtime errors 2020-02-02 05:43:38 +01:00
Seris02 d89e0de32c yeehaw 2020-02-02 11:43:20 +08:00
Winter Flare 59b5b0b9a6 A bunch of tiny tweaks.
Added additional blood types to blood crate.
Added Soy Sauce packet.
Added Soy Sauce and BBQ packet to chef vendor.
Changed Birthday Cake recipie to mirror TG.
2020-02-01 04:49:56 -05:00
Trilbyspaceclone 4b7e5916bf Update crates.dm 2020-02-01 01:09:35 -05:00
Seris02 dbb6218e0d merp 2020-01-30 14:54:07 +08:00
kevinz000 a1a2d45be6 Update closets.dm 2020-01-28 02:41:04 -07:00
Ghom d709edb1c2 Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
r4d6 ce16c91b2f Code changes 2020-01-16 14:08:14 -05:00
Ghommie 9dad810edf Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492 2020-01-12 23:11:02 +01:00
Ghommie b2ab8959f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit492 2020-01-12 23:00:05 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghom 34502cab1d Merge pull request #10247 from Seris02/atmosfirelock
ATMOS Firelocks and more
2020-01-11 15:29:25 +01:00
kevinz000 dbd2cb6195 Merge pull request #10467 from Seris02/boxfix
stops lightspeed spessmen in boxes
2020-01-08 13:31:55 -08:00
Seris02 5fae814e42 did it thanks 2020-01-07 17:52:46 +08:00
Ghom 1a834edd5f f 2020-01-05 21:27:04 +01:00
Seris02 519d379cdf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atmosfirelock 2020-01-03 17:42:53 +08:00
KathrinBailey 243aebe12a dab 2x 2019-12-31 16:54:59 +00:00
KathrinBailey 0a19f62fa9 dab 2019-12-31 16:45:06 +00:00
KathrinBailey f2e9ba2a8e Makes lockers into subtypes
Adds new lockers cleanly at the bottom instead and as subtypes.
2019-12-31 16:41:23 +00:00
KathrinBailey 283ccceb24 CE Locker Exodus: The Removaling
Removes junk from the CE locker.
Adds empty engineering lockers.
I don't know how to do this as a child and not have populate contents fill the child.
2019-12-30 09:25:03 +00:00
Ghommie ffa013af6e Minor captains closet cleanup. 2019-12-25 03:59:21 +01:00
Seris02 61ab3685f1 atmos firelock, changes to temp blocking 2019-12-20 14:14:01 +08:00
Putnam3145 c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
Artur 9faf3d1dac Mooaar fixeees 2019-12-14 01:01:38 +02:00
Ghommie 414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Lin 6368f04f2d Merge pull request #10044 from Ghommie/Ghommie-cit423
Made wooden cabinet/closets... actually made of wood.
2019-12-08 22:18:15 +00: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
Ghommie 3f0d1e275e Made wooden cabinet/closets... actually made of wood. 2019-12-04 18:27:17 +01:00
Trilbyspaceclone 8ecb920c7f Update bins.dm 2019-12-04 12:20:24 -05: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
Ghommie 3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +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