Commit Graph

729 Commits

Author SHA1 Message Date
kevinz000
6127593446 Merge pull request #9670 from Ghommie/Ghommie-cit298
Mapping in arcade dirs.
2019-11-03 06:17:02 -07:00
Persi
1e911cd5b2 Patches an exploit that allows the crew to shoot the Ark from the Reebe dressing room. 2019-10-30 21:16:49 -04:00
Ghommie
f6feeb93ea Mapping in arcade dirs. 2019-10-30 16:47:44 +01:00
deathride58
f85f110baa Merge pull request #9047 from Poojawa/syntheticbloods
RGB Blood Reworks + Blood generator
2019-10-23 20:54:55 -04:00
BlackMajor
959c4b35ce Update all them shuttles 2019-10-21 22:00:18 +13:00
Poojawa
184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
kevinz000
7187da9e72 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2019-10-15 23:11:35 -07:00
Ghommie
22fc7a9088 Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype. 2019-10-14 02:32:23 +02:00
Poojawa
394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
Fermi
7bce68bb11 Merge branch 'master' into Spookytime 2019-10-11 21:51:48 +01:00
kevinz000
0643a7b230 Merge pull request #9387 from Sishen1542/goose
the geese have been unleased
2019-10-11 12:11:50 -07:00
Fermi
cd47412db2 Merge branch 'master' into Spookytime 2019-10-11 19:10:48 +01:00
Fermi
489e711b4f pls 2019-10-11 18:49:30 +01:00
Sishen
c51bfc153b b 2019-10-11 13:24:00 -04:00
kevinz000
c1bc1d2c77 Merge pull request #9234 from Trilbyspaceclone/reebee_redone
[WIP] [TEST-MERGE] Makes clock work reebe less laggy + addtions
2019-10-10 02:09:21 -07:00
Poojawa
3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00
kevinz000
143e8c4186 Merge pull request #9404 from Poojawa/qm-is-a-head
QM is a head of staff, Cargo ID Console added
2019-10-08 00:34:07 -07:00
nik707
b46c41cafd Merge pull request #9379 from jakeramsay007/Medbay-Doors
Adds unrestricted directional access to the medbay lobby and cloning access airlocks on all maps
2019-10-07 18:23:23 -05:00
nik707
36d7a6f3bd Merge pull request #9434 from EmeraldSundisk/plantbox
Thinking green on Box Station.
2019-10-07 15:20:24 -05:00
EmeraldSundisk
6fc2373a58 Adds some potted plants. 2019-10-07 12:59:43 -07:00
Poojawa
27b26978be Quartermaster is a head of staff
Suck it, non believers.
2019-10-03 19:13:56 -05:00
EmeraldSundisk
5fee649d55 Update DeltaStation2.dmm 2019-10-02 15:18:08 -07:00
Sishen
f3d373a6b8 loose goose
honk honk
2019-10-02 02:27:30 -04:00
Chayse Ramsay
986ac16b93 Adds unrestricted directional access to the medbay lobby and cloning access airlocks on all maps 2019-10-01 22:21:32 +01:00
Poojawa
f14272e445 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-27 23:30:05 -05:00
EmeraldSundisk
7d64ccd273 Update DeltaStation2.dmm 2019-09-25 14:09:51 -07:00
Poojawa
5876a235c2 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-22 00:22:18 -05:00
kevinz000
a864664a5d Merge pull request #9296 from EmeraldSundisk/deltagarden
Renovates Delta Station's maintenance garden.
2019-09-21 19:05:38 -07:00
GrayRachnid
e38b44d2bc missed one in security 2019-09-18 20:35:48 -04:00
GrayRachnid
8a9ecc3deb WINdoors 2019-09-18 20:34:16 -04:00
EmeraldSundisk
876d65a695 Update DeltaStation2.dmm 2019-09-16 12:34:22 -07:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
kevinz000
42613d1800 Merge pull request #9251 from Linzolle/chaplain-fashion-time
Allow all chaplain gear to equip the same things in their suit storage
2019-09-13 10:42:42 -07:00
Linzolle
1e6972d6cc pubby fix 2019-09-12 23:39:58 -05:00
Linzolle
213bd2fc6b fixes 2019-09-12 23:35:21 -05:00
kevinz000
076b6c8699 Merge pull request #9077 from Sishen1542/id-boingo
No ID insertion for everything except the hop console
2019-09-10 22:04:48 -07:00
TrilbySpaceClone
7146cc6455 bigger again, but space so less lag* 2019-09-02 22:38:01 -04:00
TrilbySpaceClone
08e49574f6 Less lag*
Trade mark, all rights reserved, inc. co.
2019-09-02 22:20:01 -04:00
nik707
df324b7f9a Merge pull request #8932 from EmeraldSundisk/gunrangebox
Adds a gun range to Box Station.
2019-09-02 18:23:48 -05:00
Poojawa
583cf3d2ed Maps in Blood generators 2019-08-29 23:15:44 -05:00
EmeraldSundisk
4f5e9893b3 Requested changes. 2019-08-29 19:32:32 -07:00
EmeraldSundisk
4da0556bb1 Driver should work now! 2019-08-28 18:29:28 -07:00
EmeraldSundisk
68315657f5 Who left those earmuffs out anyway? 2019-08-28 11:15:45 -07:00
EmeraldSundisk
ac1e058d1c Some minor fixes. 2019-08-28 10:08:12 -07:00
kevinz000
d696c2cf6b Merge pull request #9169 from EmeraldSundisk/delta2chapel
Adds a holy driver to Delta Station.
2019-08-26 19:37:17 -07:00
EmeraldSundisk
1adc70bc81 Hope it's ready this time! 2019-08-20 20:48:56 -07:00
Chaz
5b4565276d Driver. 2019-08-20 07:43:11 -07:00
Poojawa
96834bc517 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-20 03:36:17 -05:00
Sishen
26de2b8111 greybois 2019-08-16 10:49:26 -04:00
Poojawa
283b5d050e Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-08-08 16:51:53 -05:00