From df7bbf79def3ed6cef87e1cdd8ced7ea0d0632e8 Mon Sep 17 00:00:00 2001 From: evilew Date: Wed, 13 Dec 2023 17:00:53 +0100 Subject: [PATCH] small tweaks - tried adding GATO badges to loadouts, might be borked though - small mapping tweaks --- .../RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm | 1 + _maps/RandomRuins/SpaceRuins/feeders_den.dmm | 4 ++-- modular_citadel/code/modules/client/loadout/backpack.dm | 9 +++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm index b8943352..88dfaa1d 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm @@ -281,6 +281,7 @@ /area/ruin/powered/gluttony) "R" = ( /obj/structure/statue/calorite/fatty, +/obj/item/book/granter/spell/fattening/transfer, /turf/open/floor/mineral/calorite/hide, /area/ruin/powered/gluttony) "S" = ( diff --git a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm index 2ea41f72..15fdc87a 100644 --- a/_maps/RandomRuins/SpaceRuins/feeders_den.dmm +++ b/_maps/RandomRuins/SpaceRuins/feeders_den.dmm @@ -108,7 +108,7 @@ "sq" = (/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) "su" = (/obj/machinery/icecream_vat,/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) -"sI" = (/obj/structure/sign/poster/contraband/eat{pixel_y = 32},/obj/structure/reagent_dispensers/keg/milk,/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) +"sI" = (/obj/structure/sign/poster/contraband/eat{pixel_y = 32},/obj/structure/reagent_dispensers/keg/milk,/obj/effect/turf_decal/loading_area{dir = 8; icon_state = "drain"; name = "drain"},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "sN" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/structure/reagent_dispensers/keg/milk,/turf/open/floor/plasteel,/area/ruin/space/has_grav/feedersden) "sR" = (/obj/effect/turf_decal/tile/bar,/obj/effect/turf_decal/tile/bar{dir = 1},/obj/machinery/vending/dinnerware{free = 1},/turf/open/floor/plasteel/dark,/area/ruin/space/has_grav/feedersden) "sT" = (/obj/structure/sign/poster/contraband/eat{pixel_y = 32},/obj/structure/chair/sofachair,/turf/open/floor/mineral/basaltstone_floor,/area/ruin/space/has_grav/feedersden) @@ -195,7 +195,7 @@ "Hp" = (/obj/structure/reagent_dispensers/keg/mead,/turf/open/floor/plating,/area/ruin/space/has_grav/feedersden) "HQ" = (/obj/structure/sign/poster/contraband/chonk,/turf/closed/wall/r_wall/syndicate,/area/ruin/space/has_grav/feedersden) "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/wood,/area/ruin/space/has_grav/feedersden) +"It" = (/obj/machinery/cryopod/feederden{dir = 8},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/wood,/area/ruin/space/has_grav/feedersden) "IC" = (/obj/machinery/atmospherics/pipe/manifold/supply{dir = 8},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{piping_layer = 3; pixel_x = 5; pixel_y = 5},/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment,/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) diff --git a/modular_citadel/code/modules/client/loadout/backpack.dm b/modular_citadel/code/modules/client/loadout/backpack.dm index bc112626..5b34791e 100644 --- a/modular_citadel/code/modules/client/loadout/backpack.dm +++ b/modular_citadel/code/modules/client/loadout/backpack.dm @@ -1,3 +1,5 @@ + + /datum/gear/plushcarp name = "Space carp plushie" category = SLOT_IN_BACKPACK @@ -260,3 +262,10 @@ name = "Waistcoat" category = SLOT_IN_BACKPACK path = /obj/item/clothing/accessory/waistcoat + +/datum/gear/gato_middleman //GS13 - I'll move this elsewhere eventually, it was a last minute change!! I promise :333 + name = "GATO Middleman Badge" + category = SLOT_IN_BACKPACK + path = /obj/item/clothing/accessory/medal/gato_badge/middleman + ckeywhitelist = list("sonoida, Sonoida, JohnJimJim") + cost = 1