5ee4a355c1
Merge pull request #11178 from Citadel-Station-13/Ghommie-patch-2
...
Fixing refrigerators locking when closed
2020-02-29 00:21:43 -06:00
c232356a88
Makes clicking open closets with items on harm intent attack the closet rather than put the item in the closet
2020-02-26 09:51:48 -05:00
59e95555bb
Merge remote-tracking branch 'citadel/master' into staves
2020-02-24 13:09:45 -07:00
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
503214dee6
Update freezer.dm
2020-02-21 02:26:52 +01:00
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
b66b8ac2a0
Merge remote-tracking branch 'citadel/master' into staves
2020-02-19 14:32:28 -07:00
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
8666a36b1e
fixes most things
2020-02-18 02:24:31 -07:00
d7949e810e
Merge remote-tracking branch 'citadel/master' into staves
2020-02-18 02:20:58 -07:00
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
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
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
4ac7fff7e3
ye
2020-02-13 13:37:47 +08:00
70e752dbc9
this is totally not laggy
2020-02-11 23:45:22 -07:00
bbedf617f5
Declutters the Locker
2020-02-11 17:33:18 -05:00
c34714cb90
Something about the in operator and spaceDMM version update.
2020-02-10 07:37:59 +01:00
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
e5236eebb1
hey lets do corrections
2020-02-08 17:39:00 -05:00
6d8bfd2a38
tru
2020-02-08 14:01:51 +08:00
6af421994a
yay
2020-02-08 13:53:43 +08:00
5dc1de1d04
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-05 04:34:54 +01:00
f3d955f397
Merge branch 'master' into staves
2020-02-04 14:54:35 -07:00
97583bd98f
Merge pull request #10853 from Ghommie/Ghommie-cit549
...
A PR about runtime errors
2020-02-04 03:20:34 -07:00
a726f09201
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-04 03:54:52 +01:00
8556bcf2b3
compile
2020-02-03 13:36:10 -07:00
3e30c9409b
riot staves
2020-02-03 13:11:26 -07:00
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
2cdf7fa0bb
Merge pull request #10784 from Seris02/polycoats
...
polychromic winter coats
2020-02-02 01:46:58 -07:00
fedb05b3be
A PR about runtime errors
2020-02-02 05:43:38 +01:00
d89e0de32c
yeehaw
2020-02-02 11:43:20 +08:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
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
4b7e5916bf
Update crates.dm
2020-02-01 01:09:35 -05:00
dbb6218e0d
merp
2020-01-30 14:54:07 +08:00
a1a2d45be6
Update closets.dm
2020-01-28 02:41:04 -07:00
d709edb1c2
Merge pull request #10578 from r4d6/Mining
...
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
ce16c91b2f
Code changes
2020-01-16 14:08:14 -05:00
9dad810edf
Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492
2020-01-12 23:11:02 +01:00
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
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
34502cab1d
Merge pull request #10247 from Seris02/atmosfirelock
...
ATMOS Firelocks and more
2020-01-11 15:29:25 +01:00
dbd2cb6195
Merge pull request #10467 from Seris02/boxfix
...
stops lightspeed spessmen in boxes
2020-01-08 13:31:55 -08:00
5fae814e42
did it thanks
2020-01-07 17:52:46 +08:00
1a834edd5f
f
2020-01-05 21:27:04 +01:00
519d379cdf
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atmosfirelock
2020-01-03 17:42:53 +08:00
243aebe12a
dab 2x
2019-12-31 16:54:59 +00:00
0a19f62fa9
dab
2019-12-31 16:45:06 +00:00
f2e9ba2a8e
Makes lockers into subtypes
...
Adds new lockers cleanly at the bottom instead and as subtypes.
2019-12-31 16:41:23 +00:00
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
Lin