Debug
2d03cc63b6
Add prisoner latejoin cryopod ( #751 )
2024-01-31 22:02:05 +00:00
Debug
c463da2e8d
Update prisoner.yml ( #750 )
...
Yes, its terrible. No, I dont care
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-01-31 21:40:50 +00:00
Debug
369109dcd0
Revert "Allow rejoining from cryosleep" ( #749 )
...
Revert "Allow rejoining from cryosleep (#739 )"
This reverts commit 0ced42f17b .
2024-01-31 18:24:27 +01:00
Velcroboy
267cfa8990
Map Edits ( #747 )
...
Co-authored-by: Velcroboy <>
2024-01-31 15:50:46 +00:00
DeltaV-Bot
3167921147
Automatic Changelog Update ( #746 )
2024-01-31 15:34:49 +00:00
Adrian16199
d2da769e62
Shoukou's cryo update. ( #746 )
...
* Shoukou's cryo update.
Head of security's locker was replaced with HoS's locker with hardsuit to fit in a new furniture that has the clothing for them.
Head of personal's plant was removed for a dresser with his clothing.
Captain's hardsuit is now located in their locker, locker was placed where the hardsuit locker was and the dresser was placed where the locker was previously.
CMO had same treatment as HoS. Same goes for Mystagogue, chief engineer,warden and logistics officer
Added cryo to command/prison/arrivals
Added more screens
Named APCs. God there is alot of them.
Added Tropico to detective's office. (Aparently thief objective)
* DIE INVALID
2024-01-31 09:34:32 -06:00
DeltaV-Bot
4c8a4b56f4
Automatic Changelog Update ( #714 )
2024-01-31 10:34:32 +00:00
leo
45735bf860
Nerfing Health Code Violation ( #714 )
...
make HCV less immediately lethal but still fun
2024-01-31 11:34:16 +01:00
Debug
1b783d231e
Revert "Map Hotfix" ( #744 )
...
Revert "Map Hotfix (#740 )"
This reverts commit 6fc39d5d94 .
2024-01-31 09:45:21 +00:00
DeltaV-Bot
988b75f37f
Automatic Changelog Update ( #743 )
2024-01-31 09:43:11 +00:00
Debug
4414a65301
Fix prisoners spawning at latejoin cryopods ( #743 )
2024-01-31 09:42:57 +00:00
Velcroboy
a80ed207c4
Map Edits: The Hive ( #742 )
...
Co-authored-by: Velcroboy <>
2024-01-31 08:32:36 +00:00
DeltaV-Bot
af9f543ebc
Automatic Changelog Update ( #739 )
2024-01-31 07:42:14 +00:00
Debug
0ced42f17b
Allow rejoining from cryosleep ( #739 )
...
Update deltav.toml
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-01-31 08:41:58 +01:00
Velcroboy
6fc39d5d94
Map Hotfix ( #740 )
...
Replace latejoin cryosleepers w/ standard
Co-authored-by: Velcroboy <>
2024-01-30 23:34:13 +00:00
Velcroboy
3dd7d8a56c
Re-add evac shuttles Box & Lox ( #737 )
...
Co-authored-by: Velcroboy <>
2024-01-30 21:55:15 +00:00
DeltaV-Bot
fa88a26fa0
Automatic Changelog Update ( #736 )
2024-01-30 21:10:00 +00:00
Colin-Tel
c09883775c
Asterisk 2.0 ( #736 )
...
Modernized Asterisk
2024-01-30 15:09:41 -06:00
Velcroboy
8357dbea87
Map Edits: Tortuga ( #735 )
...
* Map Edits: Tortuga
* Update folders and paper bins
---------
Co-authored-by: Velcroboy <>
2024-01-30 17:36:49 +00:00
DeltaV-Bot
2cbb01adeb
Automatic Changelog Update ( #733 )
2024-01-30 14:22:29 +00:00
Tad "Taddy" Johnson
62477426ee
Update pride.yml ( #733 )
...
* Update pride.yml
Necessary change.
* Update pride.yml
added bee socks. very important
* Update cargo_vending.yml
the price of freedom
Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>
---------
Signed-off-by: Tad "Taddy" Johnson <120885811+TadJohnson00@users.noreply.github.com>
2024-01-30 15:22:13 +01:00
Velcroboy
2d2c2dbacd
Map Edits: Hammurabi ( #734 )
...
Co-authored-by: Velcroboy <>
2024-01-30 02:40:29 +00:00
Velcroboy
2b08f3d225
Map Edits: Arena ( #732 )
...
* Map Edits: Arena
* Updates paper bins and dirt->cleanable
---------
Co-authored-by: Velcroboy <>
2024-01-29 23:43:33 +00:00
github-actions[bot]
4433bf4ffc
Update Credits ( #724 )
...
Co-authored-by: DeltaV-Bot <github@delta-v.org>
2024-01-28 19:47:48 +01:00
Adrian16199
666194bd9c
Shoukou maintenance update.... again. ( #695 )
...
* Shoukou maintenance update.... again.
Fixes camera in cryo
Added a techmaint floor under Armoury level 2 door.
Adds mirror to cloning.
Adds maintenance behind robotics, giving access to atmos if someone wanted to break in.
Adds a TV in bar.
* Update shoukou.yml
* Second patch.
* Just going to see how this will go.
* Revertin the previous commit.
---------
Co-authored-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-01-28 10:42:01 -06:00
Debug
143133a264
Merge pull request #711 from IamVelcroboy/interior_questionmark
...
Update for preferred Delta V exterior lights
2024-01-28 02:33:00 +01:00
Debug
b84c8287a7
Merge branch 'master' into interior_questionmark
...
Signed-off-by: Debug <49997488+DebugOk@users.noreply.github.com>
2024-01-28 02:24:36 +01:00
Debug
5355d423fc
Merge pull request #723 from DebugOk/WizMerge-22/01
...
Finally, a big merge
2024-01-28 01:38:01 +01:00
Debug
fd28a4853c
Merge remote-tracking branch 'upstream/master' into Wizmerge-22/01
...
# Conflicts:
# Resources/Maps/hammurabi.yml
2024-01-28 01:27:11 +01:00
Debug
2fe44470e7
Fix Hammurabi
2024-01-28 01:25:27 +01:00
Debug
e1de8b3d36
Reset Hammurabi
2024-01-28 01:24:36 +01:00
Debug
62009ac6bd
Fix linter error
2024-01-28 01:19:19 +01:00
PJBot
191ab439a5
Automatic changelog update
...
(cherry picked from commit dfa10be890 )
2024-01-28 00:34:27 +01:00
FungiFellow
60ff465b01
Ion Storm Weight Increase ( #24633 )
...
(cherry picked from commit 7b046aceb8 )
2024-01-28 00:34:26 +01:00
Rondalph Diggs
f0d52c4af7
Align sprite rear view ( #24584 )
...
Fixes space-wizards/space-station-14#24574
Moved back view sprite one pixel to the right.
(cherry picked from commit a8989c0ee7 )
2024-01-28 00:34:00 +01:00
Hanz
be60ec7f59
Bartender limited reagents fixup ( #24598 )
...
Fixed up bartending after the limited reagents update
(cherry picked from commit 8fc9650b6e )
2024-01-28 00:33:59 +01:00
PJBot
d502391237
Automatic changelog update
...
(cherry picked from commit 82fa771859 )
2024-01-28 00:33:58 +01:00
Boaz1111
8bf47c9905
Pka shuttle projectiles now actually break rocks in one hit ( #24627 )
...
bitch
(cherry picked from commit b5e010f0fe )
2024-01-28 00:33:56 +01:00
PJBot
0e2c6dd9da
Automatic changelog update
...
(cherry picked from commit ddf1ec0216 )
2024-01-28 00:33:55 +01:00
Kara
169a7cae2b
Powered light sprite glows with color of their pointlight ( #24612 )
...
(cherry picked from commit 4ab69709fe )
2024-01-28 00:33:54 +01:00
Vasilis
57816c8ad0
Admin Observers get a hat slot and a pda ( #20183 )
...
(cherry picked from commit 69d9d9f34b )
2024-01-28 00:33:53 +01:00
PJBot
a05ca852fe
Automatic changelog update
...
(cherry picked from commit 70a63452b9 )
2024-01-28 00:33:52 +01:00
avery
1075c2e999
Hallway textscreens ( #24189 )
...
* hallway screen refactor pending comms console support
* comms console broadcasts
* screen and timer localization
(cherry picked from commit 7e16ee0b55 )
2024-01-28 00:33:40 +01:00
Ed
bee2b77eeb
Gravity anomaly rework ( #24452 )
...
* balance
* gorilla gauntlet fix
* magboots update
* some more buff
* randomwalk speed scales with severity
* nerf
* content
* Revert "content"
(cherry picked from commit a923beb21b )
2024-01-28 00:33:39 +01:00
PJBot
82c4812e7e
Automatic changelog update
...
(cherry picked from commit 23999b3d69 )
2024-01-28 00:33:38 +01:00
Tayrtahn
0625d42093
Repairable vending machines ( #24603 )
...
* Add Repairable to vending machines
* Removed fuelcost (outdated)
(cherry picked from commit be09538f28 )
2024-01-28 00:33:37 +01:00
PJBot
bf1b2f4b02
Automatic changelog update
...
(cherry picked from commit 639a453a39 )
2024-01-28 00:33:36 +01:00
Kara
fca53c48d2
Default navmap to show departments ( #24613 )
...
(cherry picked from commit 34eb691448 )
2024-01-28 00:33:35 +01:00
Guillaume E
1e519836da
Keep reagent dispenser inventory ordered ( #24304 )
...
* Keep reagent dispenser inventory ordered
This way, reagents wont be "moving around" in the UI when juggling
jugs.
The reagent dispensers will also show what reagents their storage
slots contain if jugs are not labelled.
* Move sorting client-side
* Revert "Keep reagent dispenser inventory ordered"
This reverts commit 3a1fc2e36d593937d4ecc581ae5a617a273a9d1c.
(cherry picked from commit 4ee7349514 )
2024-01-28 00:33:34 +01:00
Ubaser
831762e9e7
Biodome satellite ruin ( #24608 )
...
* add
* yea
(cherry picked from commit eca3d0b273 )
2024-01-28 00:33:33 +01:00