From 5b1eafe9d0735bc592b7ca61bd16542c1b9db9c4 Mon Sep 17 00:00:00 2001 From: evilew Date: Sun, 4 Aug 2024 17:23:45 +0200 Subject: [PATCH] added hoodies from chomp - added hoodies from chomp, added them to loadouts and clothing vendors too --- .../lavaland_surface_syndicate_base1.dmm | 52 ++++++++++-------- _maps/RandomRuins/SpaceRuins/feeders_den.dmm | 2 +- code/modules/vending/clothesmate.dm | 6 ++ .../code/modules/client/loadout/suit.dm | 30 ++++++++++ .../code/modules/client/loadout/uniform.dm | 2 +- tgstation.dme | 2 + v_CHOMPstation2/code/clothing/head.dm | 33 +++++++++++ v_CHOMPstation2/code/clothing/suits.dm | 39 +++++++++++++ .../icons/mob/hat/item_vr.dmi | Bin .../icons/mob/hat/mob_vr.dmi | Bin .../icons/mob/item_vr.dmi | Bin .../icons/mob/mob_vr.dmi | Bin .../icons/mob/synxmanyvoices.dmi | Bin .../icons/mob/wolfpelt_ch.dmi | Bin 14 files changed, 141 insertions(+), 25 deletions(-) create mode 100644 v_CHOMPstation2/code/clothing/head.dm create mode 100644 v_CHOMPstation2/code/clothing/suits.dm rename {CHOMPstation2 => v_CHOMPstation2}/icons/mob/hat/item_vr.dmi (100%) rename {CHOMPstation2 => v_CHOMPstation2}/icons/mob/hat/mob_vr.dmi (100%) rename {CHOMPstation2 => v_CHOMPstation2}/icons/mob/item_vr.dmi (100%) rename {CHOMPstation2 => v_CHOMPstation2}/icons/mob/mob_vr.dmi (100%) rename {CHOMPstation2 => v_CHOMPstation2}/icons/mob/synxmanyvoices.dmi (100%) rename {CHOMPstation2 => v_CHOMPstation2}/icons/mob/wolfpelt_ch.dmi (100%) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index aac79ac5..4b93b8cc 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -123,7 +123,7 @@ "cN" = (/obj/machinery/airalarm/syndicate{dir = 1; pixel_y = -24},/obj/effect/turf_decal/tile/purple{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 5},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/testlab) "cO" = (/obj/effect/turf_decal/stripes/line{dir = 10},/obj/structure/lattice/catwalk,/turf/open/lava/smooth/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/arrivals) "cP" = (/obj/effect/turf_decal/stripes/line,/obj/structure/lattice/catwalk,/turf/open/lava/smooth/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/arrivals) -"cQ" = (/obj/effect/turf_decal/box/white/corners{dir = 8},/obj/structure/closet/crate,/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{dir = 1},/obj/item/bluespace_thread{pixel_x = -7; pixel_y = 7},/obj/item/bluespace_thread{pixel_x = -5; pixel_y = 5},/obj/item/bluespace_thread{pixel_x = -3; pixel_y = 3},/obj/item/bluespace_thread{pixel_x = -1; pixel_y = 1},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/cargo) +"cQ" = (/obj/effect/turf_decal/box/white/corners{dir = 8},/obj/structure/closet/crate,/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{dir = 1},/obj/item/gun/ballistic/automatic/pistol,/obj/item/gun/ballistic/automatic/pistol,/obj/item/ammo_box/c10mm/soporific,/obj/item/ammo_box/c10mm/soporific,/obj/item/ammo_box/magazine/sniper_rounds/soporific,/obj/item/ammo_box/magazine/sniper_rounds/soporific,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/cargo) "cR" = (/obj/structure/table/reinforced,/obj/item/integrated_circuit_printer/upgraded,/turf/open/floor/plasteel/white/side{dir = 10},/area/ruin/unpowered/syndicate_lava_base/circuits) "cT" = (/turf/open/floor/circuit/telecomms,/area/ruin/unpowered/syndicate_lava_base/testlab) "cU" = (/obj/structure/chair/office/light{dir = 8},/obj/machinery/button/door{id = "lavalandsyndi_circuits"; name = "Circuitry Blast Door Control"; pixel_x = -26; pixel_y = -26; req_access_txt = "150"},/turf/open/floor/plasteel/white/corner{dir = 8},/area/ruin/unpowered/syndicate_lava_base/circuits) @@ -169,7 +169,7 @@ "dO" = (/obj/structure/rack{dir = 8},/obj/item/stack/sheet/cardboard{amount = 3},/obj/item/stack/rods/twentyfive,/obj/item/stock_parts/cell/high/plus,/turf/open/floor/mineral/plastitanium,/area/ruin/unpowered/syndicate_lava_base/cargo) "dP" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/main) "dQ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/testlab) -"dR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/testlab) +"dR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central6"},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/testlab) "dS" = (/obj/effect/mapping_helpers/no_lava,/obj/effect/turf_decal/stripes/line{dir = 4},/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors) "dT" = (/obj/structure/sign/warning/securearea,/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/cargo) "dU" = (/obj/machinery/light/small{dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 1},/obj/structure/cable/yellow{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel/white/side{dir = 8},/area/ruin/unpowered/syndicate_lava_base/chemistry) @@ -476,7 +476,7 @@ "lk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/wood,/area/ruin/unpowered/syndicate_lava_base/bar) "ln" = (/turf/open/floor/plasteel/white/corner{dir = 1},/area/ruin/unpowered/syndicate_lava_base/medbay) "lq" = (/obj/machinery/airalarm/syndicate{dir = 4; pixel_x = -24},/obj/machinery/light/small{dir = 8},/obj/structure/table,/obj/item/stack/sheet/metal/fifty{pixel_x = -1; pixel_y = 1},/obj/item/stack/sheet/mineral/plastitanium{amount = 30},/obj/item/stack/sheet/glass/fifty{pixel_x = 1; pixel_y = -1},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) -"lr" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) +"lr" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{dir = 4},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals1"},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) "ls" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer3{dir = 9},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) "lu" = (/obj/machinery/atmospherics/pipe/simple/supplymain/visible,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) "lv" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{dir = 2},/obj/structure/cable/yellow{icon_state = "1-4"},/obj/structure/cable/yellow{icon_state = "4-8"},/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/main) @@ -510,7 +510,7 @@ "md" = (/obj/machinery/porta_turret/syndicate{dir = 8},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/outdoors) "me" = (/obj/machinery/light/small{dir = 8},/obj/structure/bed/roller,/obj/machinery/iv_drip,/obj/item/reagent_containers/blood/OMinus,/obj/machinery/firealarm{dir = 8; pixel_x = -26},/turf/open/floor/plasteel/white/side{dir = 8},/area/ruin/unpowered/syndicate_lava_base/medbay) "mf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/medbay) -"mh" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 1},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) +"mh" = (/obj/structure/extinguisher_cabinet{pixel_x = -27; pixel_y = 1},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central6"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals4"},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) "mm" = (/obj/structure/chair,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) "mn" = (/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/nanites) "mo" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 5},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 5},/obj/structure/cable/yellow{icon_state = "2-4"},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) @@ -526,13 +526,13 @@ "mA" = (/obj/structure/sign/departments/medbay/alt,/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/medbay) "mC" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/medbay) "mE" = (/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/medbay) -"mH" = (/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/engine,/area/ruin/unpowered/syndicate_lava_base/engineering) -"mI" = (/turf/open/floor/engine,/area/ruin/unpowered/syndicate_lava_base/engineering) -"mJ" = (/obj/machinery/light/small,/turf/open/floor/engine,/area/ruin/unpowered/syndicate_lava_base/engineering) +"mH" = (/obj/structure/cable{icon_state = "1-2"},/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/engine,/area/ruin/unpowered/syndicate_lava_base/engineering) +"mI" = (/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/engine,/area/ruin/unpowered/syndicate_lava_base/engineering) +"mJ" = (/obj/machinery/light/small,/obj/effect/turf_decal/stripes/line{dir = 1},/turf/open/floor/engine,/area/ruin/unpowered/syndicate_lava_base/engineering) "mO" = (/obj/machinery/light/small{dir = 4},/obj/structure/sign/warning/fire{pixel_x = 32},/obj/structure/closet/emcloset/anchored,/obj/item/tank/internals/emergency_oxygen/engi,/obj/item/flashlight/seclite,/obj/item/clothing/mask/gas,/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/arrivals) "mP" = (/obj/structure/sign/warning/securearea,/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/nanites) -"mQ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) -"mR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) +"mQ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals9"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) +"mR" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals9"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) "mS" = (/turf/closed/wall/mineral/plastitanium/explosive,/area/ruin/unpowered/syndicate_lava_base/nanites) "mT" = (/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/arrivals) "mU" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) @@ -544,7 +544,7 @@ "nd" = (/obj/effect/turf_decal/stripes/line{dir = 9},/obj/structure/cable/yellow{icon_state = "2-4"},/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/engineering) "ne" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/cable{icon_state = "2-4"},/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/engine,/area/ruin/unpowered/syndicate_lava_base/engineering) "nf" = (/obj/structure/cable/yellow{icon_state = "1-8"},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/supply/visible,/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{dir = 8},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) -"nh" = (/obj/structure/cable/yellow{icon_state = "1-8"},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) +"nh" = (/obj/structure/cable/yellow{icon_state = "1-8"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals6"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals6"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals6"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals6"},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) "ni" = (/obj/machinery/computer/atmos_control/tank{dir = 8; frequency = 1442; name = "Nitrogen Supply Control"; output_tag = "syndie_lavaland_n2_out"; sensors = list("syndie_lavaland_n2_sensor"="Tank")},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) "nj" = (/obj/structure/grille,/obj/structure/window/plastitanium,/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/engineering) "nk" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) @@ -562,14 +562,14 @@ "nD" = (/obj/machinery/light/small{dir = 8},/obj/structure/cable{icon_state = "0-4"},/obj/machinery/power/rtg/advanced,/turf/open/floor/engine,/area/ruin/unpowered/syndicate_lava_base/engineering) "nE" = (/obj/structure/cable{icon_state = "1-4"},/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/engine,/area/ruin/unpowered/syndicate_lava_base/engineering) "nG" = (/turf/open/floor/plating/airless,/area/ruin/unpowered/syndicate_lava_base/engineering) -"nI" = (/obj/machinery/firealarm{dir = 8; pixel_x = -26},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) -"nL" = (/obj/structure/cable/yellow,/obj/machinery/power/apc/syndicate{dir = 2; name = "Nanites APC"; pixel_y = -24},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/nanite_programmer,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) +"nI" = (/obj/machinery/firealarm{dir = 8; pixel_x = -26},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 8; icon_state = "steel_decals9"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) +"nL" = (/obj/structure/cable/yellow,/obj/machinery/power/apc/syndicate{dir = 2; name = "Nanites APC"; pixel_y = -24},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/nanite_programmer,/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 8; icon_state = "steel_decals9"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) "nN" = (/obj/effect/mapping_helpers/no_lava,/turf/open/floor/plating{baseturfs = /turf/open/lava/smooth/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/unpowered/syndicate_lava_base/outdoors) "nO" = (/obj/structure/chair{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) "nP" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 4},/obj/effect/landmark/xmastree,/obj/machinery/light/floor,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) "nQ" = (/obj/machinery/door/airlock/external{req_access_txt = "150"},/obj/structure/fans/tiny,/obj/effect/mapping_helpers/airlock/cyclelink_helper,/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/arrivals) "nS" = (/obj/machinery/computer/arcade/orion_trail,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) -"nT" = (/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/obj/structure/extinguisher_cabinet{pixel_y = -29},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/circuits) +"nT" = (/obj/structure/extinguisher_cabinet{pixel_y = -29},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/circuits) "nU" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer3{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "nX" = (/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "ob" = (/obj/structure/rack{dir = 8},/obj/item/storage/belt/medical,/obj/item/crowbar,/obj/item/clothing/glasses/hud/health,/obj/item/clothing/neck/stethoscope,/turf/open/floor/plasteel/white/side{dir = 10},/area/ruin/unpowered/syndicate_lava_base/medbay) @@ -600,7 +600,7 @@ "sl" = (/obj/machinery/light/small{dir = 1},/obj/effect/turf_decal/stripes/line{dir = 8},/obj/structure/chair,/obj/structure/lattice/catwalk,/turf/open/lava/smooth/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/outdoors) "sz" = (/obj/structure/table/reinforced,/obj/item/retractor,/obj/item/hemostat,/turf/open/floor/plasteel/white/side{dir = 6},/area/ruin/unpowered/syndicate_lava_base/medbay) "tW" = (/obj/machinery/light/small{dir = 4},/obj/structure/cable{icon_state = "0-8"},/obj/machinery/power/rtg/advanced,/turf/open/floor/engine,/area/ruin/unpowered/syndicate_lava_base/engineering) -"un" = (/turf/open/floor/circuit/green,/area/ruin/unpowered/syndicate_lava_base/nanites) +"un" = (/obj/effect/turf_decal/stripes/line{dir = 9},/obj/effect/turf_decal/stripes/white/line{dir = 6},/turf/open/floor/circuit/telecomms,/area/ruin/unpowered/syndicate_lava_base/nanites) "us" = (/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/tile/green{dir = 4},/obj/effect/turf_decal/tile/green,/obj/item/reagent_containers/glass/bucket,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "ut" = (/obj/structure/table/reinforced,/obj/item/scalpel,/obj/item/circular_saw{pixel_y = 9},/turf/open/floor/plasteel/white/side{dir = 4},/area/ruin/unpowered/syndicate_lava_base/medbay) "uB" = (/obj/item/storage/box/donkpockets{pixel_x = -2; pixel_y = 6},/obj/item/storage/box/donkpockets{pixel_y = 3},/obj/item/storage/box/donkpockets{pixel_x = 2},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 9},/obj/structure/cable/yellow{icon_state = "1-8"},/obj/structure/closet/secure_closet/freezer/kitchen/maintenance{req_access = null},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/bar) @@ -626,18 +626,22 @@ "Dc" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) "DG" = (/obj/machinery/power/adipoelectric_generator,/obj/structure/cable{icon_state = "0-8"},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) "EF" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) -"Fb" = (/obj/machinery/telecomms/relay/preset/ruskie{use_power = 0},/obj/machinery/light/small{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) +"Fb" = (/obj/machinery/telecomms/relay/preset/ruskie{use_power = 0},/obj/machinery/light/small{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/stripes/line{dir = 8},/obj/effect/turf_decal/stripes/white/line{dir = 8},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals6"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals6"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals6"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals6"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) "FR" = (/obj/machinery/porta_turret/syndicate{dir = 6},/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/engineering) +"Gf" = (/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central6"},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/cargo) "GY" = (/obj/structure/sign/warning/xeno_mining{pixel_x = -32},/obj/structure/sign/warning/fire{pixel_x = 32},/obj/machinery/light/small{dir = 8},/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/arrivals) "Ia" = (/obj/structure/table,/obj/item/storage/toolbox/syndicate,/obj/item/storage/toolbox/syndicate{pixel_y = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) "IJ" = (/obj/machinery/light/small{dir = 1},/obj/structure/table,/obj/item/storage/firstaid/fire,/turf/open/floor/plasteel/white/side{dir = 5},/area/ruin/unpowered/syndicate_lava_base/medbay) "Jc" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable/yellow{icon_state = "1-4"},/turf/open/floor/plasteel/white/side{dir = 1},/area/ruin/unpowered/syndicate_lava_base/circuits) "JA" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer3{dir = 1},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) +"KA" = (/obj/effect/turf_decal/stripes/corner{dir = 4},/obj/effect/turf_decal/stripes/white/corner{dir = 4},/turf/open/floor/circuit/telecomms,/area/ruin/unpowered/syndicate_lava_base/nanites) +"Ml" = (/obj/effect/turf_decal/stripes/corner{dir = 1},/obj/effect/turf_decal/stripes/white/corner{dir = 1},/turf/open/floor/circuit/telecomms,/area/ruin/unpowered/syndicate_lava_base/nanites) "Mn" = (/turf/closed/wall/mineral/plastitanium/explosive,/area/ruin/unpowered/syndicate_lava_base/bar) "MY" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/machinery/atm{pixel_y = 30},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "NH" = (/obj/machinery/portable_atmospherics/scrubber,/obj/effect/turf_decal/bot,/turf/open/floor/engine,/area/ruin/unpowered/syndicate_lava_base/engineering) "NZ" = (/obj/machinery/button/door{id = "lavalandsyndi_telecomms"; name = "Telecomms Blast Door Control"; pixel_x = 26; req_access_txt = "150"},/obj/item/storage/box/disks_nanite,/obj/item/storage/box/disks_nanite,/obj/item/nanite_scanner,/obj/item/nanite_remote/comm,/obj/item/nanite_remote,/obj/structure/closet/crate,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) "Ov" = (/obj/effect/turf_decal/stripes/line{dir = 6},/obj/structure/lattice/catwalk,/turf/open/lava/smooth/lava_land_surface,/area/ruin/unpowered/syndicate_lava_base/arrivals) +"OA" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 8; icon_state = "steel_decals9"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) "Pa" = (/turf/closed/wall/mineral/plastitanium/nodiagonal,/area/ruin/unpowered/syndicate_lava_base/circuits) "Px" = (/obj/structure/table/reinforced,/obj/item/stock_parts/cell/high/plus{pixel_x = -5; pixel_y = 9},/obj/item/stock_parts/cell/high/plus{pixel_x = -8; pixel_y = -3},/obj/item/multitool,/obj/machinery/light/small{dir = 1},/turf/open/floor/plasteel/white/side{dir = 8},/area/ruin/unpowered/syndicate_lava_base/circuits) "PE" = (/obj/structure/table/reinforced,/obj/item/integrated_circuit_printer/upgraded,/turf/open/floor/plasteel/white/side{dir = 6},/area/ruin/unpowered/syndicate_lava_base/circuits) @@ -651,17 +655,19 @@ "RY" = (/obj/machinery/light/small,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/medbay) "Su" = (/obj/machinery/atmospherics/pipe/simple/supplymain/visible{dir = 4},/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 4},/obj/machinery/adipoelectric_transformer,/obj/structure/cable{icon_state = "0-8"},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/engineering) "Tf" = (/obj/structure/table/reinforced,/obj/item/reagent_containers/spray/plantbgone{pixel_x = 8; pixel_y = 8},/obj/item/reagent_containers/spray/plantbgone{pixel_y = 3},/obj/item/book/manual/hydroponics_pod_people,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) -"Ti" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/light/small{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) +"Ti" = (/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/machinery/light/small{dir = 8},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals9"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) "Tp" = (/obj/machinery/door/airlock/maintenance,/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/obj/structure/cable/yellow{icon_state = "1-2"},/turf/open/floor/plating,/area/ruin/unpowered/syndicate_lava_base/main) "TB" = (/obj/structure/table/reinforced,/obj/machinery/smartfridge/disks{density = 0; pixel_y = 2},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) "Ug" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3,/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/medbay) "UM" = (/obj/effect/turf_decal/tile/green,/obj/effect/turf_decal/tile/green{dir = 8},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) -"Wt" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 10},/obj/structure/noticeboard{dir = 8; pixel_x = 27},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) +"Vu" = (/obj/effect/turf_decal/stripes/line{dir = 10},/obj/effect/turf_decal/stripes/white/line{dir = 5},/turf/open/floor/circuit/telecomms,/area/ruin/unpowered/syndicate_lava_base/nanites) +"Wt" = (/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 10},/obj/structure/noticeboard{dir = 8; pixel_x = 27},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals9"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) "Xa" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{dir = 4},/obj/structure/cable/yellow{icon_state = "4-8"},/obj/machinery/power/apc/syndicate{dir = 1; name = "Arrival Hallway APC"; pixel_y = 24},/obj/structure/cable/yellow{icon_state = "0-4"},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) "Xm" = (/obj/effect/turf_decal/loading_area{dir = 9; icon_state = "steel_panel"; name = "steel pannel"},/obj/effect/turf_decal/loading_area{dir = 6; icon_state = "steel_panel"; name = "steel pannel"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) "XL" = (/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/structure/closet{name = "Hydroponics locker"},/obj/item/storage/box/disks_plantgene,/obj/item/storage/box/disks_plantgene,/obj/item/hatchet,/obj/item/hatchet,/obj/item/watertank,/obj/item/reagent_containers/glass/bucket,/obj/item/reagent_containers/glass/bucket,/obj/item/storage/bag/plants,/obj/item/storage/bag/plants,/obj/item/plant_analyzer,/obj/item/plant_analyzer,/obj/item/storage/box/disks_plantgene,/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/arrivals) "Yj" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 8},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/medbay) "Zv" = (/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 4},/turf/open/floor/plasteel,/area/ruin/unpowered/syndicate_lava_base/arrivals) +"ZK" = (/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 4},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals6"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals6"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals6"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals6"},/turf/open/floor/plasteel/dark,/area/ruin/unpowered/syndicate_lava_base/nanites) (1,1,1) = {" aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa @@ -677,11 +683,11 @@ aaaaabababababababababaeaFaFaQaFaedcddbKanaFaFaXaeasasataZbbasacbgababababababab aaaaababababababababawaeaeaeaeaeaecqbNbhaxbjbjayblbnbPbScabpasasdydydydybrababababababababababaaaaaa aaabababababababababawbraecTbtcTdrbQdibxdraFaFaFaeducrcAcAbAbBasbDbEbIdydydydydydyabababababababaaaa aaababababababababababawaeaOaNbJbOazdibKrIaFaAaqaedBbRbRdEdIbTasdLdMbXccdycdcfcgdyacababababababaaaa -aaabababababababababababaecTaUcTdrdddfbhaxchchcxaedUdVdXdYdZcyasebecdbeceeefeghlcEcFababababababaaaa +aaabababababababababababaecTaUcTdrdddfbhaxchchcxaedUdVdXdYdZcyasebecdbeceeefegGfcEcFababababababaaaa aaabababababababababababaeaeaeaeaeckcHcMaeaeaeaeaedqdsdvevewasasdxdHcQdOfteCeDeEeFcFabababababababaa aaababababababababdeababawdkaedndDdacpdodpaedwdAeRedeVeseVdKasetdxdFeudydyfcfwfedydydydTabababababaa aaabababababababiieheheheheaaedNcYdQdRdgeqaedWoPfmfnfofofofoasdyfsfterdyfufvfwexeyeOfxeYabababababaa -aaabababababababeheJfbfheJffaebcbdcNbfdhfiaPbufIfIfOfIfIfIfIfBfWfadPfJfYgbhlgcgddydydydTabababababaa +aaabababababababeheJfbfheJffaebcbdcNbfdhfiaPbufIfIfOfIfIfIfIfBfWfadPfJfYgbGfgcgddydydydTabababababaa aaabababababababehbweIfhbwfQaeaeaeaebmdzbqaRgIiQgMgMgMgagMgMgKgMgMgNgOgwhlhlhlgfggcFabababababababaa aaabababababababehfhghfhfhglfhgoguehehhahahahdhehzhzhzhzgvhzhzhzhzhRgOgwhlhlhlhlgycFabababababababaa aaabababababababehfygBgEbCgFfheSgRgSgUgZhfhabFhghzhhhihzhzhzhnhohzhReTdyhvapaGaJdyhBabababababababaa @@ -701,10 +707,10 @@ aaabababababababababababdGleopjyorjZjNlhlilZlkouovjZozjykPkQaDlnmEmEoAjulqlrlskZ aaabababababababababababhalwlwjyjyoHjZlzlAlBlCaklElFuBjykPkQlHlImElKkQlLlMlNlOlOlPSulQlRnGjuabababaa aaababababmnmnmnRuRuRuRumnlTgsmOjynSjNlWlXlZlZmajymcjyjyTpkQmeUgmfYjkUjumhlNlOlOlODGjujujujuabababaa aaabababiimnunmnmpeHIaNZmnmsmsmTjymvmumvjyvxmxjyjyjyjymzocmAlHmCmEmEutjumImHmImJmImIjuababababababaa -aaabababmnununmPTimQmRWtmSzVzVyqMYmUEFZvjyjyMnjyvDXamXmYzymZnauXnbnbRajucGneRVjuNHNHjuababababababaa -aaabababmnFbnkaEnknknkmonnrFnonpBkBknrpiQmjPJAnsntRsRsnwhWnynzmERYmECDjunDnEtWjuamRDjuababababababaa -aaabababmnununmnnInknknLmnmTnQmTfPfPPaarPanTnUnXnXnXfKauhXmTobfkaVcDszjujujujujujujuhBababababababaa -aaabababgmmnunmnoiojokmnmnmTGYPaPaPaPaJccIPamTgWgWgWgWgXmTmTmTmTmTmTmTmTjujuFRababababababababababaa +aaabababmnunKAmPTimQmRWtmSzVzVyqMYmUEFZvjyjyMnjyvDXamXmYzymZnauXnbnbRajucGneRVjuNHNHjuababababababaa +aaabababmnFbZKaEnknknkmonnrFnonpBkBknrpiQmjPJAnsntRsRsnwhWnynzmERYmECDjunDnEtWjuamRDjuababababababaa +aaabababmnVuMlmnnIOAOAnLmnmTnQmTfPfPPaarPanTnUnXnXnXfKauhXmTobfkaVcDszjujujujujujujuhBababababababaa +aaabababgmmnVumnoiojokmnmnmTGYPaPaPaPaJccIPamTgWgWgWgWgXmTmTmTmTmTmTmTmTjujuFRababababababababababaa aaababababmnmnmnmnmnmnhBslaSxOPaPxALcJcKxTxFmTgYusCLcLDcwNxnxnzFmTXLAmmTabababababababababababababaa aaabababababababababababcOcPOvPacRcUcVcVdmPEmThcdthbhbhFhmhmelpYemiyAxmTabababababababababababababaa aaaaabababababababababababababgmPaeKeLeMeNPamThqeQrOflfzUMUMUMfLXmiyTBmTabababababababababababababaa diff --git a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm index 5d83950e..5d99b05f 100644 --- a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm +++ b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm @@ -74,7 +74,7 @@ "jh" = (/obj/structure/table,/obj/machinery/disposal/bin{pixel_y = -10},/obj/structure/disposalpipe/trunk{dir = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "jI" = (/turf/open/floor/plating/asteroid,/area/ruin/space/has_grav/feedersden) "jO" = (/obj/effect/turf_decal/tile/red{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) -"jS" = (/obj/structure/rack/shelf,/obj/item/electropack/shockcollar,/obj/item/clothing/neck/petcollar,/obj/item/melee/baton/stunsword,/obj/item/restraints/handcuffs,/obj/item/restraints/handcuffs/cable/zipties,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/item/melee/baton/stunsword,/obj/item/clothing/neck/petcollar/calorite,/obj/item/clothing/mask/cowmask/gag,/obj/item/clothing/mask/cowmask/gag,/obj/item/clothing/mask/pig/gag,/obj/item/clothing/mask/pig/gag,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) +"jS" = (/obj/structure/rack/shelf,/obj/item/electropack/shockcollar,/obj/item/clothing/neck/petcollar,/obj/item/melee/baton/stunsword,/obj/item/restraints/handcuffs,/obj/item/restraints/handcuffs/cable/zipties,/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/item/melee/baton/stunsword,/obj/item/clothing/neck/petcollar/calorite,/obj/item/clothing/mask/cowmask/gag,/obj/item/clothing/mask/cowmask/gag,/obj/item/clothing/mask/pig/gag,/obj/item/clothing/mask/pig/gag,/obj/item/stock_parts/cell/high,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "kd" = (/obj/structure/table,/obj/item/kitchen/rollingpin,/obj/item/kitchen/knife/butcher,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "kg" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/poddoor/shutters/old/preopen{id = "feederden_south"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "ko" = (/obj/machinery/space_heater,/obj/machinery/airalarm/syndicate{pixel_y = 32},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index c5d7bd42..e75e7acc 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -11,6 +11,12 @@ /obj/item/clothing/head/fedora = 3, /obj/item/clothing/suit/jacket/letterman_gato = 5, //GS13 /obj/item/clothing/under/color/grey/modular = 6, //GS13 + /obj/item/clothing/suit/hooded/hoodie = 3, + /obj/item/clothing/suit/hooded/hoodie/purple = 3, + /obj/item/clothing/suit/hooded/hoodie/red = 3, + /obj/item/clothing/suit/hooded/hoodie/blue = 3, + /obj/item/clothing/suit/hooded/hoodie/green = 3, + /obj/item/clothing/suit/hooded/hoodie/black = 3, /obj/item/clothing/glasses/monocle = 3, /obj/item/clothing/suit/jacket = 4, /obj/item/clothing/suit/jacket/flannel = 4, diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm index a7d28e4e..df321bd4 100644 --- a/modular_citadel/code/modules/client/loadout/suit.dm +++ b/modular_citadel/code/modules/client/loadout/suit.dm @@ -19,6 +19,36 @@ path = /obj/item/clothing/suit/hooded/cloak/david cost = 3 +/datum/gear/hoodie + name = "Hoodie" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/hooded/hoodie + cost = 1 + +/datum/gear/hoodiered + name = "Red hoodie" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/hooded/hoodie/red + cost = 1 + +/datum/gear/hoodieblue + name = "Blue hoodie" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/hooded/hoodie/blue + cost = 1 + +/datum/gear/hoodiegreen + name = "Green hoodie" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/hooded/hoodie/green + cost = 1 + +/datum/gear/hoodieblack + name = "Black hoodie" + category = SLOT_WEAR_SUIT + path = /obj/item/clothing/suit/hooded/hoodie/black + cost = 1 + /datum/gear/jacketbomber name = "Bomber jacket" category = SLOT_WEAR_SUIT diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm index cd0f9b0d..dff0cd56 100644 --- a/modular_citadel/code/modules/client/loadout/uniform.dm +++ b/modular_citadel/code/modules/client/loadout/uniform.dm @@ -526,7 +526,7 @@ cost = 1 - GS13 +//GS13 /datum/gear/modular_greysuit name = "Modular Jumpsuit (gray)" category = SLOT_W_UNIFORM diff --git a/tgstation.dme b/tgstation.dme index 7416e1e3..f3033829 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3485,5 +3485,7 @@ #include "modular_citadel\code\modules\vore\eating\voreitems.dm" #include "modular_citadel\code\modules\vore\eating\vorepanel_vr.dm" #include "modular_citadel\interface\skin.dmf" +#include "v_CHOMPstation2\code\clothing\head.dm" +#include "v_CHOMPstation2\code\clothing\suits.dm" #include "yogstation\code\modules\power\energyharvester.dm" // END_INCLUDE diff --git a/v_CHOMPstation2/code/clothing/head.dm b/v_CHOMPstation2/code/clothing/head.dm new file mode 100644 index 00000000..ee920ffa --- /dev/null +++ b/v_CHOMPstation2/code/clothing/head.dm @@ -0,0 +1,33 @@ +//clothing ported from chompstation2 + +/obj/item/clothing/head/hooded/hoodie + name = "hoodie hood" + desc = "A hood of a hoodie." + icon = 'v_CHOMPstation2/icons/mob/hat/item_vr.dmi' + alternate_worn_icon = 'v_CHOMPstation2/icons/mob/hat/mob_vr.dmi' + item_state = "hood_plain" + icon_state = "hood_plain" + body_parts_covered = HEAD + flags_inv = HIDEHAIR|HIDEEARS + mutantrace_variation = NO_MUTANTRACE_VARIATION + +/obj/item/clothing/head/hooded/hoodie/purple + name = "purple hood" + color = "#7a287a" + +/obj/item/clothing/head/hooded/hoodie/red + name = "red hood" + color = "#7d1e1e" + +/obj/item/clothing/head/hooded/hoodie/blue + name = "blue hood" + color = "#1f3499" + +/obj/item/clothing/head/hooded/hoodie/green + name = "green hood" + color = "#1a7910" + +/obj/item/clothing/head/hooded/hoodie/black + name = "black hood" + color = "#1f1f1f" + diff --git a/v_CHOMPstation2/code/clothing/suits.dm b/v_CHOMPstation2/code/clothing/suits.dm new file mode 100644 index 00000000..02a74155 --- /dev/null +++ b/v_CHOMPstation2/code/clothing/suits.dm @@ -0,0 +1,39 @@ +//clothing ported from chompstation2 + +/obj/item/clothing/suit/hooded/hoodie + name = "hoodie" + desc = "A comfy hoodie." + icon = 'v_CHOMPstation2/icons/mob/item_vr.dmi' + alternate_worn_icon = 'v_CHOMPstation2/icons/mob/mob_vr.dmi' + icon_state = "hoodie_plain" + item_state = "hoodie_plain" + body_parts_covered = CHEST|GROIN|ARMS + mutantrace_variation = NO_MUTANTRACE_VARIATION + hoodtype = /obj/item/clothing/head/hooded/hoodie + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 10, "rad" = 0, "fire" = 5, "acid" = 0) + allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter) + +/obj/item/clothing/suit/hooded/hoodie/purple + name = "purple hoodie" + color = "#7a287a" + hoodtype = /obj/item/clothing/head/hooded/hoodie/purple + +/obj/item/clothing/suit/hooded/hoodie/red + name = "red hoodie" + color = "#7d1e1e" + hoodtype = /obj/item/clothing/head/hooded/hoodie/red + +/obj/item/clothing/suit/hooded/hoodie/blue + name = "blue hoodie" + color = "#1f3499" + hoodtype = /obj/item/clothing/head/hooded/hoodie/blue + +/obj/item/clothing/suit/hooded/hoodie/green + name = "green hoodie" + color = "#1a7910" + hoodtype = /obj/item/clothing/head/hooded/hoodie/green + +/obj/item/clothing/suit/hooded/hoodie/black + name = "black hoodie" + color = "#1f1f1f" + hoodtype = /obj/item/clothing/head/hooded/hoodie/black diff --git a/CHOMPstation2/icons/mob/hat/item_vr.dmi b/v_CHOMPstation2/icons/mob/hat/item_vr.dmi similarity index 100% rename from CHOMPstation2/icons/mob/hat/item_vr.dmi rename to v_CHOMPstation2/icons/mob/hat/item_vr.dmi diff --git a/CHOMPstation2/icons/mob/hat/mob_vr.dmi b/v_CHOMPstation2/icons/mob/hat/mob_vr.dmi similarity index 100% rename from CHOMPstation2/icons/mob/hat/mob_vr.dmi rename to v_CHOMPstation2/icons/mob/hat/mob_vr.dmi diff --git a/CHOMPstation2/icons/mob/item_vr.dmi b/v_CHOMPstation2/icons/mob/item_vr.dmi similarity index 100% rename from CHOMPstation2/icons/mob/item_vr.dmi rename to v_CHOMPstation2/icons/mob/item_vr.dmi diff --git a/CHOMPstation2/icons/mob/mob_vr.dmi b/v_CHOMPstation2/icons/mob/mob_vr.dmi similarity index 100% rename from CHOMPstation2/icons/mob/mob_vr.dmi rename to v_CHOMPstation2/icons/mob/mob_vr.dmi diff --git a/CHOMPstation2/icons/mob/synxmanyvoices.dmi b/v_CHOMPstation2/icons/mob/synxmanyvoices.dmi similarity index 100% rename from CHOMPstation2/icons/mob/synxmanyvoices.dmi rename to v_CHOMPstation2/icons/mob/synxmanyvoices.dmi diff --git a/CHOMPstation2/icons/mob/wolfpelt_ch.dmi b/v_CHOMPstation2/icons/mob/wolfpelt_ch.dmi similarity index 100% rename from CHOMPstation2/icons/mob/wolfpelt_ch.dmi rename to v_CHOMPstation2/icons/mob/wolfpelt_ch.dmi