ad4d290ea7
WIP
2020-03-08 19:26:01 +01:00
c736568a5a
Merge pull request #11369 from Ghommie/Ghommie-cit609
...
Porting the musician and curator beacons.
2020-03-08 07:34:48 -07:00
a817bd6115
Porting the musician and curator beacons.
2020-03-07 00:12:50 +01:00
16d6ba9e21
Merge pull request #11323 from Ghommie/Ghommie-cit600
...
Porting a couple material datums code updates and fixes.
2020-03-06 00:17:21 -07:00
60c7268e37
Also fixing bloodsucker coffins.
2020-03-04 16:29:09 +01:00
8b0b685fa7
CHECK_MOBILITY
2020-03-03 20:40:33 -07:00
1e99cd0bfe
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
5c5ec541ae
Merge branch 'master' into paramedic-tweaks
2020-02-29 01:55:46 -06:00
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
12ba71f588
paramedic tweaks
2020-02-27 23:23:44 -06:00
56eab760fc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07: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
424eb48d9e
fixes
2020-02-24 01:59:45 -07:00
f6542b381c
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 23:29:25 -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
a784a74ccb
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-21 13:35:26 -07: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
0e4692c63d
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-18 18:16:34 -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
6a8a606f97
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-04 16:01:25 -07: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
Ghommie