Merge pull request #1513 from Kabramen/Handrail

Handrail and Bathrobes
This commit is contained in:
Dahlular
2021-12-30 09:43:01 -08:00
committed by GitHub
9 changed files with 80 additions and 2 deletions
@@ -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
@@ -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), \
+47
View File
@@ -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)
. += "<span class='warning'>It looks severely damaged!</span>"
if(0.25 to 0.5)
. += "<span class='warning'>It looks damaged!</span>"
if(0.5 to 1.0)
. += "<span class='notice'>It has a few scrapes and dents.</span>"
/obj/structure/fence/handrail/take_damage(amount)
health -= amount
if(health <= 0)
visible_message("<span class='warning'>\The [src] breaks down!</span>")
playsound(src, 'sound/effects/grillehit.ogg', 50, 1)
new /obj/item/stack/rods(get_turf(src))
qdel(src)
#undef CUT_TIME
#undef CLIMB_TIME
+11 -1
View File
@@ -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
Binary file not shown.

Before

Width:  |  Height:  |  Size: 444 KiB

After

Width:  |  Height:  |  Size: 446 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 KiB

After

Width:  |  Height:  |  Size: 148 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

@@ -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
Binary file not shown.

Before

Width:  |  Height:  |  Size: 433 KiB

After

Width:  |  Height:  |  Size: 434 KiB