Skip to content

Commit

Permalink
Some Small Fixes (#18886)
Browse files Browse the repository at this point in the history
- Fixes the maintenance access requirements on two of the airlocks just
north of ammunition storage.
  - Fixes an alert access marker on the right-side bridge doors.
  - Fixes #18884.
- Fixes the materials still left in one of the Research windows from the
Machinist remap.
  • Loading branch information
furrycactus authored Apr 8, 2024
1 parent 45b4960 commit 02a2862
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 37 deletions.
44 changes: 44 additions & 0 deletions html/changelogs/furrycactus - airlock acess fixes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################

# Your name.
author: Furrycactus

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- maptweak: "Fixes the maintenance access requirements on two of the airlocks just north of ammunition storage."
- maptweak: "Fixes an alert access marker on the right-side bridge doors."
- maptweak: "Fixes the missing Phoron from the Machinist Workshop."
- maptweak: "Removes some metal sheets and welding fuel accidentally left in a window."
41 changes: 5 additions & 36 deletions maps/sccv_horizon/sccv_horizon-2_deck_2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -9974,8 +9974,7 @@
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/maintenance{
dir = 1;
name = "Operations Maintenance";
req_one_access = list(26,29,31,48,67)
req_one_access = list(12)
},
/turf/simulated/floor/tiled/full,
/area/maintenance/wing/starboard)
Expand Down Expand Up @@ -10425,6 +10424,9 @@
},
/obj/structure/closet/crate,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/item/stack/material/phoron{
amount = 20
},
/turf/simulated/floor/tiled/dark/full,
/area/operations/lower/machinist)
"eTf" = (
Expand Down Expand Up @@ -44832,8 +44834,7 @@
},
/obj/machinery/door/airlock/maintenance{
dir = 4;
name = "Operations Maintenance";
req_one_access = list(26,29,31,48,67)
req_one_access = list(12)
},
/turf/simulated/floor/tiled/full,
/area/maintenance/wing/starboard)
Expand Down Expand Up @@ -49790,41 +49791,9 @@
id = "RnDShutters";
name = "RnD Shutters"
},
/obj/item/stack/material/glass{
amount = 50;
pixel_x = -1;
pixel_y = 2;
randpixel = 0
},
/obj/item/stack/material/steel{
amount = 50;
pixel_x = 1;
pixel_y = -2;
randpixel = 0
},
/obj/item/stack/material/steel{
amount = 50;
pixel_x = 1;
pixel_y = -2;
randpixel = 0
},
/obj/item/stack/material/steel{
amount = 50;
pixel_x = 1;
pixel_y = -2;
randpixel = 0
},
/obj/item/device/paint_sprayer,
/obj/item/reagent_containers/weldpack,
/obj/effect/floor_decal/corner/black{
dir = 10
},
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/ringer/south{
department = "Machinist Workshop";
id = "robo_ringer";
req_access = list(29)
},
/obj/machinery/camera/network/supply{
c_tag = "Operations - Machinist Workshop Starboard 3";
dir = 1
Expand Down
5 changes: 4 additions & 1 deletion maps/sccv_horizon/sccv_horizon-3_deck_3.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -20380,13 +20380,16 @@
/obj/structure/disposalpipe/segment,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/effect/map_effect/door_helper/level_access/command_foyer,
/obj/machinery/door/airlock/glass_command{
dir = 1;
id_tag = "command_foyer";
name = "Bridge";
req_one_access = list(19,38,72)
},
/obj/effect/map_effect/door_helper/level_access/command_foyer{
req_one_access_by_level = list("green","yellow"=list(19,38,72),"blue"=list(19,38,72),"red"=list(19,38,72),"delta"=list(19,38,72));
access_by_level = null
},
/turf/simulated/floor/tiled/full,
/area/horizon/hallway/deck_three/primary/central)
"oeg" = (
Expand Down

0 comments on commit 02a2862

Please sign in to comment.