Skip to content

Commit

Permalink
Merge pull request #538 from RalseiDreemuurr/codding
Browse files Browse the repository at this point in the history 
Очередной фикс Хаммерхэда
  • Loading branch information
@molnizz
molnizz authored May 15, 2024
2 parents 9c4a713 + 8fb5247 commit b190fe4
Showing 1 changed file with 34 additions and 53 deletions.
87 changes: 34 additions & 53 deletions _maps/_mod_celadon/shuttles/inteq/inteq_hammerhead.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@
id = "Hamm_ext_win"
},
/obj/structure/curtain/bounty,
/obj/structure/grille,
/turf/open/floor/plating,
/area/ship/crew/dorm)
"as" = (
Expand Down Expand Up @@ -454,6 +453,9 @@
dir = 1
},
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/turf/open/floor/plasteel/stairs,
/area/ship/maintenance/central)
"bQ" = (
Expand Down Expand Up @@ -542,7 +544,6 @@
dir = 1;
id = "Hamm_ext_win"
},
/obj/structure/grille,
/turf/open/floor/plating,
/area/ship/crew/canteen/kitchen)
"cl" = (
Expand Down Expand Up @@ -604,7 +605,6 @@
/area/ship/cargo)
"cy" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/structure/grille,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/cargo/office)
"cB" = (
Expand Down Expand Up @@ -851,7 +851,6 @@
dir = 1;
id = "Hamm_ext_win"
},
/obj/structure/grille,
/turf/open/floor/plating,
/area/ship/security/prison)
"en" = (
Expand Down Expand Up @@ -968,6 +967,9 @@
name = "old wooden crate"
},
/obj/item/restraints/legcuffs/bola/tactical,
/obj/item/storage/toolbox/emergency/old{
layer = 4
},
/turf/open/floor/plating,
/area/ship/engineering/engine)
"fn" = (
Expand Down Expand Up @@ -1159,7 +1161,8 @@
/area/ship/crew/janitor)
"gO" = (
/obj/structure/window/plasma/reinforced/unanchored{
explosion_block = 5
explosion_block = 5;
anchored = 1
},
/obj/machinery/suit_storage_unit/inherit{
req_access_txt = "147;148"
Expand Down Expand Up @@ -1963,7 +1966,6 @@
dir = 4;
id = "Hamm_ext_win"
},
/obj/structure/grille,
/turf/open/floor/plating,
/area/ship/cargo/office)
"lY" = (
Expand Down Expand Up @@ -2084,7 +2086,6 @@
/obj/machinery/door/poddoor/shutters{
id = "Hamm_cell1"
},
/obj/structure/grille,
/obj/structure/cable,
/turf/open/floor/plating,
/area/ship/security/prison)
Expand Down Expand Up @@ -2340,6 +2341,9 @@
},
/obj/machinery/light/directional/north,
/obj/effect/decal/cleanable/blood/drip,
/obj/structure/window/plasma/reinforced/unanchored{
explosion_block = 5
},
/turf/open/floor/plasteel/dark,
/area/ship/security/prison)
"oN" = (
Expand Down Expand Up @@ -2373,7 +2377,6 @@
dir = 4;
id = "Hamm_inn_win"
},
/obj/structure/grille,
/turf/open/floor/plating,
/area/ship/bridge)
"oX" = (
Expand Down Expand Up @@ -2800,7 +2803,6 @@
dir = 1;
id = "Hamm_ext_win"
},
/obj/structure/grille,
/turf/open/floor/plating,
/area/ship/cargo/office)
"sl" = (
Expand All @@ -2811,7 +2813,8 @@
/obj/structure/closet/secure_closet{
icon_state = "armory";
name = "weapons locker";
req_access_txt = "3"
req_access_txt = "3";
anchored = 1
},
/obj/item/ammo_box/magazine/m12g/small,
/obj/item/storage/toolbox/ammo/a308,
Expand Down Expand Up @@ -2951,7 +2954,7 @@
/turf/open/floor/plasteel/dark,
/area/ship/security/prison)
"tb" = (
/obj/structure/frame{
/obj/structure/frame/machine{
anchored = 1
},
/turf/open/floor/plating,
Expand Down Expand Up @@ -3073,7 +3076,7 @@
/obj/effect/turf_decal/corner/opaque/yellow/border{
dir = 1
},
/obj/machinery/computer/security,
/obj/machinery/computer/atmos_control,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"tU" = (
Expand Down Expand Up @@ -3403,15 +3406,10 @@
/area/ship/cargo/office)
"wi" = (
/obj/effect/spawner/structure/window/reinforced,
/obj/machinery/door/poddoor/shutters{
dir = 1;
id = "Hamm_ext_win"
},
/obj/machinery/door/poddoor/shutters/preopen{
explosion_block = 7;
id = "Armory"
},
/obj/structure/grille,
/turf/open/floor/plating,
/area/ship/security/armory)
"wl" = (
Expand Down Expand Up @@ -4012,6 +4010,7 @@
desc = "A spacious backpack with lots of pockets, worn by MaA's of an IntelQ Agency.";
name = "large MaA backpack"
},
/obj/item/clothing/gloves/krav_maga/combatglovesplus,
/turf/open/floor/carpet/red_gold,
/area/ship/crew/crewtwo)
"zM" = (
Expand Down Expand Up @@ -4579,7 +4578,6 @@
dir = 1;
id = "Hamm_ext_win"
},
/obj/structure/grille,
/turf/open/floor/plating,
/area/ship/medical)
"CH" = (
Expand Down Expand Up @@ -4755,7 +4753,8 @@
/obj/structure/closet/secure_closet{
icon_state = "armory";
name = "weapons locker";
req_access_txt = "3"
req_access_txt = "3";
anchored = 1
},
/obj/machinery/light/directional/north,
/obj/item/gun/ballistic/shotgun/bulldog/inteq,
Expand Down Expand Up @@ -4814,7 +4813,6 @@
id = "Hamm_ext_win"
},
/obj/structure/curtain/bounty,
/obj/structure/grille,
/turf/open/floor/plating,
/area/ship/crew/dorm)
"DT" = (
Expand Down Expand Up @@ -5183,7 +5181,6 @@
},
/obj/effect/spawner/structure/window/reinforced,
/obj/effect/decal/cleanable/dirt,
/obj/structure/grille,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/cargo/office)
"FQ" = (
Expand Down Expand Up @@ -5233,7 +5230,8 @@
/obj/structure/closet/secure_closet{
icon_state = "armory";
name = "weapons locker";
req_access_txt = "3"
req_access_txt = "3";
anchored = 1
},
/obj/item/grenade/flashbang,
/obj/item/grenade/flashbang,
Expand Down Expand Up @@ -5318,7 +5316,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
/obj/structure/frame{
/obj/structure/frame/machine{
anchored = 1
},
/turf/open/floor/plating,
Expand Down Expand Up @@ -5840,7 +5838,7 @@
/obj/structure/cable{
icon_state = "0-4"
},
/obj/structure/frame{
/obj/structure/frame/machine{
anchored = 1
},
/turf/open/floor/plating,
Expand Down Expand Up @@ -6138,18 +6136,9 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/cargo/office)
"LT" = (
/obj/structure/closet/secure_closet{
icon_state = "sec";
name = "equipment locker";
req_access_txt = "3"
},
/obj/effect/turf_decal/siding/thinplating/dark{
dir = 1
},
/obj/item/clothing/head/beret/sec/warden,
/obj/item/clothing/suit/armor/vest/security/warden/alt/nt,
/obj/item/clothing/under/rank/security/warden/nt,
/obj/item/clothing/gloves/krav_maga/sec,
/turf/open/floor/plasteel/dark,
/area/ship/security/prison)
"LV" = (
Expand Down Expand Up @@ -6433,10 +6422,10 @@
/turf/open/floor/plasteel/patterned/grid,
/area/ship/cargo/office)
"Or" = (
/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/atmospherics/components/unary/outlet_injector/on{
dir = 4
},
/obj/structure/catwalk/over/plated_catwalk/dark,
/turf/open/floor/plating,
/area/ship/engineering/electrical)
"Ov" = (
Expand All @@ -6456,7 +6445,8 @@
/obj/structure/closet/secure_closet{
icon_state = "armory";
name = "weapons locker";
req_access_txt = "3"
req_access_txt = "3";
anchored = 1
},
/obj/item/gun/ballistic/shotgun/automatic/combat{
pixel_y = -6
Expand Down Expand Up @@ -6880,11 +6870,6 @@
/obj/structure/disposalpipe/segment,
/turf/closed/wall/mineral/plastitanium/interior,
/area/ship/crew/canteen/kitchen)
"QY" = (
/obj/machinery/pipedispenser,
/obj/structure/catwalk/over/plated_catwalk/dark,
/turf/open/floor/plating,
/area/ship/engineering/atmospherics)
"Rg" = (
/obj/machinery/vending/boozeomat,
/turf/open/floor/plastic,
Expand All @@ -6901,7 +6886,7 @@
/obj/item/clothing/head/inteq_peaked,
/obj/item/clothing/head/inteq_peaked,
/obj/item/clothing/suit/armor/vest/inteq,
/obj/item/clothing/suit/armor/vest/marine,
/obj/item/clothing/suit/armor/vest/inteq,
/turf/open/floor/plasteel/dark,
/area/ship/security/prison)
"Rx" = (
Expand All @@ -6927,7 +6912,6 @@
/obj/machinery/door/poddoor/shutters{
id = "Hamm_inn_win"
},
/obj/structure/grille,
/turf/open/floor/plating,
/area/ship/bridge)
"Sp" = (
Expand All @@ -6950,6 +6934,9 @@
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/structure/disposalpipe/segment,
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/turf/open/floor/plating,
/area/ship/engineering/engine)
"Ss" = (
Expand Down Expand Up @@ -7053,7 +7040,6 @@
dir = 4;
id = "Hamm_ext_win"
},
/obj/structure/grille,
/turf/open/floor/plating,
/area/ship/security/prison)
"Tg" = (
Expand Down Expand Up @@ -7130,7 +7116,6 @@
dir = 1;
id = "Hamm_ext_win"
},
/obj/structure/grille,
/turf/open/floor/plating,
/area/ship/crew)
"TN" = (
Expand Down Expand Up @@ -7331,9 +7316,6 @@
id = "Engine";
name = "Engine Blast Door"
},
/obj/item/storage/toolbox/emergency/old{
layer = 4
},
/obj/structure/cable{
icon_state = "1-8"
},
Expand Down Expand Up @@ -7482,7 +7464,6 @@
dir = 4;
id = "Hamm_ext_win"
},
/obj/structure/grille,
/turf/open/floor/plating,
/area/ship/engineering/communications)
"VR" = (
Expand Down Expand Up @@ -7659,7 +7640,8 @@
},
/obj/structure/window/plasma/reinforced/spawner/north,
/obj/structure/window/plasma/reinforced/unanchored{
explosion_block = 5
explosion_block = 5;
anchored = 1
},
/obj/structure/closet/crate/secure/weapon{
req_access_txt = "1"
Expand Down Expand Up @@ -8016,7 +7998,6 @@
dir = 1;
id = "Hamm_ext_win"
},
/obj/structure/grille,
/turf/open/floor/plating,
/area/ship/crew/crewtwo)
"Ze" = (
Expand Down Expand Up @@ -8473,7 +8454,7 @@ Th
Yn
dS
kn
nb
zl
cZ
zl
zl
Expand Down Expand Up @@ -8583,7 +8564,7 @@ hK
Fn
MM
dy
QY
nb
MR
fn
Vx
Expand Down

0 comments on commit b190fe4

Please sign in to comment.