diff --git a/code/modules/tents/deployed_tents.dm b/code/modules/tents/deployed_tents.dm index 9ea06e357d9e..ed32937bad10 100644 --- a/code/modules/tents/deployed_tents.dm +++ b/code/modules/tents/deployed_tents.dm @@ -156,3 +156,19 @@ roof_state = "reqs_top" x_dim = 4 y_dim = 4 + +/obj/structure/tent/corp + icon_state = "big_interior" + roof_state = "big_top" + x_dim = 3 + y_dim = 4 + +/obj/structure/tent/mp + icon_state = "mp_interior" + roof_state = "mp_top" + x_dim = 4 + y_dim = 4 + +/obj/structure/tent/ot + icon_state = "cmd_interior" + roof_state = "cmd_top" diff --git a/code/modules/tents/folded_tents.dm b/code/modules/tents/folded_tents.dm index 08b8142ab358..0c8cb2296c2d 100644 --- a/code/modules/tents/folded_tents.dm +++ b/code/modules/tents/folded_tents.dm @@ -144,6 +144,33 @@ off_x = -2 template = /datum/map_template/tent/big +/obj/item/folded_tent/corp + name = "folded company Tent" + icon_state = "cmd" + desc = "A company liaison tent, provided with all the resources for company field work, and a luxurious rug. ENTRANCE TO THE SOUTH." + dim_x = 3 + dim_y = 4 + off_x = -2 + template = /datum/map_template/tent/corp + +/obj/item/folded_tent/mp + name = "folded MP Tent" + icon_state = "big" + desc = "Field tent for USCM Military Police personnel, provides a rest area and a holding cell for individuals to be held until they can be sent shipside. Donuts included. ENTRANCE TO THE SOUTH." + dim_x = 4 + dim_y = 4 + off_x = -2 + template = /datum/map_template/tent/mp + +/obj/item/folded_tent/ot + name = "folded OT Tent" + icon_state = "big" + desc = "Field tent for ordnance technicians, allows them to store and distribute their equipment to frontline personnel. ENTRANCE TO THE SOUTH." + dim_x = 2 + dim_y = 4 + off_x = -1 + template = /datum/map_template/tent/ot + /obj/effect/overlay/temp/tent_deployment_error icon = 'icons/effects/effects.dmi' icon_state = "placement_zone" diff --git a/code/modules/tents/templates.dm b/code/modules/tents/templates.dm index c32c0214999e..ff83af196ecb 100644 --- a/code/modules/tents/templates.dm +++ b/code/modules/tents/templates.dm @@ -21,3 +21,15 @@ /datum/map_template/tent/reqs name = "Reqs Tent" map_id = "tent_reqs" + +/datum/map_template/tent/corp + name = "Corp Tent" + map_id = "tent_corp" + +/datum/map_template/tent/mp + name = "MP Tent" + map_id = "tent_mp" + +/datum/map_template/tent/ot + name = "OT Tent" + map_id = "tent_ot" diff --git a/icons/obj/structures/tents_deployed_classic.dmi b/icons/obj/structures/tents_deployed_classic.dmi index 4a7575aff833..2f6fb8f877ae 100644 Binary files a/icons/obj/structures/tents_deployed_classic.dmi and b/icons/obj/structures/tents_deployed_classic.dmi differ diff --git a/icons/obj/structures/tents_deployed_desert.dmi b/icons/obj/structures/tents_deployed_desert.dmi index 60269580d208..ae7f1c17e4f0 100644 Binary files a/icons/obj/structures/tents_deployed_desert.dmi and b/icons/obj/structures/tents_deployed_desert.dmi differ diff --git a/icons/obj/structures/tents_deployed_jungle.dmi b/icons/obj/structures/tents_deployed_jungle.dmi index 429377c4d9ed..a5dcfd8e883e 100644 Binary files a/icons/obj/structures/tents_deployed_jungle.dmi and b/icons/obj/structures/tents_deployed_jungle.dmi differ diff --git a/icons/obj/structures/tents_deployed_snow.dmi b/icons/obj/structures/tents_deployed_snow.dmi index 106ca3f1e997..e215451bde64 100644 Binary files a/icons/obj/structures/tents_deployed_snow.dmi and b/icons/obj/structures/tents_deployed_snow.dmi differ diff --git a/icons/obj/structures/tents_deployed_urban.dmi b/icons/obj/structures/tents_deployed_urban.dmi index a73d79eb3cbe..b3c9abafdd70 100644 Binary files a/icons/obj/structures/tents_deployed_urban.dmi and b/icons/obj/structures/tents_deployed_urban.dmi differ diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm index 5939075b1b5b..afcf92fd5f58 100644 --- a/maps/map_files/USS_Almayer/USS_Almayer.dmm +++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm @@ -5635,6 +5635,7 @@ /area/almayer/hallways/aft_hallway) "ast" = ( /obj/structure/surface/table/almayer, +/obj/item/folded_tent/ot, /turf/open/floor/almayer, /area/almayer/engineering/engineering_workshop/hangar) "asu" = ( @@ -39864,7 +39865,6 @@ /obj/structure/machinery/door/airlock/multi_tile/almayer/generic2{ access_modified = 1; name = "\improper Flight Crew Quarters"; - req_access_txt = null; req_one_access_txt = "19;22" }, /turf/open/floor/almayer{ @@ -41757,6 +41757,7 @@ /obj/item/weapon/pole/fancy_cane{ pixel_x = 5 }, +/obj/item/folded_tent/corp, /turf/open/floor/wood/ship, /area/almayer/command/corporateliason) "igr" = ( @@ -48217,7 +48218,6 @@ access_modified = 1; dir = 1; name = "\improper Flight Crew Quarters"; - req_access_txt = null; req_one_access_txt = "19;22" }, /turf/open/floor/almayer{ @@ -70399,6 +70399,8 @@ pixel_x = -1; pixel_y = 1 }, +/obj/structure/surface/table/almayer, +/obj/item/folded_tent/mp, /turf/open/floor/almayer{ dir = 5; icon_state = "plating" diff --git a/maps/tents/tent_corp.dmm b/maps/tents/tent_corp.dmm new file mode 100644 index 000000000000..6ae875695090 --- /dev/null +++ b/maps/tents/tent_corp.dmm @@ -0,0 +1,112 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/surface/table/woodentable/fancy, +/obj/structure/machinery/computer/skills{ + dir = 4; + pixel_y = 2 + }, +/turf/open/floor/carpet, +/area/template_noop) +"b" = ( +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"k" = ( +/obj/structure/tent_curtain, +/obj/structure/blocker/tent{ + dir = 4 + }, +/turf/template_noop, +/area/template_noop) +"m" = ( +/obj/structure/surface/table/woodentable/fancy, +/obj/item/paper_bin/wy{ + pixel_x = -6; + pixel_y = 8 + }, +/obj/item/tool/pen/clicky, +/turf/open/floor/carpet, +/area/template_noop) +"q" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/tent_curtain, +/obj/structure/bed/chair{ + dir = 1 + }, +/obj/structure/tent/big, +/turf/template_noop, +/area/template_noop) +"r" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/surface/table/woodentable/fancy, +/obj/item/device/flashlight/lamp/green{ + pixel_x = 5; + pixel_y = 3 + }, +/obj/item/ashtray/bronze{ + pixel_x = -6; + pixel_y = 1 + }, +/turf/open/floor/carpet, +/area/template_noop) +"t" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/blocker/tent{ + dir = 1 + }, +/turf/open/floor/carpet, +/area/template_noop) +"z" = ( +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/transmitter/tent{ + phone_category = "Command"; + phone_id = "Ground Command"; + pixel_x = -8; + pixel_y = 23 + }, +/obj/structure/bed/chair/comfy/orange, +/turf/open/floor/carpet, +/area/template_noop) +"A" = ( +/obj/structure/blocker/tent/full_tile, +/turf/template_noop, +/area/template_noop) +"V" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/turf/open/floor/carpet, +/area/template_noop) + +(1,1,1) = {" +A +a +r +q +"} +(2,1,1) = {" +A +z +m +b +"} +(3,1,1) = {" +A +t +V +k +"} diff --git a/maps/tents/tent_mp.dmm b/maps/tents/tent_mp.dmm new file mode 100644 index 000000000000..a0f54f617c5c --- /dev/null +++ b/maps/tents/tent_mp.dmm @@ -0,0 +1,115 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/template_noop, +/area/template_noop) +"c" = ( +/obj/structure/tent/reqs, +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"f" = ( +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/bed/chair/bolted, +/turf/template_noop, +/area/template_noop) +"g" = ( +/obj/structure/blocker/tent, +/obj/structure/machinery/door/window/westright{ + req_access = list(3) + }, +/turf/template_noop, +/area/template_noop) +"p" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"x" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/bed, +/obj/structure/blocker/tent, +/turf/template_noop, +/area/template_noop) +"C" = ( +/obj/structure/blocker/tent/full_tile, +/turf/template_noop, +/area/template_noop) +"I" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/surface/table, +/obj/item/storage/donut_box, +/turf/template_noop, +/area/template_noop) +"S" = ( +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/window/reinforced/toughened{ + dir = 8 + }, +/obj/structure/bed/chair/bolted, +/turf/template_noop, +/area/template_noop) +"X" = ( +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/machinery/vending/security, +/turf/template_noop, +/area/template_noop) +"Z" = ( +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/transmitter/tent{ + pixel_y = 30; + pixel_x = 16; + phone_category = "Command"; + phone_id = "Ground Requisitions" + }, +/obj/structure/surface/table, +/obj/structure/machinery/recharger, +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +C +Z +I +c +"} +(2,1,1) = {" +C +X +a +p +"} +(3,1,1) = {" +C +S +g +a +"} +(4,1,1) = {" +C +f +x +a +"} diff --git a/maps/tents/tent_ot.dmm b/maps/tents/tent_ot.dmm new file mode 100644 index 000000000000..c808886e7ee6 --- /dev/null +++ b/maps/tents/tent_ot.dmm @@ -0,0 +1,72 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/machinery/door/window/southleft{ + desc = "A window, that is also a door. A windoor if you will. This one is stronger."; + health = 500; + name = "Reinforced Glass door"; + req_one_access_txt = "2;35" + }, +/turf/template_noop, +/area/template_noop) +"e" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/bed/chair/office/dark, +/turf/template_noop, +/area/template_noop) +"m" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/surface/table, +/turf/template_noop, +/area/template_noop) +"C" = ( +/obj/structure/blocker/tent/full_tile, +/turf/template_noop, +/area/template_noop) +"I" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/tent_curtain, +/obj/structure/tent/cmd, +/turf/template_noop, +/area/template_noop) +"N" = ( +/obj/structure/blocker/tent{ + dir = 4 + }, +/obj/structure/tent_curtain, +/turf/template_noop, +/area/template_noop) +"Q" = ( +/obj/structure/blocker/tent{ + dir = 8 + }, +/obj/structure/blocker/tent{ + dir = 1 + }, +/obj/structure/closet/coffin/woodencrate, +/turf/template_noop, +/area/template_noop) + +(1,1,1) = {" +C +Q +a +I +"} +(2,1,1) = {" +C +e +m +N +"}