b05854ac98
Merge pull request #9947 from Iroquois-Pliskin/ClockieSurgeryNerf
...
Removes Clockie Surgical capabilities
2019-12-05 22:02:38 -07:00
fbcdc4d330
Merge pull request #9575 from KathrinBailey/Kat'sBoxRework
...
Box Beautification & Bar Rework & Issue 9706 Fix
2019-12-05 21:38:30 -07:00
ae729d400b
Permabrig broken area fix
...
oopsie I forgot because I'm always tired fuck 6am morning shifts.
2019-11-30 03:25:21 +00:00
d73b93d4a7
Addresses Aelita + Gray + Sylvara, fixes cams, detective office & HoP stamp, room names and airlock cyclelink
...
Fixes:
• Missing HoP stamp
• Missing Detective handcuffs
• Improper dorms camera names
• Luxury rooms not really mentioned to be luxury
• Missing airlock cyclelink helper on maint south area that was reworked for better EVA spacewalking on the outside.
2019-11-30 01:30:12 +00:00
90009904cf
Maaapmeeergeeee?
...
I forgot last commit. Hopefully this'll do it.
2019-11-28 19:35:08 +00:00
9a9c63bea3
Removes Clockie Surgical capabilities, including table, tools, and implanter/implant case.
2019-11-26 09:28:40 -05:00
c1e3b07b2c
Bugfixes
...
Fixes incorrect areas
Fixes disconnected air canisters in maint
Adds Persi's sleepers back into perma
Small changes to perma to make it look slightly cleaner. Kink room in perma because it's probably really boring in there.
2019-11-25 16:11:06 +00:00
9ee4acd143
Persi's Sleepers
2019-11-23 16:00:30 +00:00
532fab092f
Bugfix from testmerge
...
Fixes the terrible stupid mistake.
Blood bank generator in medical lathe room on request, it's there on Pubby and heck I suppose it's something for doctors to do.
2019-11-23 06:41:23 +00:00
18e1246fd0
Classic fixes
2019-11-21 03:16:18 +00:00
ef78757ed8
oops
2019-11-21 02:19:25 +00:00
ff7b070fa1
Maps
2019-11-21 02:16:15 +00:00
7adf8da43e
weh work please no error
...
error man bad
2019-11-17 06:32:33 +00:00
51c1642976
yeah there we go self-confidence destroyed misshun accomplished
2019-11-17 06:18:53 +00:00
d3822378dc
Merge pull request #9797 from PersianXerxes/permaVR
...
Adds two VR sleepers to all current maps' perma.
2019-11-14 16:25:22 -07:00
1f2a32b94d
Adds two VR sleepers to all current maps' perma.
2019-11-13 00:49:50 -05:00
4ef1d64356
PR #47500 , #47501 , #47557 , #47588 .
2019-11-12 19:00:45 +01:00
4ab3512dda
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
2019-11-04 23:15:12 +01:00
6127593446
Merge pull request #9670 from Ghommie/Ghommie-cit298
...
Mapping in arcade dirs.
2019-11-03 06:17:02 -07:00
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
f6feeb93ea
Mapping in arcade dirs.
2019-10-30 16:47:44 +01:00
4aa1d55abb
Porting multi-z support updates.
2019-10-27 16:32:32 +01:00
f85f110baa
Merge pull request #9047 from Poojawa/syntheticbloods
...
RGB Blood Reworks + Blood generator
2019-10-23 20:54:55 -04:00
959c4b35ce
Update all them shuttles
2019-10-21 22:00:18 +13:00
184e81eec0
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-16 01:51:51 -05:00
7187da9e72
Merge pull request #9456 from Thalpy/Spookytime
...
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2019-10-15 23:11:35 -07:00
22fc7a9088
Resprites bedsheet bins in 3/4 perspective, adds towel bins subtype.
2019-10-14 02:32:23 +02:00
394c947d14
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-11 23:10:45 -05:00
7bce68bb11
Merge branch 'master' into Spookytime
2019-10-11 21:51:48 +01:00
0643a7b230
Merge pull request #9387 from Sishen1542/goose
...
the geese have been unleased
2019-10-11 12:11:50 -07:00
cd47412db2
Merge branch 'master' into Spookytime
2019-10-11 19:10:48 +01:00
489e711b4f
pls
2019-10-11 18:49:30 +01:00
c51bfc153b
b
2019-10-11 13:24:00 -04:00
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
3113074bfb
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-10-08 02:55:32 -05:00
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
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
36d7a6f3bd
Merge pull request #9434 from EmeraldSundisk/plantbox
...
Thinking green on Box Station.
2019-10-07 15:20:24 -05:00
6fc2373a58
Adds some potted plants.
2019-10-07 12:59:43 -07:00
27b26978be
Quartermaster is a head of staff
...
Suck it, non believers.
2019-10-03 19:13:56 -05:00
5fee649d55
Update DeltaStation2.dmm
2019-10-02 15:18:08 -07:00
f3d373a6b8
loose goose
...
honk honk
2019-10-02 02:27:30 -04:00
986ac16b93
Adds unrestricted directional access to the medbay lobby and cloning access airlocks on all maps
2019-10-01 22:21:32 +01:00
f14272e445
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-27 23:30:05 -05:00
7d64ccd273
Update DeltaStation2.dmm
2019-09-25 14:09:51 -07:00
5876a235c2
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
2019-09-22 00:22:18 -05:00
a864664a5d
Merge pull request #9296 from EmeraldSundisk/deltagarden
...
Renovates Delta Station's maintenance garden.
2019-09-21 19:05:38 -07:00
e38b44d2bc
missed one in security
2019-09-18 20:35:48 -04:00
8a9ecc3deb
WINdoors
2019-09-18 20:34:16 -04:00
876d65a695
Update DeltaStation2.dmm
2019-09-16 12:34:22 -07:00
kevinz000