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 |
|
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 |
|
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 |
|
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 |
|
Ghommie
|
10373c7c96
|
Unmodularize closets.
|
2019-11-20 06:41:59 +01:00 |
|
Ghommie
|
a52e292cc8
|
Ports "examine-code refactor"... part 1...
|
2019-11-19 03:28:06 +01: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 |
|
Ghommie
|
2c1740f56e
|
#43012 and missing typepaths aaaa
|
2019-11-13 23:26:03 +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 |
|