diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index aadd731d320..e83e88f0de3 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -155,6 +155,20 @@ ..() icon_state = pick("brute","brute2","brute3") +/obj/item/storage/firstaid/marooning_equipment + name = "marooning first aid kit" + desc = "A first aid kit for marooned personnel." + starts_with = list( + /obj/item/stack/medical/bruise_pack = 2, + /obj/item/stack/medical/ointment = 2, + /obj/item/device/healthanalyzer = 1, + /obj/item/reagent_containers/pill/bicaridine = 1, + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1, + /obj/item/reagent_containers/hypospray/autoinjector/dylovene = 1, + /obj/item/reagent_containers/hypospray/autoinjector/coagzolug = 1, + /obj/item/storage/pill_bottle/perconol = 1 + ) + /* * Pill Bottles */ diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 731738825e3..f3779e990d8 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -40,6 +40,15 @@ icon_state = "oxygen_br" item_state = "oxygen_br" +/obj/item/tank/oxygen/marooning_equipment + name = "marooning oxygen tank" + desc = "A tank of oxygen, this one is yellow. Issued to marooned personnel." + icon_state = "oxygen_f" + item_state = "oxygen_f" + +/obj/item/tank/oxygen/marooning_equipment/adjust_initial_gas() + air_contents.adjust_gas(GAS_OXYGEN, (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)) + /* * Anesthetic */ diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm index d9723e20832..7a1399238a6 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm @@ -87,3 +87,37 @@ togglelock(usr) else to_chat(usr, SPAN_WARNING("This mob type can't use this verb.")) + +// Marooning Equipment +/obj/structure/closet/secure_closet/marooning_equipment + name = "marooning equipment locker" + icon_state = "maroon" + req_one_access = list(access_security, access_heads) // Marooned personnel would likely be marooned by security and/or command. + +/obj/structure/closet/secure_closet/marooning_equipment/fill() + new /obj/item/clothing/mask/breath(src) + new /obj/item/clothing/under/color/yellow(src) + new /obj/item/clothing/shoes/workboots/grey(src) + new /obj/item/clothing/head/helmet/space/emergency/marooning_equipment(src) + new /obj/item/clothing/suit/space/emergency/marooning_equipment(src) + new /obj/item/tank/oxygen/marooning_equipment(src) + new /obj/item/storage/backpack/duffel/marooning_equipment(src) + +/obj/item/storage/backpack/duffel/marooning_equipment + name = "marooning equipment duffel bag" + desc = "A duffel bag full of marooning equipment." + starts_with = list( + /obj/item/crowbar/red = 1, + /obj/item/device/flashlight/heavy = 1, + /obj/item/device/gps/marooning_equipment = 1, + /obj/item/airbubble = 1, + + // Rations + /obj/item/storage/box/fancy/mre/menu5 = 1, + /obj/item/storage/box/fancy/mre/menu9 = 1, + /obj/item/reagent_containers/food/drinks/waterbottle = 4, + + // Medical Supplies + /obj/item/storage/firstaid/marooning_equipment = 1, + /obj/item/storage/firstaid/o2 = 1 + ) \ No newline at end of file diff --git a/code/modules/clothing/spacesuits/spacesuits.dm b/code/modules/clothing/spacesuits/spacesuits.dm index 9bac992e361..3d2add40040 100644 --- a/code/modules/clothing/spacesuits/spacesuits.dm +++ b/code/modules/clothing/spacesuits/spacesuits.dm @@ -97,6 +97,10 @@ flags_inv = HIDEMASK | HIDEEARS | BLOCKHAIR flash_protection = FLASH_PROTECTION_NONE +/obj/item/clothing/head/helmet/space/emergency/marooning_equipment + name = "marooning softsuit helmet" + desc = "A simple, cheap helmet with a built in light, designed for issuing to marooned personnel." + /obj/item/clothing/suit/space/emergency name = "emergency softsuit" desc = "A thin, ungainly softsuit colored in blaze orange for rescuers to easily locate. It looks pretty fragile." @@ -104,4 +108,8 @@ icon_state = "softsuit_emergency" item_state = "softsuit_emergency" contained_sprite = TRUE - slowdown = 2 \ No newline at end of file + slowdown = 2 + +/obj/item/clothing/suit/space/emergency/marooning_equipment + name = "marooning softsuit" + desc = "A thin, ungainly softsuit colored in blaze orange for rescuers to easily locate. Designed for issuing to marooned personnel and it looks pretty fragile." \ No newline at end of file diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm index 68bc0a27d70..50c50e15bbd 100644 --- a/code/modules/telesci/gps.dm +++ b/code/modules/telesci/gps.dm @@ -298,6 +298,12 @@ var/list/GPS_list = list() compass_color = "#6eaa2c" gpstag = "JAN0" +/obj/item/device/gps/marooning_equipment + icon_state = "gps-e" + gps_prefix = "MAROON" + compass_color = "#EAD152" + gpstag = "MAROON0" + // Static GPS /obj/item/device/gps/stationary name = "static GPS" diff --git a/html/changelogs/marooning_equipment.yml b/html/changelogs/marooning_equipment.yml new file mode 100644 index 00000000000..c00c2a3a986 --- /dev/null +++ b/html/changelogs/marooning_equipment.yml @@ -0,0 +1,6 @@ +author: SleepyGemmy + +delete-after: True + +changes: + - rscadd: "Adds marooning equipment lockers to issue to marooned personnel." \ No newline at end of file diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi index 3781fc16314..a050f0079bc 100644 Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index edcf2f793a0..bbf82a9d7d6 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -18760,16 +18760,22 @@ /turf/simulated/floor/carpet, /area/horizon/library) "jUq" = ( -/obj/machinery/status_display{ - layer = 4; - pixel_y = 32 - }, -/obj/structure/closet/secure_closet/brig, -/obj/effect/floor_decal/corner/blue{ - dir = 5 - }, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, +/obj/structure/closet/secure_closet/marooning_equipment, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/machinery/door/window/southleft{ + req_one_access = list(1,19); + name = "Marooning Equipment Access" + }, +/obj/structure/sign/securearea{ + pixel_x = 16; + pixel_y = 32; + name = "\improper MAROONING EQUIPMENT sign"; + desc = "A warning sign which reads 'MAROONING EQUIPMENT' and 'MISUSE OF EQUIPMENT MAKES YOU GUILTY OF i206 'NEGLECT OF DUTY''." + }, +/turf/simulated/floor/tiled/dark/full, /area/security/brig) "jUs" = ( /obj/machinery/atmospherics/unary/freezer{ @@ -21736,11 +21742,11 @@ /turf/simulated/floor/tiled/white, /area/rnd/research) "lFP" = ( -/obj/structure/bed/stool/chair, /obj/effect/floor_decal/corner/blue/full{ dir = 8 }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/secure_closet/brig, /turf/simulated/floor/tiled, /area/security/brig) "lFU" = ( @@ -22089,12 +22095,13 @@ /turf/simulated/floor/tiled/dark/full, /area/engineering/engine_room) "lMT" = ( -/obj/structure/closet/secure_closet/brig, -/obj/effect/floor_decal/corner/blue/full{ - dir = 1 - }, /obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, +/obj/structure/closet/secure_closet/marooning_equipment, +/obj/machinery/door/window/southright{ + req_one_access = list(1,19); + name = "Marooning Equipment Access" + }, +/turf/simulated/floor/tiled/dark/full, /area/security/brig) "lNb" = ( /obj/effect/floor_decal/corner/green{ @@ -32283,7 +32290,6 @@ /turf/simulated/floor/plating, /area/engineering/engine_room) "rec" = ( -/obj/structure/bed/stool/chair, /obj/effect/floor_decal/corner/blue{ dir = 5 }, @@ -32291,6 +32297,7 @@ c_tag = "Security - Corridor Camera 2" }, /obj/effect/floor_decal/industrial/outline/yellow, +/obj/structure/closet/secure_closet/brig, /turf/simulated/floor/tiled, /area/security/brig) "reo" = ( @@ -45953,6 +45960,10 @@ /obj/effect/floor_decal/corner/blue{ dir = 5 }, +/obj/machinery/status_display{ + layer = 4; + pixel_y = 32 + }, /turf/simulated/floor/tiled, /area/security/brig) "yct" = (