Skip to content

Commit

Permalink
IRMG Enforcers get hardsuits (#3508)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

![vaquero](https://github.com/user-attachments/assets/1271256e-c9ea-45fd-b543-19ff8618eed6)

![valor_closet](https://github.com/user-attachments/assets/20da7bef-ce7a-4dd2-819b-b61e68d80e8e)

Adds enough hardsuits for every Enforcer on the Valor and the Vaquero.
Also, improves the Vaquero's dorm room layout.

## Why It's Good For The Game

enforcers should probably have space armor

## Changelog

:cl:
balance: Valor and Vaquero have combat hardsuits for their enforcers now
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Apogee-dev authored Oct 15, 2024
1 parent 76e9d12 commit 44534d3
Show file tree
Hide file tree
Showing 2 changed files with 531 additions and 401 deletions.
131 changes: 73 additions & 58 deletions _maps/shuttles/inteq/inteq_valor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,8 @@
/obj/machinery/suit_storage_unit/inherit,
/obj/effect/turf_decal/industrial/outline/yellow,
/obj/machinery/light/small/directional/north,
/obj/item/clothing/suit/space/inteq,
/obj/item/clothing/head/helmet/space/inteq,
/turf/open/floor/plasteel,
/area/ship/crew/office)
"bx" = (
Expand Down Expand Up @@ -663,6 +665,7 @@
/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
/obj/item/clothing/head/helmet/swat/inteq,
/obj/item/clothing/mask/gas/sechailer,
/obj/item/radio/intercom/directional/north,
/turf/open/floor/plasteel,
/area/ship/crew/office)
"gb" = (
Expand Down Expand Up @@ -746,8 +749,8 @@
"gq" = (
/obj/machinery/light_switch{
dir = 1;
pixel_y = -20;
pixel_x = -3
pixel_x = -3;
pixel_y = -20
},
/turf/open/floor/plasteel/mono/dark,
/area/ship/cargo)
Expand Down Expand Up @@ -1042,14 +1045,32 @@
/turf/open/floor/plating,
/area/ship/medical/surgery)
"jN" = (
/obj/structure/chair/office,
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable{
icon_state = "0-4"
/obj/effect/turf_decal/corner/opaque/brown{
dir = 4
},
/obj/effect/turf_decal/corner/transparent/inteqbrown/half,
/turf/open/floor/plasteel,
/area/ship/crew/office)
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/effect/turf_decal/corner/opaque/brown{
dir = 8
},
/obj/machinery/airalarm/directional/east,
/obj/structure/rack,
/obj/item/storage/belt/security/webbing/inteq{
pixel_x = 6;
pixel_y = 8
},
/obj/item/storage/belt/security/webbing/inteq{
pixel_x = 8;
pixel_y = 4
},
/obj/item/clothing/head/helmet/inteq{
pixel_x = -9;
pixel_y = 6
},
/obj/item/clothing/head/helmet/inteq{
pixel_x = -7
},
/turf/open/floor/plasteel/dark,
/area/ship/security)
"jQ" = (
/obj/structure/catwalk/over/plated_catwalk,
/obj/machinery/light/directional/east,
Expand Down Expand Up @@ -1087,8 +1108,8 @@
},
/obj/machinery/light_switch{
dir = 1;
pixel_y = -20;
pixel_x = 4
pixel_x = 4;
pixel_y = -20
},
/turf/open/floor/plasteel/patterned/ridged,
/area/ship/medical)
Expand Down Expand Up @@ -1178,22 +1199,8 @@
/obj/structure/reagent_dispensers/peppertank{
pixel_y = 28
},
/obj/structure/rack,
/obj/item/storage/belt/security/webbing/inteq{
pixel_x = 6;
pixel_y = 8
},
/obj/item/storage/belt/security/webbing/inteq{
pixel_x = 8;
pixel_y = 4
},
/obj/item/clothing/head/helmet/inteq{
pixel_x = -9;
pixel_y = 6
},
/obj/item/clothing/head/helmet/inteq{
pixel_x = -7
},
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
/turf/open/floor/plasteel/dark,
/area/ship/security)
"kL" = (
Expand Down Expand Up @@ -1296,15 +1303,18 @@
/area/ship/crew/canteen)
"lN" = (
/obj/structure/table,
/obj/machinery/door/window/southleft,
/obj/item/paper_bin,
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 8
dir = 4
},
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
/obj/effect/turf_decal/corner/transparent/inteqbrown/full,
/obj/item/folder/yellow,
/obj/item/pen,
/turf/open/floor/plasteel/patterned,
/area/ship/crew/office)
"lW" = (
Expand Down Expand Up @@ -1995,9 +2005,6 @@
/area/ship/maintenance/port)
"rY" = (
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/effect/turf_decal/corner/opaque/brown{
dir = 4
},
/obj/effect/turf_decal/corner/opaque/brown{
dir = 8
},
Expand All @@ -2008,7 +2015,6 @@
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{
dir = 10
},
/obj/machinery/airalarm/directional/east,
/turf/open/floor/plasteel/dark,
/area/ship/security)
"sb" = (
Expand Down Expand Up @@ -2598,11 +2604,9 @@
/area/ship/medical)
"xr" = (
/obj/structure/table,
/obj/item/paper_bin,
/obj/item/pen,
/obj/structure/window/reinforced,
/obj/machinery/door/window/southleft,
/obj/structure/window/reinforced{
dir = 4
dir = 8
},
/obj/machinery/door/firedoor/border_only,
/obj/machinery/door/firedoor/border_only{
Expand Down Expand Up @@ -2938,7 +2942,6 @@
dir = 1
},
/obj/effect/turf_decal/steeldecal/steel_decals_central7,
/obj/machinery/airalarm/directional/north,
/obj/structure/cable{
icon_state = "4-8"
},
Expand Down Expand Up @@ -3092,14 +3095,10 @@
/turf/template_noop,
/area/template_noop)
"BC" = (
/obj/structure/filingcabinet/double,
/obj/structure/sign/poster/official/help_others{
pixel_y = 32
},
/obj/effect/turf_decal/corner/transparent/inteqbrown/border{
dir = 1
},
/turf/open/floor/plasteel,
/turf/closed/wall/mineral/plastitanium,
/area/ship/crew/office)
"BL" = (
/obj/effect/turf_decal/corner/opaque/brown{
Expand Down Expand Up @@ -3592,10 +3591,11 @@
/turf/open/floor/plasteel/dark,
/area/ship/crew/canteen)
"Gm" = (
/obj/effect/turf_decal/corner/transparent/inteqbrown/half,
/obj/structure/cable{
icon_state = "4-8"
icon_state = "0-4"
},
/obj/effect/turf_decal/corner/transparent/inteqbrown/half,
/obj/machinery/power/apc/auto_name/directional/west,
/turf/open/floor/plasteel,
/area/ship/crew/office)
"Go" = (
Expand Down Expand Up @@ -4671,8 +4671,8 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 4
},
/obj/item/radio/intercom/directional/south,
/obj/effect/turf_decal/corner/transparent/inteqbrown/half,
/obj/structure/chair/office,
/turf/open/floor/plasteel,
/area/ship/crew/office)
"Qw" = (
Expand Down Expand Up @@ -4754,7 +4754,26 @@
/turf/open/floor/plasteel/dark,
/area/ship/medical/surgery)
"Rh" = (
/turf/closed/wall/mineral/plastitanium,
/obj/structure/sign/poster/official/safety_report{
pixel_x = 32
},
/obj/effect/turf_decal/corner/opaque/brown{
dir = 4
},
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/effect/turf_decal/corner/opaque/yellow{
dir = 1
},
/obj/structure/rack,
/obj/item/storage/box/ammo/c9mm_rubber{
pixel_x = 5;
pixel_y = 10
},
/obj/item/storage/box/ammo/c9mm{
pixel_x = -2;
pixel_y = 2
},
/turf/open/floor/plasteel/dark,
/area/ship/security)
"RA" = (
/obj/item/storage/backpack/messenger/inteq,
Expand Down Expand Up @@ -4834,6 +4853,7 @@
/obj/structure/cable{
icon_state = "4-8"
},
/obj/machinery/airalarm/directional/north,
/turf/open/floor/plasteel/patterned/grid,
/area/ship/hallway/port)
"Sh" = (
Expand Down Expand Up @@ -5073,15 +5093,10 @@
/obj/effect/turf_decal/corner/opaque/brown{
dir = 4
},
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/structure/rack,
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4,
/obj/item/storage/box/ammo/c9mm_rubber,
/obj/item/storage/box/ammo/c9mm,
/obj/machinery/light/small/directional/north,
/obj/structure/sign/poster/official/safety_report{
pixel_x = 32
},
/obj/machinery/suit_storage_unit/inherit,
/obj/item/clothing/suit/space/hardsuit/security/independent/inteq,
/turf/open/floor/plasteel/dark,
/area/ship/security)
"Vy" = (
Expand Down Expand Up @@ -5897,7 +5912,7 @@ SL
(11,1,1) = {"
Zu
Rh
Rh
jN
Zu
uB
ua
Expand Down Expand Up @@ -5930,8 +5945,8 @@ SL
(12,1,1) = {"
tZ
BC
jN
lN
oO
oO
gh
zs
fN
Expand Down Expand Up @@ -5997,7 +6012,7 @@ SL
tZ
mG
Qo
tZ
lN
An
Sd
HC
Expand Down
Loading

0 comments on commit 44534d3

Please sign in to comment.