BUGFIX: Security Remap (#15923)

* EntireSecurityD2Remap - WIP

* Avery Hates Security!

* Avery Hates Security!!

Remaps the entire D2 Security department.

* Fixed the devils bathroom

* now the bathroom is working maybe

* maybe this will fix my doors?

* Changelog because I forgot to add one

* fixes bad doors maybe..?

* I FOUND THE ERROR

* i hate mapping

* ispentanentiredaydoingthisbroplswork

* Why did I do this to myself?

* Mood lighting to armory and some small fluff

* tryingtogetthisawaysiteshittostop

* Revision "I lost count"

* ForgotToRemoveRefslol

* Minor Fixes

Replaces landmark, fixes projectile entry points, adds lighting, more air alarms, and fixed blastdoor buttons.

* Ihatemapping

* firedoorwarpt3

* Window for the shitter

Adds a window to the new toilet as requested

* Last Commit

This adds a recharger to the wardens office, some SCC banners, holoboard to communal and a library computer for book printing.

* Holopads

Adds holopads, as requested

* Moves some lights around and hopefully fixes merge conflict

* incorporates map change

* Merge fixpt2

* fixes the merge conflict maybe

* Updates my branch to the current stuff ig

* Merge fix.. please?

* Fixed randomly deleted tiles

* decal fix

* unticks horizon map thing

* Remap Bugfix

Fixes a few small unnoticed bugs.

* Changelog

* Delete Eyevery_SecurityRemap.yml
This commit is contained in:
Avery Marie
2023-03-01 21:11:39 +00:00
committed by GitHub
parent cc50a7f91f
commit 545c14b3d8
3 changed files with 144 additions and 50 deletions
+41
View File
@@ -0,0 +1,41 @@
################################
# 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: ReadThisNamePlz
# 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:
- bugfix: "Fixes a missing airlock, repairs a missing wire to the Armory APC, adds a vent and scrubber to the communal entrance and adds a decal to a medical closet"
+96 -50
View File
@@ -493,6 +493,12 @@
/obj/effect/floor_decal/corner/paleblue{
dir = 9
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/tiled,
/area/horizon/security/brig)
"ang" = (
@@ -1698,8 +1704,6 @@
/turf/simulated/floor/wood,
/area/hallway/engineering)
"aKO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
@@ -2245,7 +2249,6 @@
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/door/window,
/turf/simulated/floor/tiled,
/area/horizon/security/brig)
"aWi" = (
@@ -2823,7 +2826,10 @@
/turf/simulated/floor/reinforced,
/area/turret_protected/ai)
"blC" = (
/obj/effect/map_effect/window_spawner/full/reinforced/firedoor,
/obj/structure/cable/green{
icon_state = "1-2"
},
/obj/effect/map_effect/window_spawner/full/reinforced/grille/firedoor,
/turf/simulated/floor/tiled/dark/full,
/area/horizon/security/armoury)
"blJ" = (
@@ -10832,12 +10838,6 @@
/obj/structure/disposalpipe/trunk{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/cable/green{
icon_state = "4-8"
},
@@ -18721,6 +18721,19 @@
"jcz" = (
/turf/simulated/wall,
/area/horizon/security/office)
"jcK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/tiled,
/area/horizon/security/brig)
"jdo" = (
/obj/structure/railing/mapped{
dir = 8
@@ -21183,16 +21196,16 @@
/turf/simulated/floor/tiled,
/area/horizon/security/armoury)
"kkY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 8
},
/turf/simulated/floor/tiled,
/area/horizon/security/brig)
"klv" = (
@@ -21274,8 +21287,6 @@
/turf/simulated/floor/tiled/white,
/area/hallway/medical)
"kqz" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/green{
icon_state = "1-4"
},
@@ -21287,6 +21298,12 @@
/obj/effect/floor_decal/corner/paleblue{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/turf/simulated/floor/tiled,
/area/horizon/security/brig)
"kqM" = (
@@ -22919,6 +22936,12 @@
/obj/effect/floor_decal/corner/paleblue/full{
dir = 8
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/tiled,
/area/horizon/security/brig)
"ljF" = (
@@ -23430,8 +23453,6 @@
/turf/simulated/floor/tiled/dark,
/area/rnd/xenobiology)
"lzq" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/structure/cable/green{
d1 = 1;
d2 = 2;
@@ -23440,6 +23461,12 @@
/obj/effect/floor_decal/industrial/warning{
dir = 4
},
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
dir = 8
},
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
dir = 8
},
/turf/simulated/floor/tiled,
/area/horizon/security/hallway)
"lzC" = (
@@ -26705,12 +26732,6 @@
/turf/simulated/floor/tiled,
/area/hallway/primary/central_one)
"mXO" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/cable/green{
icon_state = "4-8"
},
@@ -26719,6 +26740,9 @@
dir = 1;
pixel_y = -28
},
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 8
},
/turf/simulated/floor/tiled,
/area/horizon/security/brig)
"mXS" = (
@@ -26952,6 +26976,7 @@
/obj/item/stack/medical/bruise_pack,
/obj/item/stack/medical/ointment,
/obj/item/stack/medical/ointment,
/obj/effect/floor_decal/industrial/outline/medical,
/turf/simulated/floor/tiled,
/area/horizon/security/hallway)
"ndn" = (
@@ -33338,12 +33363,6 @@
dir = 8;
icon_state = "pipe-c"
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 10
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 10
},
/obj/structure/cable/green{
icon_state = "2-8"
},
@@ -33750,6 +33769,12 @@
},
/obj/machinery/door/firedoor,
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/tiled,
/area/horizon/security/brig)
"qxy" = (
@@ -43400,6 +43425,12 @@
/obj/machinery/light{
dir = 1
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/tiled,
/area/horizon/security/brig)
"vgZ" = (
@@ -47165,6 +47196,21 @@
},
/turf/simulated/floor/tiled/full,
/area/hallway/primary/central_two)
"wTm" = (
/obj/effect/floor_decal/corner/paleblue{
dir = 5
},
/obj/effect/floor_decal/corner/paleblue{
dir = 6
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/turf/simulated/floor/tiled,
/area/horizon/security/brig)
"wTD" = (
/obj/structure/cable/orange{
icon_state = "1-2"
@@ -47871,19 +47917,9 @@
/area/horizon/maintenance/deck_two/fore/port)
"xki" = (
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/airlock/glass_security{
name = "Brig Interior";
req_access = list(2)
},
/obj/structure/disposalpipe/segment{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/structure/cable/green{
icon_state = "4-8"
},
@@ -47896,6 +47932,10 @@
opacity = 0
},
/obj/machinery/door/firedoor,
/obj/machinery/door/airlock/glass_security{
name = "Brig Interior";
req_access = list(2)
},
/turf/simulated/floor/tiled,
/area/horizon/security/brig)
"xkH" = (
@@ -49094,12 +49134,6 @@
/turf/simulated/floor/tiled/full,
/area/engineering/engine_waste)
"xQz" = (
/obj/machinery/door/airlock/glass_security{
autoclose = 0;
id_tag = "cell_1";
name = "Cell A";
req_access = list(2)
},
/obj/machinery/door/firedoor,
/obj/effect/floor_decal/industrial/hatch/yellow,
/obj/machinery/door/blast/regular{
@@ -49110,6 +49144,18 @@
name = "Brig Lockdown Blast Door";
opacity = 0
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
},
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 4
},
/obj/machinery/door/airlock/glass_security{
autoclose = 0;
id_tag = "cell_1";
name = "Cell A";
req_access = list(2)
},
/turf/simulated/floor/plating,
/area/horizon/security/brig)
"xQB" = (
@@ -78112,7 +78158,7 @@ uOB
khi
mns
rSE
kkY
jcK
bDo
amI
syI
@@ -78316,7 +78362,7 @@ oLB
gtk
kkY
fin
eNZ
wTm
qQt
ftz
eGh
@@ -4053,6 +4053,10 @@
/obj/structure/cable/green{
icon_state = "4-8"
},
/obj/machinery/door/airlock/maintenance{
name = "Security Maintenance";
req_access = list(63)
},
/turf/simulated/floor/tiled/full,
/area/horizon/security/investigations_hallway)
"dCe" = (
@@ -27281,6 +27285,9 @@
/obj/machinery/firealarm/south{
pixel_y = 24
},
/obj/machinery/light{
dir = 8
},
/turf/simulated/floor/tiled/white,
/area/horizon/security/washroom)
"vGj" = (