diff --git a/PentestModules/code/mob/worn.dm b/PentestModules/code/mob/worn.dm index 1b4b5a25c63a..efbd15372248 100644 --- a/PentestModules/code/mob/worn.dm +++ b/PentestModules/code/mob/worn.dm @@ -1 +1,61 @@ // Worn items for pentest + +/obj/item/clothing/neck/padded + name = "feathered serenity cloak" + desc = "A meticulously handcrafted cloak that is lined with subtle pockets filled with feathers and down. Its design matches common styles from the followers of Univitarium." + mob_overlay_icon = 'PentestModules/icons/mob/worn/neck.dmi' + icon = 'PentestModules/icons/obj/neck.dmi' + lefthand_file = 'PentestModules/icons/mob/worn/l_hand.dmi' + righthand_file = 'PentestModules/icons/mob/worn/r_hand.dmi' + icon_state = "paddedscarf" + item_state = "paddedscarf" + +/obj/item/clothing/under/padded + name = "feathered serenity suit" + desc = "A meticulously handcrafted suit that is lined on the inside with feathers and down." + icon = 'PentestModules/icons/obj/under.dmi' + mob_overlay_icon = 'PentestModules/icons/mob/worn/under.dmi' + lefthand_file = 'PentestModules/icons/mob/worn/l_hand.dmi' + righthand_file = 'PentestModules/icons/mob/worn/r_hand.dmi' + icon_state = "paddedunder" + item_state = "paddedunder" + +/obj/item/clothing/shoes/jackboots/padded + name = "serenity jackboots" + desc = "Thick boots that is lined with feathers and down. Good footwear almost anticipating harsh weather." + icon = 'PentestModules/icons/obj/feet.dmi' + mob_overlay_icon = 'PentestModules/icons/mob/worn/feet.dmi' + lefthand_file = 'PentestModules/icons/mob/worn/l_hand.dmi' + righthand_file = 'PentestModules/icons/mob/worn/r_hand.dmi' + icon_state = "paddedboots" + item_state = "paddedboots" + +/obj/item/clothing/gloves/padded + name = "serenity gloves" + desc = "A pair of gloves lined with soft to the touch fur." + icon = 'PentestModules/icons/obj/hands.dmi' + mob_overlay_icon = 'PentestModules/icons/mob/worn/hands.dmi' + lefthand_file = 'PentestModules/icons/mob/worn/l_hand.dmi' + righthand_file = 'PentestModules/icons/mob/worn/r_hand.dmi' + icon_state = "paddedgloves" + item_state = "paddedgloves" + +/obj/item/clothing/head/leafcrown + name = "wish tree leaf crown" + desc = "A delicately crafted crown made from leaves from a Wish Tree." + icon = 'PentestModules/icons/obj/leaf.dmi' + mob_overlay_icon = 'PentestModules/icons/mob/worn/leafcrown.dmi' + lefthand_file = 'PentestModules/icons/mob/worn/l_hand.dmi' + righthand_file = 'PentestModules/icons/mob/worn/r_hand.dmi' + icon_state = "leafcrown" + item_state = "leafcrown" + +//This is not a worn item but Im at the point where Im being lazy +/obj/item/leaf + name = "wish tree leaf" + desc = "A soft velvety leaf from the wish tree, prime and ready for Univitarian rituals." + icon = 'PentestModules/icons/obj/leaf.dmi' + lefthand_file = 'PentestModules/icons/mob/worn/l_hand.dmi' + righthand_file = 'PentestModules/icons/mob/worn/r_hand.dmi' + icon_state = "wishleaf" + item_state = "wishleaf" diff --git a/PentestModules/code/turf/turf.dm b/PentestModules/code/turf/turf.dm index 2c8dcef739c6..bef4aef25406 100644 --- a/PentestModules/code/turf/turf.dm +++ b/PentestModules/code/turf/turf.dm @@ -225,6 +225,13 @@ icon = 'PentestModules/icons/obj/wishtree.dmi' icon_state = "glowies" +/obj/structure/flora/wishleaf + name = "wishleaf pile" + gender = NEUTER + desc = "A sizeable pile of wishleaves." + icon = 'PentestModules/icons/obj/wishtree.dmi' + icon_state = "leafpile4" + /obj/effect/turf_decal/leafpile name = "Wish Tree leaf pile" desc = "A soft delicate pile of leaves from a Wish Tree." diff --git a/PentestModules/icons/mob/worn/feet.dmi b/PentestModules/icons/mob/worn/feet.dmi new file mode 100644 index 000000000000..74faa6858ba8 Binary files /dev/null and b/PentestModules/icons/mob/worn/feet.dmi differ diff --git a/PentestModules/icons/mob/worn/hands.dmi b/PentestModules/icons/mob/worn/hands.dmi new file mode 100644 index 000000000000..603d5ac426a4 Binary files /dev/null and b/PentestModules/icons/mob/worn/hands.dmi differ diff --git a/PentestModules/icons/mob/worn/l_hand.dmi b/PentestModules/icons/mob/worn/l_hand.dmi new file mode 100644 index 000000000000..d647ffdb6cb1 Binary files /dev/null and b/PentestModules/icons/mob/worn/l_hand.dmi differ diff --git a/PentestModules/icons/mob/worn/leaf_lhand.dmi b/PentestModules/icons/mob/worn/leaf_lhand.dmi deleted file mode 100644 index b5204dd2c4c4..000000000000 Binary files a/PentestModules/icons/mob/worn/leaf_lhand.dmi and /dev/null differ diff --git a/PentestModules/icons/mob/worn/leaf_rhand.dmi b/PentestModules/icons/mob/worn/leaf_rhand.dmi deleted file mode 100644 index e1de466d8585..000000000000 Binary files a/PentestModules/icons/mob/worn/leaf_rhand.dmi and /dev/null differ diff --git a/PentestModules/icons/mob/worn/neck.dmi b/PentestModules/icons/mob/worn/neck.dmi new file mode 100644 index 000000000000..40f4c2fabf3f Binary files /dev/null and b/PentestModules/icons/mob/worn/neck.dmi differ diff --git a/PentestModules/icons/mob/worn/r_hand.dmi b/PentestModules/icons/mob/worn/r_hand.dmi new file mode 100644 index 000000000000..f9cf240505bb Binary files /dev/null and b/PentestModules/icons/mob/worn/r_hand.dmi differ diff --git a/PentestModules/icons/mob/worn/under.dmi b/PentestModules/icons/mob/worn/under.dmi new file mode 100644 index 000000000000..103cc3e7990c Binary files /dev/null and b/PentestModules/icons/mob/worn/under.dmi differ diff --git a/PentestModules/icons/obj/feet.dmi b/PentestModules/icons/obj/feet.dmi new file mode 100644 index 000000000000..df2e47d10570 Binary files /dev/null and b/PentestModules/icons/obj/feet.dmi differ diff --git a/PentestModules/icons/obj/hands.dmi b/PentestModules/icons/obj/hands.dmi new file mode 100644 index 000000000000..c5c5379fb086 Binary files /dev/null and b/PentestModules/icons/obj/hands.dmi differ diff --git a/PentestModules/icons/obj/neck.dmi b/PentestModules/icons/obj/neck.dmi new file mode 100644 index 000000000000..931beae6da51 Binary files /dev/null and b/PentestModules/icons/obj/neck.dmi differ diff --git a/PentestModules/icons/obj/under.dmi b/PentestModules/icons/obj/under.dmi new file mode 100644 index 000000000000..af1dbdaae047 Binary files /dev/null and b/PentestModules/icons/obj/under.dmi differ diff --git a/PentestModules/icons/obj/wishtree.dmi b/PentestModules/icons/obj/wishtree.dmi index 18f0162e430a..abb33c1b23ab 100644 Binary files a/PentestModules/icons/obj/wishtree.dmi and b/PentestModules/icons/obj/wishtree.dmi differ diff --git a/_maps/shuttles/syndicate/syndicate_aegis.dmm b/_maps/shuttles/syndicate/syndicate_aegis.dmm index ba80866b2c12..02c7bfa9f7e5 100644 --- a/_maps/shuttles/syndicate/syndicate_aegis.dmm +++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm @@ -229,7 +229,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/effect/turf_decal/smoothsnow{ - dir = 10 + dir = 8 }, /turf/open/floor/wood/walnut, /area/ship/crew/dorm) @@ -279,6 +279,14 @@ pixel_x = -19; pixel_y = -11 }, +/obj/item/leaf, +/obj/item/leaf{ + pixel_y = 5 + }, +/obj/item/leaf{ + pixel_y = 1; + pixel_x = 6 + }, /turf/open/floor/wood/walnut, /area/ship/crew/dorm/dormtwo) "cc" = ( @@ -316,6 +324,7 @@ /obj/effect/turf_decal/snowgrass{ dir = 9 }, +/obj/effect/turf_decal/leafpile/alt1, /turf/open/floor/plating/ship/smoothsnow/alt1, /area/ship/crew/dorm) "cs" = ( @@ -956,10 +965,13 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/smoothsnow{ + dir = 8 + }, /obj/effect/turf_decal/snowgrass{ dir = 8 }, -/turf/open/floor/plating/ship/smoothsnow/alt2, +/turf/open/floor/wood/walnut, /area/ship/crew/dorm) "hl" = ( /obj/machinery/airalarm/directional/north, @@ -1710,6 +1722,11 @@ /area/ship/crew/dorm) "ne" = ( /obj/effect/turf_decal/gardenstone/alt, +/obj/item/leaf{ + pixel_y = 1; + pixel_x = 6 + }, +/obj/effect/turf_decal/leafpile/alt2, /turf/open/floor/plating/ship/snowgrasstall/alt, /area/ship/crew/dorm) "nf" = ( @@ -2006,6 +2023,10 @@ /obj/item/clothing/suit/armor/nanotrasen/captain/parade, /obj/item/clothing/head/crown/fancy, /obj/item/storage/belt/sabre, +/obj/item/clothing/gloves/padded, +/obj/item/clothing/neck/padded, +/obj/item/clothing/shoes/jackboots/padded, +/obj/item/clothing/under/padded, /turf/open/floor/wood/walnut, /area/ship/crew/dorm/dormtwo) "qa" = ( @@ -3023,7 +3044,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/effect/turf_decal/smoothsnow{ - dir = 9 + dir = 8 }, /turf/open/floor/wood/walnut, /area/ship/crew/dorm) @@ -3971,7 +3992,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/library) "HB" = ( -/turf/open/floor/plating/ship/snowgrasstall/alt1, +/turf/open/floor/plating/ship/snowgrassshort/alt, /area/ship/crew/dorm) "HP" = ( /obj/effect/turf_decal/corner_techfloor_grid/diagonal{ @@ -4049,6 +4070,7 @@ /obj/effect/turf_decal/snowgrass{ dir = 10 }, +/obj/effect/turf_decal/leafpile, /turf/open/floor/plating/ship/smoothsnow/alt1, /area/ship/crew/dorm) "Iy" = ( @@ -5159,6 +5181,7 @@ /turf/open/floor/wood/walnut, /area/ship/security/armory) "Ss" = ( +/obj/effect/turf_decal/leafpile/alt, /turf/open/floor/plating/ship/snowgrasstall, /area/ship/crew/dorm) "St" = ( @@ -5547,6 +5570,10 @@ }, /turf/open/floor/plating, /area/ship/engineering) +"VM" = ( +/obj/effect/turf_decal/leafpile/alt1, +/turf/open/floor/plating/ship/snowgrasstall/alt, +/area/ship/crew/dorm) "VT" = ( /obj/machinery/door/firedoor, /obj/structure/cable/yellow{ @@ -6134,6 +6161,8 @@ "ZC" = ( /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/gardenstone/alt, +/obj/effect/turf_decal/leafpile/alt, +/obj/item/clothing/head/leafcrown, /turf/open/floor/plating/ship/snowgrasstall/alt2, /area/ship/crew/dorm) "ZD" = ( @@ -6352,7 +6381,7 @@ Fv wp nd Fv -QU +VM tj ZC Fv