Commit Graph

201 Commits

Author SHA1 Message Date
Ghommie a817bd6115 Porting the musician and curator beacons. 2020-03-07 00:12:50 +01:00
kevinz000 8b0b685fa7 CHECK_MOBILITY 2020-03-03 20:40:33 -07:00
kevinz000 1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
ancientpower 5c5ec541ae Merge branch 'master' into paramedic-tweaks 2020-02-29 01:55:46 -06:00
Lin 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
ancientpower 12ba71f588 paramedic tweaks 2020-02-27 23:23:44 -06:00
kevinz000 56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
kevinz000 59e95555bb Merge remote-tracking branch 'citadel/master' into staves 2020-02-24 13:09:45 -07:00
kevinz000 a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
Ghom 503214dee6 Update freezer.dm 2020-02-21 02:26:52 +01:00
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
kevinz000 0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
kevinz000 8666a36b1e fixes most things 2020-02-18 02:24:31 -07:00
kevinz000 d7949e810e Merge remote-tracking branch 'citadel/master' into staves 2020-02-18 02:20:58 -07: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
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
kevinz000 6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
kevinz000 f3d955f397 Merge branch 'master' into staves 2020-02-04 14:54:35 -07:00
kevinz000 8556bcf2b3 compile 2020-02-03 13:36:10 -07:00
kevinz000 3e30c9409b riot staves 2020-02-03 13:11:26 -07:00
Seris02 dbb6218e0d merp 2020-01-30 14:54:07 +08:00
kevinz000 f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
Ghom d709edb1c2 Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
kevinz000 7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
r4d6 ce16c91b2f Code changes 2020-01-16 14:08:14 -05:00
kevinz000 26525b8fa7 s 2020-01-16 00:14:03 -07: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 2c245a18fd compile 2020-01-10 13:43:53 -08: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
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
Ghommie 3f0d1e275e Made wooden cabinet/closets... actually made of wood. 2019-12-04 18:27:17 +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
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