diff --git a/_maps/map_files/templates/shelter_1.dmm b/_maps/map_files/templates/shelter_1.dmm index a3535c89361..d3745951e23 100644 --- a/_maps/map_files/templates/shelter_1.dmm +++ b/_maps/map_files/templates/shelter_1.dmm @@ -1,110 +1,23 @@ -//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"a" = ( -/turf/simulated/wall/survival, -/area/survivalpod) -"b" = ( -/obj/structure/sign/mining/survival{ - tag = "icon-survival (NORTH)"; - icon_state = "survival"; - dir = 1 - }, -/turf/simulated/wall/survival, -/area/survivalpod) -"c" = ( -/obj/structure/fans, -/turf/simulated/floor/pod, -/area/survivalpod) -"d" = ( -/obj/machinery/smartfridge/survival_pod, -/turf/simulated/floor/pod, -/area/survivalpod) -"e" = ( -/obj/item/device/gps/computer, -/turf/simulated/floor/pod, -/area/survivalpod) -"f" = ( -/obj/structure/sign/mining/survival{ - dir = 8 - }, -/turf/simulated/wall/survival, -/area/survivalpod) -"g" = ( -/obj/machinery/sleeper/survival_pod, -/turf/simulated/floor/pod, -/area/survivalpod) -"h" = ( -/turf/simulated/floor/pod, -/area/survivalpod) -"i" = ( -/obj/structure/stool/bed/pod, -/obj/item/weapon/bedsheet/brown, -/turf/simulated/floor/pod, -/area/survivalpod) -"j" = ( -/obj/structure/sign/mining/survival{ - tag = "icon-survival (EAST)"; - icon_state = "survival"; - dir = 4 - }, -/turf/simulated/wall/survival, -/area/survivalpod) -"k" = ( -/obj/structure/table/survival_pod, -/turf/simulated/floor/pod, -/area/survivalpod) -"l" = ( -/obj/structure/tubes, -/obj/structure/stool/bed/chair/comfy/black{ - dir = 8 - }, -/turf/simulated/floor/pod, -/area/survivalpod) -"m" = ( -/obj/structure/sign/mining/survival, -/turf/simulated/wall/survival, -/area/survivalpod) -"n" = ( -/obj/structure/fans/tiny, -/obj/machinery/door/airlock/survival_pod, -/turf/simulated/floor/pod, -/area/survivalpod) -"o" = ( -/obj/structure/sign/mining, -/turf/simulated/wall/survival, -/area/survivalpod) +"a" = (/turf/simulated/wall/survival,/area/survivalpod) +"b" = (/obj/structure/sign/mining/survival{tag = "icon-survival (NORTH)"; icon_state = "survival"; dir = 1},/turf/simulated/wall/survival,/area/survivalpod) +"c" = (/obj/structure/fans,/turf/simulated/floor/pod,/area/survivalpod) +"d" = (/obj/machinery/smartfridge/survival_pod,/turf/simulated/floor/pod,/area/survivalpod) +"e" = (/obj/item/device/gps/computer,/turf/simulated/floor/pod,/area/survivalpod) +"f" = (/obj/structure/sign/mining/survival{dir = 8},/turf/simulated/wall/survival,/area/survivalpod) +"g" = (/obj/machinery/sleeper/survival_pod,/turf/simulated/floor/pod,/area/survivalpod) +"h" = (/turf/simulated/floor/pod,/area/survivalpod) +"i" = (/obj/structure/stool/bed/pod,/obj/item/weapon/bedsheet/brown,/turf/simulated/floor/pod,/area/survivalpod) +"j" = (/obj/structure/sign/mining/survival{tag = "icon-survival (EAST)"; icon_state = "survival"; dir = 4},/turf/simulated/wall/survival,/area/survivalpod) +"k" = (/obj/structure/table/survival_pod,/turf/simulated/floor/pod,/area/survivalpod) +"l" = (/obj/structure/tubes,/obj/structure/stool/bed/chair/comfy/black{dir = 8},/turf/simulated/floor/pod,/area/survivalpod) +"m" = (/obj/structure/sign/mining/survival,/turf/simulated/wall/survival,/area/survivalpod) +"n" = (/obj/structure/fans/tiny,/obj/machinery/door/airlock/survival_pod,/turf/simulated/floor/pod,/area/survivalpod) +"o" = (/obj/structure/sign/mining,/turf/simulated/wall/survival,/area/survivalpod) (1,1,1) = {" -a -a -f -a -a -"} -(2,1,1) = {" -a -c -g -k -m -"} -(3,1,1) = {" -b -d -h -h -n -"} -(4,1,1) = {" -a -e -i -l -o -"} -(5,1,1) = {" -a -a -j -a -a +aabaa +acdea +fghij +akhla +amnoa "} diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index 4e490479697..cf1c4745435 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -288,13 +288,9 @@ return template = shelter_templates[template_id] if(!template) - throw EXCEPTION("Shelter template ([template_id]) not found!") + log_runtime("Shelter template ([template_id]) not found!", src) qdel(src) -/obj/item/weapon/survivalcapsule/Destroy() - template = null // without this, capsules would be one use. per round. - return ..() - /obj/item/weapon/survivalcapsule/examine(mob/user) . = ..() get_template()