diff --git a/PentestModules/code/mob/worn.dm b/PentestModules/code/mob/worn.dm new file mode 100644 index 000000000000..efbd15372248 --- /dev/null +++ b/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" diff --git a/PentestModules/code/turf/turf.dm b/PentestModules/code/turf/turf.dm new file mode 100644 index 000000000000..2c8dcef739c6 --- /dev/null +++ b/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" 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/leafcrown.dmi b/PentestModules/icons/mob/worn/leafcrown.dmi new file mode 100644 index 000000000000..f144f460783f Binary files /dev/null and b/PentestModules/icons/mob/worn/leafcrown.dmi 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/leaf.dmi b/PentestModules/icons/obj/leaf.dmi new file mode 100644 index 000000000000..3debc3438790 Binary files /dev/null and b/PentestModules/icons/obj/leaf.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/turfs.dmi b/PentestModules/icons/obj/turfs.dmi new file mode 100644 index 000000000000..0c3f5bddf838 Binary files /dev/null and b/PentestModules/icons/obj/turfs.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 new file mode 100644 index 000000000000..abb33c1b23ab Binary files /dev/null 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 337aec04b313..02c7bfa9f7e5 100644 --- a/_maps/shuttles/syndicate/syndicate_aegis.dmm +++ b/_maps/shuttles/syndicate/syndicate_aegis.dmm @@ -227,8 +227,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/smoothsnow{ + dir = 8 }, /turf/open/floor/wood/walnut, /area/ship/crew/dorm) @@ -259,21 +260,13 @@ /turf/open/floor/engine/airless, /area/ship/external) "bQ" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/window/reinforced{ dir = 8 }, /obj/structure/window/reinforced{ dir = 1 }, -/turf/open/floor/grass/ship/jungle, +/turf/open/floor/plating/ship/snowgrassshort, /area/ship/external) "bT" = ( /obj/structure/table/wood, @@ -286,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" = ( @@ -320,16 +321,11 @@ /area/ship/external) "cr" = ( /obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/curtain/cloth{ - color = "#ADD8E6" +/obj/effect/turf_decal/snowgrass{ + dir = 9 }, -/turf/open/floor/wood/walnut, +/obj/effect/turf_decal/leafpile/alt1, +/turf/open/floor/plating/ship/smoothsnow/alt1, /area/ship/crew/dorm) "cs" = ( /obj/machinery/holopad/emergency/command, @@ -549,6 +545,12 @@ "ej" = ( /turf/open/floor/wood/walnut, /area/ship/crew/dorm/dormtwo) +"ek" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/plating/ship/snowgrassshort/alt1, +/area/ship/bridge) "es" = ( /obj/machinery/atmospherics/pipe/manifold/violet/visible{ dir = 1 @@ -771,7 +773,7 @@ /area/ship/security/armory) "go" = ( /obj/item/radio/intercom/directional/south, -/turf/open/floor/grass/fairy, +/turf/open/floor/plating/ship/snowgrasstall/alt2, /area/ship/crew/dorm) "gp" = ( /obj/machinery/atmospherics/pipe/simple/violet/visible{ @@ -963,6 +965,12 @@ }, /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/wood/walnut, /area/ship/crew/dorm) "hl" = ( @@ -1310,25 +1318,11 @@ /turf/open/floor/wood/walnut, /area/ship/crew/janitor) "kq" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4 }, -/turf/open/floor/grass/ship/jungle, +/turf/open/floor/plating/ship/snowgrasstall/alt1, /area/ship/hallway/central) "ku" = ( /obj/structure/cable/yellow{ @@ -1390,42 +1384,17 @@ /turf/open/floor/plating, /area/ship/bridge) "kJ" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/grass/ship/jungle, +/turf/open/floor/plating/ship/snowgrasstall, /area/ship/bridge) "kU" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/sparsegrass, /obj/machinery/light/small/directional/east, -/turf/open/floor/grass/ship/jungle, +/turf/open/floor/plating/ship/snowgrassshort/alt2, /area/ship/hallway/central) "kX" = ( /obj/effect/turf_decal/trimline/opaque/blue/line, @@ -1442,15 +1411,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plasteel/tech, /area/ship/hallway/central) -"ls" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/curtain/cloth{ - color = "#ADD8E6" - }, -/turf/open/floor/wood/walnut, -/area/ship/crew/dorm) "lw" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/machinery/airalarm/directional/north, @@ -1761,7 +1721,13 @@ /turf/open/floor/carpet/blue, /area/ship/crew/dorm) "ne" = ( -/turf/open/floor/plating/dirt, +/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" = ( /obj/machinery/atmospherics/pipe/layer_manifold, @@ -1792,18 +1758,10 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering) "nA" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/window/reinforced{ dir = 8 }, -/turf/open/floor/grass/ship/jungle, +/turf/open/floor/plating/ship/snowgrasstall/alt1, /area/ship/hallway/central) "nL" = ( /obj/structure/bookcase/random/fiction, @@ -1818,6 +1776,12 @@ }, /turf/open/floor/carpet/blue, /area/ship/bridge) +"nX" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plating/ship/snowgrasstall, +/area/ship/bridge) "nY" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/wall/mineral/plastitanium, @@ -2059,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" = ( @@ -2196,22 +2164,11 @@ /turf/open/floor/engine, /area/ship/engineering) "rk" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/window/reinforced, -/turf/open/floor/grass/ship/jungle, +/turf/open/floor/plating/ship/snowgrassshort/alt1, /area/ship/hallway/central) "rn" = ( /obj/structure/sign/painting/library{ @@ -2417,11 +2374,8 @@ /turf/open/floor/plasteel/mono/dark, /area/ship/medical) "tj" = ( -/obj/structure/flora/tree/chapel{ - name = "wishing tree"; - desc = "Followers of Univitarium seem intent on protecting this tree." - }, -/turf/open/floor/grass/fairy, +/obj/effect/turf_decal/glowies, +/turf/open/floor/plating/ship/snowgrasstall/alt2, /area/ship/crew/dorm) "tk" = ( /obj/machinery/atmospherics/pipe/simple/violet/visible{ @@ -3087,10 +3041,11 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/smoothsnow{ + dir = 8 + }, /turf/open/floor/wood/walnut, /area/ship/crew/dorm) "yZ" = ( @@ -3595,6 +3550,15 @@ }, /turf/open/floor/plasteel/tech, /area/ship/engineering) +"Dm" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plating/ship/snowgrasstall, +/area/ship/external) "Dn" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 1 @@ -3692,6 +3656,12 @@ /obj/item/storage/box/drinkingglasses, /turf/open/floor/plasteel/mono/dark, /area/ship/crew/canteen) +"Eb" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/turf/open/floor/plating/ship/snowgrassshort, +/area/ship/bridge) "Ee" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /obj/effect/turf_decal/corner_techfloor_grid/diagonal, @@ -4022,8 +3992,7 @@ /turf/open/floor/wood/walnut, /area/ship/crew/library) "HB" = ( -/obj/structure/flora/ausbushes/leafybush, -/turf/open/floor/plating/dirt, +/turf/open/floor/plating/ship/snowgrassshort/alt, /area/ship/crew/dorm) "HP" = ( /obj/effect/turf_decal/corner_techfloor_grid/diagonal{ @@ -4037,21 +4006,13 @@ /turf/open/floor/plasteel/tech, /area/ship/cargo) "HV" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/window/reinforced{ dir = 4 }, /obj/structure/window/reinforced{ dir = 1 }, -/turf/open/floor/grass/ship/jungle, +/turf/open/floor/plating/ship/snowgrassshort/alt, /area/ship/external) "Ik" = ( /obj/effect/turf_decal/siding/wood{ @@ -4106,16 +4067,11 @@ /turf/open/floor/engine, /area/ship/engineering) "Iw" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/structure/curtain/cloth{ - color = "#ADD8E6" +/obj/effect/turf_decal/snowgrass{ + dir = 10 }, -/turf/open/floor/wood/walnut, +/obj/effect/turf_decal/leafpile, +/turf/open/floor/plating/ship/smoothsnow/alt1, /area/ship/crew/dorm) "Iy" = ( /obj/effect/turf_decal/siding/wood/corner, @@ -4297,21 +4253,10 @@ /turf/open/floor/engine/airless, /area/ship/external) "Ku" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/grass/ship/jungle, +/turf/open/floor/plating/ship/snowgrassshort/alt, /area/ship/hallway/central) "Kv" = ( /obj/machinery/atmospherics/components/binary/pump{ @@ -4474,25 +4419,11 @@ /turf/closed/wall/mineral/plastitanium, /area/ship/crew/canteen) "Lz" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/window/reinforced{ dir = 8 }, /obj/structure/window/reinforced, -/turf/open/floor/grass/ship/jungle, +/turf/open/floor/plating/ship/snowgrassshort/alt2, /area/ship/hallway/central) "LC" = ( /obj/effect/turf_decal/trimline/opaque/blue/line{ @@ -4837,8 +4768,11 @@ /turf/open/floor/plasteel/tech, /area/ship/engineering) "OM" = ( -/obj/structure/flora/ausbushes/leafybush, -/turf/open/floor/grass/fairy, +/obj/effect/turf_decal/gardenstone/alt, +/obj/structure/flora/tree/wish/shadow{ + pixel_x = 0 + }, +/turf/open/floor/plating/ship/snowgrasstall/alt2, /area/ship/crew/dorm) "OV" = ( /obj/effect/turf_decal/siding/wood{ @@ -4887,24 +4821,10 @@ /turf/open/floor/engine, /area/ship/engineering) "Pf" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/flora/ausbushes/fernybush, -/obj/structure/flora/ausbushes/sparsegrass, /obj/structure/window/reinforced{ dir = 4 }, -/turf/open/floor/grass/ship/jungle, +/turf/open/floor/plating/ship/snowgrassshort/alt, /area/ship/bridge) "Pi" = ( /obj/machinery/light_switch{ @@ -5102,6 +5022,9 @@ }, /turf/open/floor/carpet/blue, /area/ship/crew/canteen) +"QU" = ( +/turf/open/floor/plating/ship/snowgrasstall/alt, +/area/ship/crew/dorm) "QV" = ( /obj/effect/turf_decal/industrial/warning{ dir = 1 @@ -5166,6 +5089,15 @@ /obj/machinery/computer/cryopod/directional/north, /turf/open/floor/carpet/blue, /area/ship/crew/dorm) +"Rx" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/open/floor/plating/ship/snowgrasstall/alt1, +/area/ship/external) "RF" = ( /obj/machinery/atmospherics/pipe/simple/dark/visible/layer4{ dir = 10 @@ -5182,6 +5114,12 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/plasteel/dark, /area/ship/crew/janitor) +"RP" = ( +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/plating/ship/snowgrassshort, +/area/ship/bridge) "RS" = ( /obj/machinery/atmospherics/pipe/simple/yellow/hidden, /obj/effect/turf_decal/techfloor/hole/right, @@ -5192,7 +5130,7 @@ /area/ship/engineering) "Sa" = ( /obj/machinery/airalarm/directional/north, -/turf/open/floor/plating/dirt, +/turf/open/floor/plating/ship/snowgrasstall/alt, /area/ship/crew/dorm) "Sf" = ( /obj/item/radio/intercom/directional/south, @@ -5243,7 +5181,8 @@ /turf/open/floor/wood/walnut, /area/ship/security/armory) "Ss" = ( -/turf/open/floor/grass/fairy, +/obj/effect/turf_decal/leafpile/alt, +/turf/open/floor/plating/ship/snowgrasstall, /area/ship/crew/dorm) "St" = ( /obj/machinery/hydroponics/constructable, @@ -5631,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{ @@ -5718,18 +5661,10 @@ /turf/open/floor/plasteel/dark, /area/ship/crew/library) "Ws" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/ppflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, -/obj/structure/flora/ausbushes/brflowers, /obj/structure/window/reinforced{ dir = 8 }, -/obj/structure/flora/ausbushes/fullgrass, -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/grass/ship/jungle, +/turf/open/floor/plating/ship/snowgrassshort, /area/ship/hallway/central) "Wu" = ( /obj/machinery/door/poddoor{ @@ -6225,8 +6160,10 @@ /area/ship/engineering) "ZC" = ( /obj/machinery/light/small/directional/south, -/obj/structure/flora/ausbushes/leafybush, -/turf/open/floor/grass/fairy, +/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" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -6444,7 +6381,7 @@ Fv wp nd Fv -ne +VM tj ZC Fv @@ -6483,7 +6420,7 @@ nY fL Km Fv -HB +QU ne go Fv @@ -6523,7 +6460,7 @@ oM Sg Fv Iw -ls +HB cr Fv FB @@ -6680,7 +6617,7 @@ Bp DC DC Bp -bQ +Rx EG ro oG @@ -6834,8 +6771,8 @@ mG mI Vq Vq -Pf -Pf +Eb +nX Pf Vq Vq @@ -7069,8 +7006,8 @@ mI Vq Vq kJ -kJ -kJ +RP +ek Vq Vq UH @@ -7226,7 +7163,7 @@ Bp DC DC Bp -HV +Dm ck WR sU diff --git a/shiptest.dme b/shiptest.dme index 0f00c3516f9e..1745e6964b0e 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1706,8 +1706,8 @@ #include "code\modules\antagonists\ert\inteq.dm" #include "code\modules\antagonists\ert\minutemen.dm" #include "code\modules\antagonists\ert\nanotrasen.dm" -#include "code\modules\antagonists\ert\terragov.dm" #include "code\modules\antagonists\ert\syndicate.dm" +#include "code\modules\antagonists\ert\terragov.dm" #include "code\modules\antagonists\gang\outfits.dm" #include "code\modules\antagonists\greentext\greentext.dm" #include "code\modules\antagonists\magic_servant\servant.dm" @@ -2006,8 +2006,8 @@ #include "code\modules\clothing\outfits\ert\inteq_ert.dm" #include "code\modules\clothing\outfits\ert\minutemen_ert.dm" #include "code\modules\clothing\outfits\ert\nanotrasen_ert.dm" -#include "code\modules\clothing\outfits\ert\terragov_ert.dm" #include "code\modules\clothing\outfits\ert\syndicate_ert.dm" +#include "code\modules\clothing\outfits\ert\terragov_ert.dm" #include "code\modules\clothing\outfits\factions\frontiersmen.dm" #include "code\modules\clothing\outfits\factions\gezena.dm" #include "code\modules\clothing\outfits\factions\independent.dm" @@ -2015,8 +2015,8 @@ #include "code\modules\clothing\outfits\factions\minutemen.dm" #include "code\modules\clothing\outfits\factions\nanotrasen.dm" #include "code\modules\clothing\outfits\factions\roumain.dm" -#include "code\modules\clothing\outfits\factions\terragov.dm" #include "code\modules\clothing\outfits\factions\syndicate.dm" +#include "code\modules\clothing\outfits\factions\terragov.dm" #include "code\modules\clothing\shoes\_shoes.dm" #include "code\modules\clothing\shoes\bananashoes.dm" #include "code\modules\clothing\shoes\colour.dm" @@ -2050,9 +2050,9 @@ #include "code\modules\clothing\under\pants.dm" #include "code\modules\clothing\under\shorts.dm" #include "code\modules\clothing\under\skirt_dress.dm" -#include "code\modules\clothing\under\terragov.dm" #include "code\modules\clothing\under\suits.dm" #include "code\modules\clothing\under\syndicate.dm" +#include "code\modules\clothing\under\terragov.dm" #include "code\modules\clothing\under\jobs\cargo.dm" #include "code\modules\clothing\under\jobs\centcom.dm" #include "code\modules\clothing\under\jobs\command.dm" @@ -2333,8 +2333,8 @@ #include "code\modules\jobs\job_types\scientist.dm" #include "code\modules\jobs\job_types\security_officer.dm" #include "code\modules\jobs\job_types\shaft_miner.dm" -#include "code\modules\jobs\job_types\terragov_rep.dm" #include "code\modules\jobs\job_types\station_engineer.dm" +#include "code\modules\jobs\job_types\terragov_rep.dm" #include "code\modules\jobs\job_types\virologist.dm" #include "code\modules\jobs\job_types\warden.dm" #include "code\modules\keybindings\bindings_atom.dm" @@ -3493,4 +3493,6 @@ #include "interface\skin.dmf" #include "PentestModules\code\maps\ruins.dm" #include "PentestModules\code\mob\hair.dm" +#include "PentestModules\code\mob\worn.dm" +#include "PentestModules\code\turf\turf.dm" // END_INCLUDE