BongaTheProto
21c3abdfb7
Merge remote-tracking branch 'upstream/master'
2023-01-18 04:20:45 -05:00
SandPoot
e76ed6a1ea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-17 22:26:56 -03:00
dapnee
5251c14f65
Letting that sink in
...
idk why this was never fixed
2023-01-13 16:59:27 -07:00
BongaTheProto
c7b89635c6
Merge branch 'pr/652'
2023-01-13 18:40:27 -05:00
Darius
4bceca24b1
Improved holodeck anti-grief
...
Reverts original holodeck anti-grief.
Carp are replaced with funclaws.
Bees are replaced with friendly bees.
Burn floor is replaced with binary floor.
2022-12-31 01:44:32 -05:00
Demidisco
4411efa3bd
Updating vending machine fixing infinite point exploit, updated Kilo Cargo shuttle to feature tiny fans to standardize it with the rest, fixed door in security double door entrance which was preventing heads from using it
2022-12-25 09:24:05 +01:00
Lin
577c5a0e1e
fix linters
2022-12-17 13:26:41 -07:00
BongaTheProto
3666faccf9
Merge remote-tracking branch 'upstream/master'
2022-12-15 01:25:03 -05:00
SandPoot
a102c785e2
Adds an arousal button to the interaction ui (also does some ui "niceing") ( #275 )
...
* the entire content
* out of scope but critical.
2022-12-14 20:05:37 -03:00
BongaTheProto
6e66b64c4b
Merge branch 'pr/630'
2022-12-13 15:58:31 -05:00
BongaTheProto
a8570dec73
Update DeltaStation2.dmm
...
guh
2022-12-13 13:19:25 -05:00
BongaTheProto
e28d75e331
temp fix while upstream gets their shit together
...
they don't even notice the linters errors bruh 💀
2022-12-13 12:16:16 -05:00
BongaTheProto
ee6823c69b
Merge remote-tracking branch 'upstream/master'
2022-12-13 12:14:11 -05:00
SandPoot
f4b7513f10
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-13 01:35:33 -03:00
Mazen421
6126a93267
Changed the tools display to surgical tool cases
...
Followed Linzolle advice on changing the tools display to a surgical tool case which I found to great advice because it look much nicer and organized
2022-12-12 13:39:35 +02:00
Mazen421
0597ec26aa
Fixed Boxstation's Garden's vent and Lawyers office APC
...
The vent in the garden wasn't connected to everything, and the lawyer's office had two APCs and one wasn't connected to power, removed both shifted a shelf and put it inside the room
2022-12-12 00:48:30 +02:00
Mazen421
b78912ed56
Fixed a missing pipe in Taustation, and added extra backup scrubber pipes
...
So the main scrubber loop was missing a pipe at the security main entrance that stopped the loop from being complete and cut off the security, command and dorms area from the main scrubber loop, Added more backup pipes
2022-12-11 21:46:22 +02:00
Mazen421
37e3ddd184
Updated Detla Station's surgery room
...
Remolded the medical surgery room and added another surgery table and operating computer.
2022-12-11 16:54:51 +02:00
Mazen421
2f7b01908e
Update Delta Station medical's surgery room
...
Heyo,
Remolded the medical surgery room and added another surgery table and operating computer
2022-12-11 16:21:32 +02:00
Le Commandor
771f6992d9
Update to infnidorms
...
Literally adds an automatic tcomms relay to the template map. I wasted more time searching for SDMM and downloading actual build.
2022-12-07 09:09:14 +04:00
BongaTheProto
b334516584
Merge branch 'pr/581'
2022-11-04 12:20:55 -05:00
BongaTheProto
908c42bcf6
Merge pull request #572 from KathrinBailey/furniture
...
Fixes Fancy Sofa
2022-10-31 01:35:54 -05:00
BongaTheProto
27c4b9113d
Merge pull request #547 from KathrinBailey/mapping2
...
New Boxstation random engines!
2022-10-30 11:25:03 -05:00
Gr33d-y
d8492067e4
Update CentCom.dmm
...
fixes an issue with the slavers base computer not working.
2022-10-29 21:57:24 -04:00
Gr33d-y
fe477601d9
Update BoxStation.dmm
2022-10-29 21:15:39 -04:00
Ldip999
17a041cec3
Fixes one cogstation conveyor belt
...
The rotation was off and the belt made things go nowhere, leading to things getting stuck in space.
2022-10-27 10:25:06 +02:00
Ldip999
45bacf8a1f
Gives medbay storage a medical windoor on cogstation
...
At the moment medbay storage has a windoor which is controlled exclusively by robotics. This gives a second layer of windoor which is controlled exclusively by medbay, so neither department invades eachother without both consenting
2022-10-27 10:23:34 +02:00
Ldip999
53e2df7199
Adjusts cog station chemistry
...
Gives an extra chem heater for independent multi track meth making, instead puts the less used and more easily shared grinder at the middle
2022-10-27 10:21:12 +02:00
Ldip999
bcbbd12f4c
Adjusts cogstation surgery kits + tables closer to patient
2022-10-27 10:19:00 +02:00
Ldip999
e24941645a
Adds a limbgrower to cogstation
2022-10-27 10:17:13 +02:00
KathrinBailey
443732367a
Fixes corp sofas
2022-10-26 03:31:35 +01:00
BongaTheProto
a82fa611d9
Merge branch 'pr/550'
2022-10-22 17:23:56 -05:00
BongaTheProto
eaa5bdf411
Merge pull request #542 from AshTheDerg/fix-cog
...
Cog Changes and Fixes
2022-10-22 17:05:50 -05:00
BongaTheProto
4a4f4aaa54
Merge branch 'Sandstorm-Station:master' into master
2022-10-18 23:18:56 -05:00
SandPoot
1607d9ead8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-10-19 00:54:33 -03:00
AshTheDerg
886310b32b
Minor fixes
2022-10-18 19:05:07 -04:00
KathrinBailey
5ae5ab24cf
Update DeltaStation2.dmm
2022-10-17 11:03:01 +01:00
KathrinBailey
cfbb7fb822
gravgen access
...
changed to engine access
2022-10-17 07:16:29 +01:00
KathrinBailey
a929822b1c
QOL read desc for changelog
...
• fixes dark spots in engineering
• cleans up CE's office and removes junk items
• removes junk items in engineering
• fixes dark spots in engineering
• moves supply/scrubbers piping out of the way in the SM room.
• autolathe for engineering
• power tools storage made to be engie access since it just gets hacked into roundstart anyway
2022-10-17 07:14:14 +01:00
KathrinBailey
35a2cfd959
Additional wallmounts and piping
...
Moves some piping out of the DIY zone on the SM map because piping space is valuable.
2022-10-16 23:31:02 +01:00
KathrinBailey
9d15297966
boxstation engines
...
two new engines:
diy - blank canvas to build your own stuff
diy_sm - an empty room with a crystal in it, make your own chamber!!
config changes
2022-10-16 23:06:38 +01:00
deathride58
ba8af5114e
Merge pull request #15861 from shellspeed1/random-whiteship
...
Ports random whiteships from tg
2022-10-16 13:07:07 -04:00
AshTheDerg
514051333d
Nav Marker update
...
Do NOT VarEdit Nav Landmarks...
2022-10-14 16:28:08 -04:00
AshTheDerg
3ade521e8c
Nav Beacon update
...
Added Nav Beacons
2022-10-14 16:19:34 -04:00
AshTheDerg
2cf2dc336c
Merge remote-tracking branch 'upstream/master' into fix-cog
2022-10-14 16:10:37 -04:00
AshTheDerg
3a538b53dc
Cog Changes and Fixes
2022-10-14 15:30:23 -04:00
BongaTheProto
436ddecbff
Merge branch 'master' into pathfinder-booty
2022-10-13 11:39:23 -05:00
BongaTheProto
fc18922a03
half-assed fix
...
I'm going to need mappers to review this one later
2022-10-13 11:38:45 -05:00
BongaTheProto
213c73c91d
Merge branch 'master' into pathfinder-booty
2022-10-13 11:21:53 -05:00
BongaTheProto
79fa770ab3
Merge remote-tracking branch 'upstream/master'
2022-10-13 11:21:32 -05:00
