Skip to content

Commit

Permalink
I CRAVE die
Browse files Browse the repository at this point in the history
  • Loading branch information
Draggeru committed Jul 30, 2024
1 parent bb1691d commit 15592ba
Show file tree
Hide file tree
Showing 16 changed files with 101 additions and 5 deletions.
60 changes: 60 additions & 0 deletions PentestModules/code/mob/worn.dm
Original file line number Diff line number Diff line change
@@ -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"
7 changes: 7 additions & 0 deletions PentestModules/code/turf/turf.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
Binary file added PentestModules/icons/mob/worn/feet.dmi
Binary file not shown.
Binary file added PentestModules/icons/mob/worn/hands.dmi
Binary file not shown.
Binary file added PentestModules/icons/mob/worn/l_hand.dmi
Binary file not shown.
Binary file removed PentestModules/icons/mob/worn/leaf_lhand.dmi
Binary file not shown.
Binary file removed PentestModules/icons/mob/worn/leaf_rhand.dmi
Binary file not shown.
Binary file added PentestModules/icons/mob/worn/neck.dmi
Binary file not shown.
Binary file added PentestModules/icons/mob/worn/r_hand.dmi
Binary file not shown.
Binary file added PentestModules/icons/mob/worn/under.dmi
Binary file not shown.
Binary file added PentestModules/icons/obj/feet.dmi
Binary file not shown.
Binary file added PentestModules/icons/obj/hands.dmi
Binary file not shown.
Binary file added PentestModules/icons/obj/neck.dmi
Binary file not shown.
Binary file added PentestModules/icons/obj/under.dmi
Binary file not shown.
Binary file modified PentestModules/icons/obj/wishtree.dmi
Binary file not shown.
39 changes: 34 additions & 5 deletions _maps/shuttles/syndicate/syndicate_aegis.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -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{
Expand Down Expand Up @@ -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" = (
Expand Down Expand Up @@ -6352,7 +6381,7 @@ Fv
wp
nd
Fv
QU
VM
tj
ZC
Fv
Expand Down

0 comments on commit 15592ba

Please sign in to comment.