From 688cae07bca6fe5419d6c71fe2d9f45580d37d51 Mon Sep 17 00:00:00 2001 From: Metis <100518708+sheepishgoat@users.noreply.github.com> Date: Thu, 19 Sep 2024 01:25:41 -0400 Subject: [PATCH] size issue --- .../code/modules/mapping/ghost_roles.dm | 2 +- _maps/RandomRuins/SpaceRuins/feeders_den.dmm | 22 ++++---- code/modules/client/client_procs.dm | 8 +-- .../mob/dead/new_player/preferences_setup.dm | 2 +- interface/skin.dmf | 54 +++++++++++++++---- 5 files changed, 60 insertions(+), 28 deletions(-) diff --git a/GainStation13/code/modules/mapping/ghost_roles.dm b/GainStation13/code/modules/mapping/ghost_roles.dm index 0113be91bc..21d5f16cc5 100644 --- a/GainStation13/code/modules/mapping/ghost_roles.dm +++ b/GainStation13/code/modules/mapping/ghost_roles.dm @@ -194,7 +194,7 @@ icon_state = "sleeper_s-open" alert_comms = FALSE -/obj/machinery/cryopod/syndicate/find_control_computer() //We don't want to store anything +/obj/machinery/cryopod/syndicate/find_control_computer(urgent = FALSE) //We don't want to store anything return /obj/machinery/cryopod/syndicate/MouseDrop_T(mob/living/target, mob/user) diff --git a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm index 877cd915e8..d2dfb58a0f 100644 --- a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm +++ b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm @@ -52,7 +52,6 @@ "gi" = (/obj/structure/sink{dir = 4; pixel_x = 11},/obj/structure/mirror{pixel_x = 24},/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) "gk" = (/obj/effect/turf_decal/stripes{icon_state = "trim"; dir = 4},/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden) "gn" = (/obj/item/trash/can,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes{icon_state = "steel_grid"; dir = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"go" = (/obj/structure/reagent_dispensers/keg/aphro,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "gq" = (/obj/vehicle/ridden/wheelchair,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "gu" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/loading_area{icon_state = "steel_decals_central6"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "gD" = (/obj/structure/lattice/catwalk,/obj/item/stack/marker_beacon{anchored = 1; icon_state = "markerburgundy-on"; light_color = "#FA644B"; light_power = 3; light_range = 2; name = "landing marker"; picked_color = "Burgundy"; pixel_x = -12; pixel_y = -10},/turf/template_noop,/area/ruin/space/has_grav/feedersden) @@ -106,7 +105,7 @@ "oK" = (/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "oS" = (/obj/structure/chair/sofa/left{dir = 8},/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden) "oY" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 9; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) -"pc" = (/obj/structure/table/wood,/obj/item/bdsm_whip/ridingcrop,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) +"pc" = (/obj/structure/table/wood,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "pe" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals3"},/obj/effect/turf_decal/loading_area{dir = 10; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals1"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "pf" = (/obj/structure/sign/warning/securearea,/turf/closed/wall/r_wall/syndicate/nodiagonal,/area/ruin/space/has_grav/feedersden) "ph" = (/obj/machinery/vending/gato{free = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) @@ -127,14 +126,14 @@ "rs" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "rt" = (/obj/structure/chair/sofa,/obj/item/reagent_containers/food/snacks/pizzaslice/margherita,/turf/open/floor/carpet/orange,/area/ruin/space/has_grav/feedersden) "rB" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"rE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/vending/hydroseeds{slogan_delay = 700},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) +"rE" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/machinery/vending/hydroseeds{slogan_delay = 700; free = 1},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "rJ" = (/obj/machinery/atmospherics/pipe/manifold/supply{dir = 1},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 1; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment{dir = 10},/obj/structure/cable{icon_state = "2-4"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "rS" = (/obj/structure/table,/obj/item/reagent_containers/glass/beaker/fizulphite{pixel_x = -8},/obj/item/reagent_containers/glass/beaker/lipoifier{name = "lipoifier beaker"; pixel_y = -5},/obj/item/clothing/glasses/science{pixel_y = 8},/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "rW" = (/turf/open/floor/wood{icon_state = "wood-broken7"},/area/ruin/space/has_grav/feedersden) "sa" = (/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "sq" = (/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "su" = (/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/obj/structure/rack/shelf,/obj/item/storage/box/ingredients/wildcard,/obj/item/storage/box/ingredients/wildcard,/turf/open/floor/plasteel/freezer,/area/ruin/space/has_grav/feedersden) -"sC" = (/obj/machinery/vending/hydronutrients,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) +"sC" = (/obj/machinery/vending/hydronutrients{free = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "sI" = (/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central7"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "sN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 2; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"; dir = 1},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 9; icon_state = "steel_decals7"},/obj/structure/cable{icon_state = "1-8"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "sR" = (/obj/machinery/vending/dinnerware{free = 1},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) @@ -155,7 +154,7 @@ "uq" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals6"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals6"},/obj/structure/disposalpipe/segment{dir = 5},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "uy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment{dir = 10},/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) "uA" = (/obj/structure/sign/poster/contraband/space_cola{pixel_x = -32},/obj/structure/cable{icon_state = "1-4"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) -"uF" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/stock_parts/cell/high/plus,/obj/structure/cable{icon_state = "1-2"},/obj/item/gps{tracking = 0},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) +"uF" = (/obj/structure/table,/obj/machinery/cell_charger,/obj/item/stock_parts/cell/high/plus,/obj/structure/cable{icon_state = "1-2"},/obj/item/gps,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "uO" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "uX" = (/obj/machinery/computer/security/telescreen/entertainment,/obj/structure/disposalpipe/segment,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) "vk" = (/obj/item/trash/candy{pixel_x = 10; pixel_y = -3},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) @@ -243,7 +242,7 @@ "Iq" = (/obj/structure/sign/warning/securearea,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) "It" = (/obj/machinery/cryopod/feederden{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "IC" = (/obj/structure/filingcabinet,/obj/item/folder/syndicate/mining,/turf/open/floor/circuit/red,/area/ruin/space/has_grav/feedersden) -"IG" = (/obj/machinery/vending/clothing{credits = 50},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) +"IG" = (/obj/machinery/vending/clothing{free = 1},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "IS" = (/obj/structure/flora/junglebush/large,/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav) "Jh" = (/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Jx" = (/obj/item/trash/can,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) @@ -274,7 +273,7 @@ "MW" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "MY" = (/obj/structure/closet/secure_closet/freezer/fridge,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/snacks/grown/corn,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/condiment/sugar,/obj/item/reagent_containers/food/snacks/spaghetti,/obj/item/reagent_containers/food/snacks/spaghetti,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "Ng" = (/obj/structure/closet/wardrobe/mixed,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) -"Nk" = (/obj/structure/reagent_dispensers/keg/aphro,/obj/effect/turf_decal{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) +"Nk" = (/obj/effect/turf_decal{dir = 4},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Nt" = (/obj/machinery/light{dir = 1},/obj/structure/table,/obj/machinery/plantgenes{pixel_y = 6},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Nv" = (/obj/structure/table/wood,/obj/item/reagent_containers/food/snacks/burger/superbite,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "Nx" = (/obj/structure/sign/poster/contraband/corn_oil,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) @@ -295,7 +294,6 @@ "PV" = (/obj/item/paper/fluff/ruins/feeder_den/hidden,/turf/open/floor/plating{icon_state = "panelscorched"},/area/ruin/space/has_grav/feedersden) "QF" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/disposalpipe/segment,/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "steel_decals9"},/obj/effect/turf_decal/loading_area{dir = 2; icon_state = "steel_decals9"},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "steel_decals9"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_decals9"},/obj/effect/turf_decal{dir = 1},/obj/effect/turf_decal,/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "QK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/turf_decal/stripes{icon_state = "steel_decals5"},/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "steel_decals9"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals7"},/obj/effect/turf_decal/stripes/white/line{dir = 10; icon_state = "steel_decals7"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) -"QV" = (/obj/structure/sign/poster/contraband/sun_kist{pixel_y = 32},/turf/open/floor/carpet/black,/area/ruin/space/has_grav/feedersden) "QW" = (/obj/structure/table/wood,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Ra" = (/obj/machinery/door/airlock/hatch{name = "airlock"; req_access_txt = "150"},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "Rc" = (/obj/machinery/computer/camera_advanced/abductor/feeder,/obj/effect/turf_decal/stripes{icon_state = "trim"; dir = 10},/obj/item/paper/fluff/ruins/feeder_den/tool_warning,/turf/open/floor/plating/abductor,/area/ruin/space/has_grav/feedersden) @@ -342,7 +340,7 @@ "WZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 5; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "Xa" = (/obj/structure/table/wood,/obj/item/card/id/syndicate{pixel_y = 14},/obj/item/storage/fancy/cigarettes/cigpack_syndicate{pixel_x = -3},/obj/item/lighter{pixel_x = 4},/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Xh" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/obj/effect/turf_decal/tile/red{dir = 1},/obj/effect/turf_decal/tile/red{dir = 4},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) -"Xo" = (/obj/structure/sign/poster/contraband/corn_oil{pixel_y = 32},/obj/machinery/vending/kink{free = 1; credits = 30},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) +"Xo" = (/obj/structure/sign/poster/contraband/corn_oil{pixel_y = 32},/obj/machinery/vending/kink{free = 1},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "Xs" = (/obj/structure/rack,/obj/item/storage/bag/ore,/obj/item/t_scanner/adv_mining_scanner/lesser,/obj/item/pickaxe/mini,/obj/item/shovel,/obj/effect/turf_decal/stripes/white/line{dir = 10},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals_central4"},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "XF" = (/obj/effect/turf_decal/tile/red{dir = 8},/obj/effect/turf_decal/tile/red,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "XL" = (/turf/closed/mineral/random,/area/ruin/space/has_grav/feedersden) @@ -359,7 +357,7 @@ "Zc" = (/obj/item/trash/tray{pixel_y = -5; pixel_x = -10},/obj/item/reagent_containers/food/snacks/burger/chicken{pixel_y = -5; pixel_x = -10},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "Ze" = (/obj/effect/turf_decal/box/red,/obj/structure/extinguisher_cabinet{pixel_x = -5; pixel_y = 30},/obj/structure/reagent_dispensers/watertank/high,/obj/effect/turf_decal/stripes/white/line{dir = 2},/obj/effect/turf_decal/tile/neutral,/obj/effect/turf_decal/tile/neutral{dir = 8},/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "Zh" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4; piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/vehicle/ridden/wheelchair,/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) -"Zn" = (/obj/machinery/vending/kink{free = 1; credits = 30},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) +"Zn" = (/obj/machinery/vending/kink{free = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Zp" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/neutral{dir = 1},/obj/effect/turf_decal/tile/neutral{dir = 4},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "Zw" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "ZC" = (/obj/structure/flora/ausbushes/grassybush,/turf/open/floor/plating/asteroid/airless,/area/ruin/unpowered/no_grav) @@ -378,8 +376,8 @@ FEFEFEFEFEebebqFBrBrBrBrBrBrqFebebebebfmfmfmeEIqOMOMmJrtivOMRuIqZCfmfmFEFEebFEFE FEFEFEFEFEFEBrBrBrxgjIdGBzBrBrFEFExZfmfmBrBrBrDctEpOzSKRoSpcefDcBrBrBrFEFEebFEFEebFEBrBrBrBrBrBrBrFEFEFEFEFEFE FEFEFEFEFEBrBrBrBzOwPVOwTOnEBrBrBrfmISBrBrBrBrnrxPoKWHKRKRTHZWDcBrBrBrBrBrqFBrFEebBrBrBrBrBrBrBrBrFEFEFEFEFEFE FEFEFEFEFEBrBrDcnrnrqCnrDcDcDcDcDcDcDcDcDcDcDcDcwAoKtffCZcoKNvDcDcDcBrBrBrBrDcDcCnDcDcnrnrnrnrDcBrBrFEFEFEFEFE -FEFEFEFEBrBrBrnrzLgaQVlRnrrjybrjDcaqEUzyBuDcXoKTExoKoKJxoKoKOcKKphDcBrDcDcDcDcLVPLhgnrcyFfdelRnrBrBrFEFEFEFEFE -FEFEFEFEBrBrBrnrLzUEUEEnqDrSsqsqnrQWoFkKJDgUgooKoKfStbvvADAgoKoKoKDcDcDcbUShnrvHJhvHqDsqUEUEOEnrBrBrFEFEFEFEFE +FEFEFEFEBrBrBrnrzLgaUElRnrrjybrjDcaqEUzyBuDcXoKTExoKoKJxoKoKOcKKphDcBrDcDcDcDcLVPLhgnrcyFfdelRnrBrBrFEFEFEFEFE +FEFEFEFEBrBrBrnrLzUEUEEnqDrSsqsqnrQWoFkKJDgUoKoKoKfStbvvADAgoKoKoKDcDcDcbUShnrvHJhvHqDsqUEUEOEnrBrBrFEFEFEFEFE FEFEFEFEBrBrBrnrNAsqsqsqHQKnsqgLnrXakKkKqtgUegoKoKnrgUgUgUnroKOcoKiWRUCuYXzsnruAsTSmHQMVsqsqTlnrBrBrFEFEFEFEFE FEebebebqFBrBrnrfMsqelzCnrLMelwnnrSXXFXFwODcwYrWOclQeSiXGFCcoKoKoKNzItgUeZICnrhlbghTnrelZwCHfMnrBrBrFEFEFEFEFE FEFEFEFEFEBrBrDcnrnrnurkDcgUKHzYDcDcgUdHDcDccwoKoKOcoKoKoKvkrWoKoKNzItDcDcDcDcgUYkzYDcftbxnrnrDcBrBrFEFEFEFEFE diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index e146be8c2a..1a9f4cd49c 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -1052,7 +1052,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( char_render_holders["plane_master-[plane_master.plane]"] = plane_master plane_master.backdrop(mob) screen |= plane_master - plane_master.screen_loc = "character_preview_map:0,CENTER" + plane_master.screen_loc = "character_preview_map:CENTER,0" var/pos = 0 for(var/dir in GLOB.cardinals) @@ -1064,7 +1064,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( screen |= preview preview.appearance = source preview.dir = dir - preview.screen_loc = "character_preview_map:0,[pos]" + preview.screen_loc = "character_preview_map:[pos],0" //GS13 EDIT /client/proc/show_character_previews_large(mutable_appearance/source) @@ -1075,7 +1075,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( char_render_holders["plane_master-[plane_master.plane]"] = plane_master plane_master.backdrop(mob) screen |= plane_master - plane_master.screen_loc = "character_preview_map:0,CENTER" + plane_master.screen_loc = "character_preview_map:CENTER,0" var/pos = 0 for(var/dir in GLOB.cardinals) @@ -1088,7 +1088,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( screen |= preview preview.appearance = source preview.dir = dir - preview.screen_loc = "character_preview_map:-1,[pos]" + preview.screen_loc = "character_preview_map:[pos],-1" /client/proc/clear_character_previews() for(var/index in char_render_holders) diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm index 7caaf7d7d7..f955922bdf 100644 --- a/code/modules/mob/dead/new_player/preferences_setup.dm +++ b/code/modules/mob/dead/new_player/preferences_setup.dm @@ -70,7 +70,7 @@ mannequin.regenerate_icons() //GS13 EDIT START - if(body_size>100) + if(body_size>1.0) parent.show_character_previews_large(new /mutable_appearance(mannequin))//just to stop clipping of larger characters else parent.show_character_previews(new /mutable_appearance(mannequin)) diff --git a/interface/skin.dmf b/interface/skin.dmf index d80b5dcd22..c0182eabb2 100644 --- a/interface/skin.dmf +++ b/interface/skin.dmf @@ -259,27 +259,61 @@ window "preferences_window" elem "preferences_window" type = MAIN pos = 281,0 - size = 1280x1000 + size = 1280x720 anchor1 = none anchor2 = none + background-color = none is-visible = false + border = line saved-params = "pos;size;is-minimized;is-maximized" statusbar = false + outer-size = 1296x759 + inner-size = 1280x720 elem "preferences_browser" type = BROWSER - pos = 0,0 - size = 960x1000 - anchor1 = 0,0 - anchor2 = 75,100 + pos = 0,128 + size = 1280x606 + anchor1 = 0,18 + anchor2 = 100,100 + background-color = none + border = line saved-params = "" elem "character_preview_map" type = MAP - pos = 960,0 - size = 320x1000 - anchor1 = 75,0 - anchor2 = 100,100 + pos = 0,0 + size = 1280x128 + anchor1 = 0,0 + anchor2 = 100,18 + border = line right-click = true - saved-params = "zoom;letterbox;zoom-mode" + saved-params = "" + +//GS13 EDIT +//window "preferences_window" +// elem "preferences_window" +// type = MAIN +// pos = 281,0 +// size = 1280x1000 +// anchor1 = none +// anchor2 = none +// is-visible = false +// saved-params = "pos;size;is-minimized;is-maximized" +// statusbar = false +// elem "preferences_browser" +// type = BROWSER +// pos = 0,0 +// size = 960x1000 +// anchor1 = 0,0 +// anchor2 = 75,100 +// saved-params = "" +// elem "character_preview_map" +// type = MAP +// pos = 960,0 +// size = 320x1000 +// anchor1 = 75,0 +// anchor2 = 100,100 +// right-click = true +// saved-params = "zoom;letterbox;zoom-mode" window "statwindow" elem "statwindow"