Merge pull request #22 from Draggeru/woooagh

Adds a Wishing Tree, some snow turfs, and a uniform set for the Aegis + updates the Aegis with the new turfs

PentestModules/code/mob/worn.dm

@@ -0,0 +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"

PentestModules/code/turf/turf.dm

@@ -0,0 +1,241 @@
+/turf/open/floor/plating/ship/snowgrasstall
+	name = "frosted grass"
+	desc = "delicately frosted grass, it sparkles in the light."
+	icon = 'PentestModules/icons/obj/turfs.dmi'
+	icon_state = "snowgrass_tall1"
+	footstep = FOOTSTEP_GRASS
+	barefootstep = FOOTSTEP_GRASS
+	clawfootstep = FOOTSTEP_GRASS
+	heavyfootstep = FOOTSTEP_GRASS
+
+/turf/open/floor/plating/ship/snowgrasstall/alt
+	icon_state = "snowgrass_tall2"
+
+/turf/open/floor/plating/ship/snowgrasstall/alt1
+	icon_state = "snowgrass_tall3"
+
+/turf/open/floor/plating/ship/snowgrasstall/alt2
+	icon_state = "snowgrass_tall4"
+
+/turf/open/floor/plating/ship/snowgrassshort
+	name = "frosted grass"
+	desc = "delicately frosted grass, it sparkles in the light."
+	icon = 'PentestModules/icons/obj/turfs.dmi'
+	icon_state = "snowgrass_short1"
+	footstep = FOOTSTEP_GRASS
+	barefootstep = FOOTSTEP_GRASS
+	clawfootstep = FOOTSTEP_GRASS
+	heavyfootstep = FOOTSTEP_GRASS
+
+/turf/open/floor/plating/ship/snowgrassshort/alt
+	icon_state = "snowgrass_short2"
+
+/turf/open/floor/plating/ship/snowgrassshort/alt1
+	icon_state = "snowgrass_short3"
+
+/turf/open/floor/plating/ship/snowgrassshort/alt2
+	icon_state = "snowgrass_short4"
+
+/obj/effect/turf_decal/snowgrass
+	name = "frosted grass"
+	desc = "delicately frosted grass, it sparkles in the light."
+	icon = 'PentestModules/icons/obj/turfs.dmi'
+	icon_state = "snowgrass_corner"
+
+/obj/effect/turf_decal/snowgrass/end
+	icon_state = "snowgrass_surround"
+
+/turf/open/floor/plating/ship/smoothsnow
+	name = "smooth snow"
+	desc = "light fluffy snow."
+	icon = 'PentestModules/icons/obj/turfs.dmi'
+	icon_state = "smoothsnow1"
+	footstep = FOOTSTEP_SNOW
+	barefootstep = FOOTSTEP_SNOW
+	clawfootstep = FOOTSTEP_SNOW
+	heavyfootstep = FOOTSTEP_SNOW
+
+/turf/open/floor/plating/ship/smoothsnow/alt
+	icon_state = "smoothsnow2"
+
+/turf/open/floor/plating/ship/smoothsnow/alt1
+	icon_state = "smoothsnow3"
+
+/turf/open/floor/plating/ship/smoothsnow/alt2
+	icon_state = "smoothsnow4"
+
+/turf/open/floor/plating/ship/disturbedsnow
+	name = "smooth snow"
+	desc = "light fluffy snow."
+	icon = 'PentestModules/icons/obj/turfs.dmi'
+	icon_state = "smoothsnow_disturbed1"
+	footstep = FOOTSTEP_SNOW
+	barefootstep = FOOTSTEP_SNOW
+	clawfootstep = FOOTSTEP_SNOW
+	heavyfootstep = FOOTSTEP_SNOW
+
+/turf/open/floor/plating/ship/disturbedsnow/alt
+	icon_state = "smoothsnow_disturbed2"
+
+/turf/open/floor/plating/ship/disturbedsnow/alt1
+	icon_state = "smoothsnow_disturbed3"
+
+/turf/open/floor/plating/ship/disturbedsnow/alt2
+	icon_state = "smoothsnow_disturbed4"
+
+/obj/effect/turf_decal/smoothsnow
+	icon = 'PentestModules/icons/obj/turfs.dmi'
+	icon_state = "snow_corner"
+	name = "smooth snow"
+	desc = "light fluffy snow."
+
+/obj/effect/turf_decal/smoothsnow/end
+	icon_state = "snow_surround"
+
+/obj/effect/turf_decal/gardenstone
+	icon = 'PentestModules/icons/obj/turfs.dmi'
+	icon_state = "gardenstone"
+	name = "round stone"
+	desc = "A smooth round stone."
+
+/obj/effect/turf_decal/gardenstone/alt
+	icon_state = "gardenstone_grass"
+
+/turf/open/floor/plating/ship/hotspring
+	icon = 'PentestModules/icons/obj/turfs.dmi'
+	name = "Hotspring"
+	desc = "Equal parts tempting and soothing."
+	icon_state = "hotspring"
+	footstep = FOOTSTEP_WATER
+	barefootstep = FOOTSTEP_WATER
+	clawfootstep = FOOTSTEP_WATER
+	heavyfootstep = FOOTSTEP_WATER
+
+/turf/open/floor/plating/ship/hotspring/alt
+	icon_state = "hotspring_surround"
+
+/turf/open/floor/plating/ship/hotspring/border
+	name = "Hotspring"
+	desc = "Equal parts tempting and soothing."
+	icon_state = "hotspring_border.1"
+	footstep = FOOTSTEP_WATER
+	barefootstep = FOOTSTEP_WATER
+	clawfootstep = FOOTSTEP_WATER
+	heavyfootstep = FOOTSTEP_WATER
+
+/turf/open/floor/plating/ship/hotspring/border/alt
+	icon_state = "hotspring_border.2"
+
+/turf/open/floor/plating/ship/hotspring/border/alt1
+	icon_state = "hotspring_border.3"
+
+/turf/open/floor/plating/ship/hotspring/border/alt2
+	icon_state = "hotspring_border.4"
+
+/turf/open/floor/plating/ship/hotspring/border/alt3
+	icon_state = "hotspring_border.5"
+
+/turf/open/floor/plating/ship/hotspring/border/alt4
+	icon_state = "hotspring_border.6"
+
+/turf/open/floor/plating/ship/hotspring/border/alt5
+	icon_state = "hotspring_border.7"
+
+/turf/open/floor/plating/ship/plating/ship/hotspring/border/alt6
+	icon_state = "hotspring_border.8"
+
+/turf/open/floor/plating/ship/hotspring/border/alt7
+	icon_state = "hotspring_border.9"
+
+/turf/open/floor/plating/ship/hotspring/border/alt8
+	icon_state = "hotspring_border.10"
+
+/turf/open/floor/plating/ship/hotspring/border/alt9
+	icon_state = "hotspring_border.11"
+
+/turf/open/floor/plating/ship/hotspring/border/alt10
+	icon_state = "hotspring_border.12"
+
+/turf/open/floor/plating/ship/hotspring/border/alt11
+	icon_state = "hotspring_border.13"
+
+/turf/open/floor/plating/ship/hotspring/border/alt12
+	icon_state = "hotspring_border.14"
+
+/turf/open/floor/plating/ship/hotspring/snowborder
+	icon_state = "hotspring_snowborder.1"
+	name = "Hotspring"
+	desc = "Equal parts tempting and soothing."
+	footstep = FOOTSTEP_WATER
+	barefootstep = FOOTSTEP_WATER
+	clawfootstep = FOOTSTEP_WATER
+	heavyfootstep = FOOTSTEP_WATER
+
+/turf/open/floor/plating/ship/hotspring/snowborder/alt
+	icon_state = "hotspring_snowborder.2"
+
+/turf/open/floor/plating/ship/hotspring/snowborder/alt1
+	icon_state = "hotspring_snowborder.3"
+
+/turf/open/floor/plating/ship/hotspring/snowborder/alt2
+	icon_state = "hotspring_snowborder.4"
+
+/turf/open/floor/plating/ship/hotspring/snowborder/alt3
+	icon_state = "hotspring_snowborder.5"
+
+/turf/open/floor/plating/ship/hotspring/snowborder/alt4
+	icon_state = "hotspring_snowborder.6"
+
+/turf/open/floor/plating/ship/hotspring/snowborder/alt5
+	icon_state = "hotspring_snowborder.7"
+
+/turf/open/floor/plating/ship/hotspring/snowborder/alt6
+	icon_state = "hotspring_snowborder.8"
+
+/turf/open/floor/plating/ship/hotspring/snowborder/alt7
+	icon_state = "hotspring_snowborder.9"
+
+/turf/open/floor/plating/ship/hotspring/snowborder/alt8
+	icon_state = "hotspring_snowborder.10"
+
+/turf/open/floor/plating/ship/hotspring/snowborder/alt9
+	icon_state = "hotspring_snowborder.11"
+
+/turf/open/floor/plating/ship/hotspring/snowborder/alt10
+	icon_state = "hotspring_snowborder.12"
+
+/turf/open/floor/plating/ship/hotspring/snowborder/alt11
+	icon_state = "hotspring_snowborder.13"
+
+/turf/open/floor/plating/ship/hotspring/snowborder/alt12
+	icon_state = "hotspring_snowborder.14"
+
+/obj/structure/flora/tree/wish
+	icon = 'PentestModules/icons/obj/wishtree.dmi'
+	name = "Wishing Tree"
+	desc = "A strikingly elegant tree with a mysterious aura. Those of the Univitarium faith protect this tree with their life."
+	icon_state = "noshadow"
+
+/obj/structure/flora/tree/wish/shadow
+	icon_state = "tree"
+
+/obj/effect/turf_decal/glowies
+	name = "Subtle Sparkles"
+	desc = "A soothing energy emenates from these sparkles."
+	icon = 'PentestModules/icons/obj/wishtree.dmi'
+	icon_state = "glowies"
+
+/obj/effect/turf_decal/leafpile
+	name = "Wish Tree leaf pile"
+	desc = "A soft delicate pile of leaves from a Wish Tree."
+	icon = 'PentestModules/icons/obj/wishtree.dmi'
+	icon_state = "leafpile1"
+
+/obj/effect/turf_decal/leafpile/alt
+	icon_state = "leafpile2"
+
+/obj/effect/turf_decal/leafpile/alt1
+	icon_state = "leafpile3"
+
+/obj/effect/turf_decal/leafpile/alt2
+	icon_state = "leafpile4"