diff --git a/_maps/map_files/LayeniaStation/LayeniaStation.dmm b/_maps/map_files/LayeniaStation/LayeniaStation.dmm index 6d9321690..d7cdca271 100644 --- a/_maps/map_files/LayeniaStation/LayeniaStation.dmm +++ b/_maps/map_files/LayeniaStation/LayeniaStation.dmm @@ -64899,6 +64899,21 @@ }, /turf/open/floor/plasteel/dark, /area/ai_monitored/turret_protected/aisat/hallway) +"pJd" = ( +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "drain"; + name = "drain" + }, +/obj/structure/closet, +/obj/item/clothing/suit/bathrobe, +/obj/item/clothing/suit/bathrobe, +/obj/item/clothing/suit/bathrobe, +/obj/item/clothing/suit/bathrobe, +/obj/item/clothing/suit/bathrobe, +/obj/item/clothing/suit/bathrobe, +/turf/open/floor/plasteel/freezer, +/area/crew_quarters/fitness) "pJl" = ( /obj/structure/disposalpipe/trunk{ dir = 4 @@ -113312,7 +113327,7 @@ rvO jyQ izt eiv -izt +pJd nrE oco iCr diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index ea2066982..553c9d720 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -333,6 +333,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list ( \ new/datum/stack_recipe("black shoes", /obj/item/clothing/shoes/sneakers/black, 2), \ new/datum/stack_recipe("cloth footwraps", /obj/item/clothing/shoes/footwraps, 2), \ new/datum/stack_recipe("tunic", /obj/item/clothing/under/tunic, 3), \ + new/datum/stack_recipe("bathrobe", /obj/item/clothing/suit/bathrobe, 3), \ null, \ new/datum/stack_recipe("backpack", /obj/item/storage/backpack, 4), \ new/datum/stack_recipe("duffel bag", /obj/item/storage/backpack/duffelbag, 6), \ diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm index 35891fa60..7b05762bf 100644 --- a/code/game/objects/structures/fence.dm +++ b/code/game/objects/structures/fence.dm @@ -150,6 +150,53 @@ /obj/structure/fence/door/proc/can_open(mob/user) return TRUE +//HANDRAIL - Ported from Dymouth Gulch + +/obj/structure/fence/handrail + name = "handrail" + desc = "A waist high handrail, perhaps you could climb over it." + icon_state = "handrail" + cuttable = FALSE + climbable = TRUE + max_integrity = 100 + var/health = 70 + var/maxhealth = 70 + resistance_flags = ACID_PROOF + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100) + CanAtmosPass = ATMOS_PASS_PROC + var/breaksound = "shatter" + var/hitsound = 'sound/effects/Glasshit.ogg' + icon_state = "handrail" + +/obj/structure/fence/handrail/handrail_end + icon_state = "handrail_end" + cuttable = FALSE + climbable = TRUE + +/obj/structure/fence/handrail/handrail_corner + icon_state = "handrail_corner" + cuttable = FALSE + climbable = TRUE + +/obj/structure/fence/handrail/examine(mob/user) + . = ..() + if(health < maxhealth) + switch(health / maxhealth) + if(0.0 to 0.5) + . += "It looks severely damaged!" + if(0.25 to 0.5) + . += "It looks damaged!" + if(0.5 to 1.0) + . += "It has a few scrapes and dents." + +/obj/structure/fence/handrail/take_damage(amount) + health -= amount + if(health <= 0) + visible_message("\The [src] breaks down!") + playsound(src, 'sound/effects/grillehit.ogg', 50, 1) + new /obj/item/stack/rods(get_turf(src)) + qdel(src) + #undef CUT_TIME #undef CLIMB_TIME diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 9d65344f4..6e002119b 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -29,7 +29,7 @@ resistance_flags = NONE /* - * Posshim's Corpus atire + * Posshim's Corpus atire */ /obj/item/clothing/suit/hooded/corpus/ name = "Standard Voidsuit" @@ -1047,3 +1047,13 @@ icon_state = "labcoat_formal" item_state = "labcoat_formal" body_parts_covered = CHEST|ARMS + +//bathrobes ported from Citadel + +/obj/item/clothing/suit/bathrobe + name = "bathrobe" + desc = "A blue bathrobe." + icon_state = "bathrobe" + item_state = "bathrobe" + body_parts_covered = CHEST|GROIN|ARMS + diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index fb5a3b8b2..8fe60a952 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 95d36176f..7323163d2 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/fence.dmi b/icons/obj/fence.dmi index 31b1abef3..d63617d6e 100644 Binary files a/icons/obj/fence.dmi and b/icons/obj/fence.dmi differ diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index a7d28e4e9..7797e1f7b 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -254,3 +254,8 @@ name = "Winter labcoat" category = SLOT_WEAR_SUIT path = /obj/item/clothing/suit/toggle/labcoat/formallab + +/datum/gear/uniform/bathrobe + name = "Bathrobe" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/bathrobe diff --git a/modular_citadel/icons/mob/suit_digi.dmi b/modular_citadel/icons/mob/suit_digi.dmi index d07189001..8a14afa11 100644 Binary files a/modular_citadel/icons/mob/suit_digi.dmi and b/modular_citadel/icons/mob/suit_digi.dmi differ