shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes lavaland syndie base rads + SSU compartment issues (#37252)

Browse Source 
* radsuit SSU, syndie lava base rad protection

* re-adds missing combat gloves

* defines radsuit SSU name by the obj
This commit is contained in:
81Denton
2018-04-18 14:01:08 +02:00
committed by CitadelStationBot
parent f98040513a
commit 7caad40e3f
2 changed files with 35 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm
+27 -11
View File
@@ -3367,21 +3367,22 @@
/area/ruin/unpowered/syndicate_lava_base/engineering)
"jv" = (
/obj/effect/turf_decal/bot,
/obj/structure/closet/toolcloset,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/suit_storage_unit/radsuit,
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"jw" = (
/obj/effect/turf_decal/bot,
/obj/structure/closet/firecloset/full{
anchored = 1
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
piping_layer = 3;
pixel_x = 5;
pixel_y = 5
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/toolcloset{
anchored = 1
},
/obj/item/crowbar,
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"jx" = (
@@ -3639,6 +3640,9 @@
/area/ruin/unpowered/syndicate_lava_base/main)
"jT" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/firecloset/full{
anchored = 1
},
/turf/open/floor/plasteel/yellow/side{
dir = 4
},
@@ -3651,16 +3655,19 @@
/obj/effect/turf_decal/stripes/line{
dir = 10
},
/obj/structure/rack{
dir = 8
},
/obj/item/clothing/gloves/combat,
/obj/item/crowbar,
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/machinery/shower{
desc = "The HS-452. Installed recently by the DonkCo Hygiene Division.";
dir = 4;
name = "emergency shower"
},
/obj/structure/sign/warning/radiation/rad_area{
pixel_y = -32
},
/turf/open/floor/plasteel,
/area/ruin/unpowered/syndicate_lava_base/engineering)
"jW" = (
@@ -3953,9 +3960,18 @@
/area/ruin/unpowered/syndicate_lava_base/main)
"kw" = (
/obj/structure/table,
/obj/item/tank/internals/emergency_oxygen,
/obj/item/clothing/mask/breath,
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/gloves/combat{
pixel_y = -6
},
/obj/item/tank/internals/emergency_oxygen{
pixel_x = 4;
pixel_y = 4
},
/obj/item/clothing/mask/breath{
pixel_x = -2;
pixel_y = 4
},
/turf/open/floor/plasteel/white/side,
/area/ruin/unpowered/syndicate_lava_base/main)
"kx" = (
code/game/machinery/suit_storage_unit.dm
+8 -2
View File
@@ -103,6 +103,12 @@
mask_type = /obj/item/clothing/mask/breath
storage_type = /obj/item/tank/internals/emergency_oxygen/double
/obj/machinery/suit_storage_unit/radsuit
name = "radiation suit storage unit"
suit_type = /obj/item/clothing/suit/radiation
helmet_type = /obj/item/clothing/head/radiation
storage_type = /obj/item/device/geiger_counter
/obj/machinery/suit_storage_unit/open
state_open = TRUE
density = FALSE
@@ -300,14 +306,14 @@
/obj/machinery/suit_storage_unit/attackby(obj/item/I, mob/user, params)
if(state_open && is_operational())
if(istype(I, /obj/item/clothing/suit/space))
if(istype(I, /obj/item/clothing/suit))
if(suit)
to_chat(user, "<span class='warning'>The unit already contains a suit!.</span>")
return
if(!user.transferItemToLoc(I, src))
return
suit = I
else if(istype(I, /obj/item/clothing/head/helmet))
else if(istype(I, /obj/item/clothing/head))
if(helmet)
to_chat(user, "<span class='warning'>The unit already contains a helmet!</span>")
return