diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 06d68f19f3..5e06b1f037 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -232,6 +232,24 @@ update_airtight(piece, 0) // Unseal update_icon(1) +/obj/item/weapon/rig/proc/cut_suit() + offline = 2 + canremove = 1 + for(var/obj/item/piece in list(helmet,boots,gloves,chest)) + if(!piece) continue + piece.icon_state = "[suit_state]" + if(airtight) + update_airtight(piece, 0) // Unseal + piece.canremove = 1 + if(istype(loc, /mob/living/carbon/human)) + var/mob/living/carbon/human/H = loc + H.drop_from_inventory(piece) + piece.forceMove(get_turf(src)) + piece.dropped() + piece.canremove = 0 + piece.forceMove(src) + update_icon(1) + /obj/item/weapon/rig/proc/toggle_seals(var/mob/living/carbon/human/M,var/instant) if(sealing) return diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm index 411ecf75d3..b6ec121adf 100644 --- a/code/modules/surgery/other.dm +++ b/code/modules/surgery/other.dm @@ -225,7 +225,7 @@ rig = target.belt if(!istype(rig)) return - rig.reset() + rig.cut_suit() user.visible_message("[user] has cut through the support systems of \the [rig] on [target] with \the [tool].", \ "You have cut through the support systems of \the [rig] on [target] with \the [tool].") diff --git a/maps/submaps/surface_submaps/plains/chemspill1_vr.dmm b/maps/submaps/surface_submaps/plains/chemspill1_vr.dmm new file mode 100644 index 0000000000..0f94d96d3f --- /dev/null +++ b/maps/submaps/surface_submaps/plains/chemspill1_vr.dmm @@ -0,0 +1,267 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"b" = ( +/turf/simulated/floor/outdoors/snow, +/area/template_noop) +"e" = ( +/turf/simulated/floor/outdoors/snow, +/area/submap/ChemSpill1) +"f" = ( +/obj/effect/decal/remains/deer, +/turf/simulated/floor/outdoors/dirt, +/area/submap/ChemSpill1) +"g" = ( +/turf/simulated/floor/outdoors/dirt, +/area/submap/ChemSpill1) +"h" = ( +/turf/simulated/floor/outdoors/mud, +/area/submap/ChemSpill1) +"i" = ( +/turf/simulated/floor/water/contaminated, +/area/submap/ChemSpill1) +"j" = ( +/obj/structure/prop/poicanister, +/turf/simulated/floor/water/contaminated, +/area/submap/ChemSpill1) +"k" = ( +/obj/effect/decal/remains/mouse, +/turf/simulated/floor/water/contaminated, +/area/submap/ChemSpill1) +"l" = ( +/turf/simulated/floor/outdoors/rocks, +/area/submap/ChemSpill1) +"m" = ( +/obj/effect/decal/remains/ribcage, +/turf/simulated/floor/outdoors/dirt, +/area/submap/ChemSpill1) +"n" = ( +/obj/effect/decal/remains/lizard, +/turf/simulated/floor/outdoors/dirt, +/area/submap/ChemSpill1) + +(1,1,1) = {" +a +a +a +a +a +e +g +a +a +a +a +a +a +a +"} +(2,1,1) = {" +a +a +g +g +e +e +g +g +e +e +e +e +a +a +"} +(3,1,1) = {" +a +e +g +g +g +g +g +g +e +e +e +e +g +l +"} +(4,1,1) = {" +a +a +g +g +f +g +g +g +g +l +l +g +n +g +"} +(5,1,1) = {" +a +a +e +g +g +l +g +h +h +g +l +l +g +e +"} +(6,1,1) = {" +a +a +e +g +g +l +i +h +i +h +h +g +g +e +"} +(7,1,1) = {" +a +a +e +g +g +g +h +i +j +i +h +h +g +g +"} +(8,1,1) = {" +a +a +g +g +e +g +h +h +i +k +i +h +e +e +"} +(9,1,1) = {" +a +e +e +g +g +g +g +h +i +h +h +h +g +e +"} +(10,1,1) = {" +a +g +g +g +g +g +g +g +h +g +m +e +g +a +"} +(11,1,1) = {" +a +e +g +g +g +e +e +g +l +g +l +e +g +g +"} +(12,1,1) = {" +a +a +e +g +g +g +e +e +l +l +e +a +g +g +"} +(13,1,1) = {" +a +a +e +e +g +g +e +a +a +a +a +a +g +a +"} +(14,1,1) = {" +a +a +e +e +a +a +a +a +a +a +a +b +a +a +"} diff --git a/maps/submaps/surface_submaps/plains/plains.dm b/maps/submaps/surface_submaps/plains/plains.dm index e649a44730..f8f017af3d 100644 --- a/maps/submaps/surface_submaps/plains/plains.dm +++ b/maps/submaps/surface_submaps/plains/plains.dm @@ -213,5 +213,5 @@ /datum/map_template/surface/plains/ChemSpill1 name = "Ruptured Canister" desc = "A dumped chemical canister. Looks dangerous." - mappath = 'maps/submaps/surface_submaps/plains/chemspill1.dmm' + mappath = 'maps/submaps/surface_submaps/plains/chemspill1_vr.dmm' //VOREStation Edit cost = 10