diff --git a/GainStation13/code/mobs/chocoslime.dm b/GainStation13/code/mobs/chocoslime.dm index 907b2080a9..c9453b270d 100644 --- a/GainStation13/code/mobs/chocoslime.dm +++ b/GainStation13/code/mobs/chocoslime.dm @@ -90,3 +90,42 @@ if(HAS_TRAIT(L, TRAIT_VORACIOUS)) fullness_add = fullness_add * 0.67 L.fullness += (fullness_add) + + + +//should probably put this in elsewhere or whatever, but for now it'll do + +/mob/living/simple_animal/hostile/fatten/magehand + name = "Magehand" + desc = "It's a floating mage hand of strange, crackling orange energy..." + icon = 'GainStation13/icons/mob/fathand.dmi' + icon_state = "fathand" + icon_living = "fathand" + icon_dead = "fathand_dead" + speak_emote = list("crackles") + emote_hear = list("crackles") + speak_chance = 5 + turns_per_move = 5 + aggro_vision_range = 10 + see_in_dark = 10 + maxHealth = 50 + health = 50 + del_on_death = TRUE + movement_type = FLYING + attack_verb_continuous = "fattens" + attack_verb_simple = "fattens" + pass_flags = PASSTABLE + move_to_delay = 2 + attack_sound = 'sound/weapons/pulse.ogg' + unique_name = 1 + faction = list("cult") + lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE + +/mob/living/simple_animal/hostile/fatten + var/fat_per_hit = 30 + +/mob/living/simple_animal/hostile/fatten/AttackingTarget() + . = ..() + var/mob/living/carbon/L = target + if(L.client?.prefs?.weight_gain_magic) + L.adjust_fatness(fat_per_hit) diff --git a/GainStation13/code/obj/items/minor_items.dm b/GainStation13/code/obj/items/minor_items.dm index 8d32620d1c..7eae2c6f04 100644 --- a/GainStation13/code/obj/items/minor_items.dm +++ b/GainStation13/code/obj/items/minor_items.dm @@ -238,3 +238,40 @@ volume = 250 custom_materials = list(/datum/material/plastic=1000) w_class = WEIGHT_CLASS_HUGE + + +//weapon prefabs + +/obj/item/melee/curator_whip/fattening + name = "calorite-lined whip" + desc = "The whip seems to glisten with an orange gleam inbetween its threads." + damtype = "fat" + attack_verb = list("fattened") + force = 40 + +/obj/item/melee/curator_whip/permafattening + name = "galbanic whip" + desc = "How can a whip even be infused galbanic? No one knows." + damtype = "perma_fat" + attack_verb = list("fattened") + force = 20 + +/obj/item/gavelhammer/fattening + desc = "Some madman managed to create a weapon out of calorite... Luckily, it has a rubber handle for you to wield." + name = "Calorite Hammer" + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "toyhammer" + damtype = "fat" + throwforce = 40 + force = 60 + attack_verb = list("fattened") + +/obj/item/gavelhammer/permafattening + desc = "You may ask yourself - how did someone make a hammer out of a chemical? The answer is clear: no one knows." + name = "Permafat Hammer" + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "toyhammer" + damtype = "perma_fat" + throwforce = 10 + force = 20 + attack_verb = list("fattened") diff --git a/GainStation13/icons/mob/fathand.dmi b/GainStation13/icons/mob/fathand.dmi new file mode 100644 index 0000000000..ab9a763435 Binary files /dev/null and b/GainStation13/icons/mob/fathand.dmi differ diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_caloritealtar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_caloritealtar.dmm index 9da95ae05c..82bb4ee305 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_caloritealtar.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_caloritealtar.dmm @@ -1,6 +1,6 @@ "a" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors) "c" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"d" = (/obj/structure/cursedfatfountain,/turf/open/floor/mineral/calorite/dance,/area/ruin/powered/gluttony) +"d" = (/obj/structure/table/bronze,/obj/item/melee/curator_whip,/turf/open/floor/mineral/calorite/dance,/area/ruin/powered/gluttony) "i" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) "j" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/machinery/light{dir = 4; color = "#ffa500"},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) "k" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) @@ -25,6 +25,7 @@ "O" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/mineral/calorite/hide,/area/ruin/powered/gluttony) "P" = (/turf/open/lava/smooth/lava_land_surface,/area/ruin/powered/gluttony) "R" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/structure/railing{color = FFA500; dir = 4},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"S" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/structure/cursedfatfountain,/turf/open/floor/plasteel,/area/ruin/powered/gluttony) "T" = (/obj/effect/turf_decal/tile/brown{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) "U" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 4},/obj/structure/railing{color = FFA500; dir = 1},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) "V" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/structure/mineral_door/calorite,/turf/open/floor/mineral/calorite/hide,/area/ruin/powered/gluttony) @@ -46,7 +47,7 @@ yyyPPKOKPPyyy yyyyKKOKKyyyy yyyKKIOIKKyyy yyyKoJvWoKyyy -yyyKMlvRGKyyy +yyyKMlSRGKyyy yyyKUNvsUKyyy yyyKKNvsKKyyy ayyyKkvzKyyyy diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_caloriteshrine.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_caloriteshrine.dmm index b6a52b0213..1afd2b3f06 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_caloriteshrine.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_caloriteshrine.dmm @@ -3,9 +3,10 @@ "bt" = (/turf/open/floor/mineral/calorite,/area/ruin/unpowered/caloriteshrine) "ch" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/item/chair/wood,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "cs" = (/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) -"da" = (/obj/structure/table/wood/fancy,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/structure/statue/fatso{pixel_y = 11},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"da" = (/obj/structure/table/wood/fancy,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/item/gavelhammer/fattening,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "de" = (/turf/open/indestructible/cobble/side,/area/lavaland/surface/outdoors) "eF" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 2},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"gs" = (/obj/structure/statue/fatso{pixel_y = 11},/turf/open/floor/mineral/calorite,/area/ruin/unpowered/caloriteshrine) "gI" = (/obj/structure/chair/sofa/right/old,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "hd" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "ho" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) @@ -21,6 +22,7 @@ "ok" = (/obj/item/trash/cheesie,/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "oH" = (/obj/structure/table/bronze,/obj/item/trash/plate{pixel_y = 2},/obj/item/trash/plate{pixel_y = 5},/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "pw" = (/obj/structure/mineral_door/calorite,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"pF" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow,/obj/item/reagent_containers/food/drinks/bigbottle/fizz{pixel_x = -16; pixel_y = 8},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "pI" = (/obj/effect/decal/cleanable/ash/large,/turf/open/floor/plating/asteroid/basalt,/area/template_noop) "pV" = (/turf/open/floor/plating/asteroid/basalt,/area/template_noop) "qX" = (/obj/item/borg/upgrade/fatoray,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) @@ -38,6 +40,7 @@ "uL" = (/obj/structure/chair/sofa/corner/old,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "vN" = (/obj/structure/table/wood/fancy/orange,/obj/item/reagent_containers/food/snacks/burger/rib,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "wt" = (/obj/item/trash/blueberry_gum,/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"xB" = (/obj/structure/table/wood/fancy/orange,/obj/item/reagent_containers/food/drinks/bigbottle/spaceup{pixel_y = 20},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "xI" = (/turf/open/indestructible/cobble/side{dir = 8},/area/lavaland/surface/outdoors) "xY" = (/turf/open/indestructible/cobble,/area/lavaland/surface/outdoors) "yr" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) @@ -48,6 +51,7 @@ "AQ" = (/obj/structure/chair/bronze,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "Bz" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/structure/trap/fattening,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "CT" = (/obj/machinery/grill,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) +"DJ" = (/obj/structure/table/bronze,/obj/item/reagent_containers/food/drinks/bigbottle/cola{pixel_y = 6; pixel_x = 8},/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "FP" = (/obj/item/trash/blueberry_gum,/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "FU" = (/turf/open/floor/plating/asteroid/basalt,/area/lavaland/surface/outdoors) "Go" = (/turf/open/indestructible/cobble/corner{dir = 4},/area/lavaland/surface/outdoors) @@ -73,6 +77,8 @@ "TL" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 2},/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "TW" = (/obj/structure/statue/calorite/fatty{anchored = 1},/obj/item/flashlight/lantern{anchored = 1; icon_state = null; icon = null},/turf/open/floor/mineral/calorite/strong,/area/ruin/unpowered/caloriteshrine) "Ul" = (/obj/item/trash/waffles,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"Vx" = (/obj/structure/table/bronze,/obj/item/reagent_containers/food/drinks/bigbottle/cola{pixel_y = 8; pixel_x = -4},/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) +"VI" = (/obj/item/reagent_containers/food/drinks/bigbottle/starkist{pixel_x = -10; pixel_y = -8},/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "VL" = (/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "Wa" = (/obj/item/candle/infinite,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "Wt" = (/obj/effect/decal/cleanable/ash/large,/turf/open/floor/plating/asteroid/basalt,/area/lavaland/surface/outdoors) @@ -95,17 +101,17 @@ mRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRpVTnmRmRmRmRmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRmRmRmRmRmRpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVmRmRmRmRmRmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRmRmRmRpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVmRmRmRmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRmRmRpVpVpVpVpVpVAqAqAqAqAqAqAqAqAqAqAqpVpVpVpVpVpVmRmRmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRmRpVpVpVpVpVAqAqAqAqbtbtbtbtbtbtbtbtbtAqAqAqAqpVpVpVmRmRmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRmRpVpVpVpVpVAqAqAqAqbtbtbtbtgsbtbtbtbtAqAqAqAqpVpVpVmRmRmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRpVpVpVpVAqAqbtbtbtJxSwBzZLdaZLBzSwkBbtbtbtAqAqpVpVpVmRmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRpVpVpVpVAqbtYeSwSwkFTWcssfsfsfcsTWaFSwSwkBbtAqTnpVpVmRmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRpVpVpVAqAqbthdcscsQMPaPaPaPaPaPaPahocscseFbtAqAqpVpVpVmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRpVpVAqAqbtYecscsAqyrlynWlyAQlyyRlyhdAqcsYMsqbtAqAqpVTnmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRpVTnAqbtwtcsgIYzuLyrsuWNrhkzAdkzsAhdSUcscsYMTLbtAqpVpVmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRpVpVAqAqbthdTWZUvNkGyrlykzWaCTWaPYlyhdcsOccsTWeFbtAqAqpVmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRpVpVAqAqbthdTWZUvNkGpFlykzWaCTWaPYVIhdcsOccsTWeFbtAqAqpVmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRpVpVAqbtYekFcscsSUUlyrsuQKlykflyoHlyhdcsgIRVcsaFVLbtAqpVmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRpVpVAqbthdcsAqcscscsyrlyWzlykfmSQTlychcsXXsaAqcsNIbtAqpVmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRpVpVAqbthdqXAqcscscsJCsukzuDlyWakzlyokcsZUsaAqcsNIbtAqpVmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRpVpVAqbtushocscscscsyrlysIkzlyWzkzsAhdcsZUkGcsQMaGbtAqpVmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRpVpVAqbthdqXAqcscscsJCsuDJuDlyWakzlyokcsZUsaAqcsNIbtAqpVmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRpVpVAqbtushocscscscsyrlysIkzlyWzVxsAhdcsxBkGcsQMaGbtAqpVmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRpVpVAqAqbthdTWcscsAqyrlytVtVlytVtVlyhdAqcscsTWyrbtAqAqpVmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRpVpVpVAqbtushocscscsaFSwSwSwSwSwSwSwkFRGcscsQMNrbtAqpVpVmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRpVpVTnAqAqbtFPPaPaPahoTWcscscscscsTWQMPaPaPasYbtAqAqpVpVmRmRmRmRmRmRmRmRmR diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index cd4c617dae..8131d95e93 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -2863,7 +2863,7 @@ "bef" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/blue,/obj/effect/turf_decal/tile/blue{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "beg" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/public/glass{dir = 4; name = "Chapel"},/turf/open/floor/carpet,/area/service/chapel/main) "beh" = (/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/starboard) -"bei" = (/obj/machinery/camera{c_tag = "Starboard Primary Hallway"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/obj/effect/turf_decal/vg_decals/department/bar{pixel_y = 32},/turf/open/floor/plasteel,/area/hallway/primary/starboard) +"bei" = (/obj/machinery/camera{c_tag = "Starboard Primary Hallway"},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "bej" = (/obj/machinery/vending/hydronutrients,/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/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/service/hydroponics) "bek" = (/obj/machinery/light{dir = 1; pixel_y = 16},/obj/effect/turf_decal/loading_area{dir = 1; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "bel" = (/obj/machinery/vending/hydroseeds{slogan_delay = 700},/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/tile/neutral{dir = 8},/turf/open/floor/plasteel/dark,/area/service/hydroponics) @@ -3460,7 +3460,7 @@ "bpR" = (/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/wood,/area/command/heads_quarters/captain) "bpS" = (/obj/structure/extinguisher_cabinet{pixel_y = -30},/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "bpT" = (/obj/machinery/door/airlock/public/glass{dir = 4; name = "Central Access"},/obj/machinery/door/firedoor,/turf/open/floor/plasteel,/area/hallway/primary/starboard) -"bpU" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/obj/machinery/door/firedoor/border_only{dir = 8},/obj/effect/turf_decal/vg_decals/department/med{pixel_y = -32},/turf/open/floor/plasteel,/area/hallway/primary/starboard) +"bpU" = (/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/obj/machinery/door/firedoor/border_only{dir = 8},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "bpV" = (/obj/effect/turf_decal/tile/blue,/obj/machinery/light,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/starboard) "bpW" = (/obj/structure/bodycontainer/morgue{dir = 8},/obj/machinery/camera{c_tag = "Medbay Morgue"; dir = 6; network = list("ss13","medbay")},/turf/open/floor/plasteel/dark,/area/medical/morgue) "bpX" = (/obj/effect/landmark/event_spawn,/obj/effect/turf_decal/loading_area{icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel/white/corner,/area/hallway/primary/starboard) @@ -4826,7 +4826,7 @@ "bQu" = (/obj/machinery/computer/security/qm{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel/dark,/area/cargo/qm) "bQv" = (/obj/machinery/computer/cargo{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/turf/open/floor/plasteel/dark,/area/cargo/qm) "bQw" = (/obj/machinery/computer/bounty{dir = 1},/obj/machinery/light{dir = 4},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel/dark,/area/cargo/qm) -"bQx" = (/obj/machinery/camera{c_tag = "Mining Dock"; dir = 4},/obj/machinery/light{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/vg_decals/department/mining{pixel_x = -32},/turf/open/floor/plasteel,/area/cargo/miningdock) +"bQx" = (/obj/machinery/camera{c_tag = "Mining Dock"; dir = 4},/obj/machinery/light{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel,/area/cargo/miningdock) "bQy" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/cable{icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 5},/turf/open/floor/plasteel,/area/cargo/miningdock) "bQz" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel,/area/cargo/miningdock) "bQA" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/open/floor/plasteel/stairs{dir = 4},/area/cargo/miningdock) @@ -7546,7 +7546,6 @@ "oGS" = (/obj/machinery/hydroponics/soil,/obj/effect/turf_decal/tile/green{dir = 1},/obj/effect/turf_decal/tile/green{dir = 8},/obj/effect/turf_decal/tile/green,/turf/open/floor/plasteel,/area/security/prison/upper) "oHH" = (/obj/effect/turf_decal/tile/bar{dir = 4},/obj/effect/turf_decal/tile/bar{dir = 1},/obj/effect/turf_decal/tile/bar,/turf/open/floor/plasteel/dark,/area/service/chapel/main) "oNI" = (/obj/structure/chair{dir = 1},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 6},/turf/open/floor/plasteel,/area/security/processing) -"oOY" = (/obj/effect/turf_decal/vg_decals/department/sec,/turf/closed/wall/r_wall,/area/security/warden) "oPU" = (/obj/structure/chair/comfy/plywood,/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb{pixel_y = -7; pixel_x = -18},/turf/open/floor/grass,/area/security/courtroom) "oRB" = (/obj/machinery/atmospherics/pipe/manifold/supply/hidden{dir = 1},/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "1-4"},/turf/open/floor/plasteel/dark,/area/security/execution/transfer) "oSG" = (/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/tile/neutral{dir = 1},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/airlock/grunge{name = "Prison Laundry"; wiretypepath = /datum/wires/airlock/security},/turf/open/floor/plasteel/dark,/area/security/prison/upper) @@ -7923,7 +7922,7 @@ byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaadaaaaaaaadaaaajJakpajJaaaaaaaadaaaaaaaadaaaaaaaaaakTakTakTakTakTakTaaaaaaaaaaaaaaaaaaaaaaiIaiIxdcaimlUCakYaiUaksaktakuaksagdakvxXbakzagdakBajsakzagdakBakyafgagdakCakDakCaggakFntsakGakHgcbakIakJakKaggajIakMsemakoakoakOakPalnajdaiEbiQamGaDmaDnaqGaswasyaszhuUxxKbiSapRasAapRhuUxxKbiSasBbiOaadatJaaaatJatJatJatJaceatJatJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaadaaaaaaaadajJajJakSajJajJaaaaadaaaaaaaadaaaaaaaaaalzuMnbjaskyamiakTaaaaaaaaaaaaaaaaaaaaadcwakVanpakrxgzakYaiUiTKpDuakZqOCagdofualbaijalcofualbaijalcofualbyfzalfalgaletGcalhalialjxiBwdyfzNpjsallalmaggalnaloalralralralralsdCpajdvznbjcaqGanfangaqGasDasEaszbiTbiUllUjEmbiVwsqllUbiUbiWasBbiOaaaaaeaaeaaeaaaaaaaaaaceaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaltalualtaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaadaaaaaaaadalvalwalxalyalvalzalzalzalzalzalzalzalzalzamiamiamialAakTaaaaaaaaaaaaaaaaaaaaaaiIaiIaiIamAhIsbhWaiUalEalFdjAwceagdmRJalIvXKalNfTValKpfEalNajNalMdkIalNgWDhBVaczalPalQalRryPalkaexaggalUalVaggalnalXalZalZalZalZalWalnajdjouasCaqGaqGaqGaqGapPapQaszarKbiXbiYarDarDarDbiYarDbiZasBbiOaaaatJaaaatJaaaaadanIambanIaadaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaltamcaltaadaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG -byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalvamdameamfalvamgamgalzamhbjaamjalzamkalzqnPovQaRSamialzaaaaaaaaaaaaaaaaaaaaaaaaatJamnaiHabfijKaiUaiUaiUaiUaiUaiUamramsabGaiUamramuabGaiUamramuabGaiUirCajXamvaggamzamyamzaggaggaggoOYaggaggalpamCdUOajcajEakQlQfxovaneamEaiFaiVatvbjdatwreSbjfaszarKarDarDarDarDarDarDarDbiZatxaqGaaaatJaaaatJaaaaadamaamHamaaadaadaadaadaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaltamIaltaadaaaaadaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG +byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaadaadaadaaaaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaacaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalvamdameamfalvamgamgalzamhbjaamjalzamkalzqnPovQaRSamialzaaaaaaaaaaaaaaaaaaaaaaaaatJamnaiHabfijKaiUaiUaiUaiUaiUaiUamramsabGaiUamramuabGaiUamramuabGaiUirCajXamvaggamzamyamzaggaggaggaggaggaggalpamCdUOajcajEakQlQfxovaneamEaiFaiVatvbjdatwreSbjfaszarKarDarDarDarDarDarDarDbiZatxaqGaaaatJaaaatJaaaaadamaamHamaaadaadaadaadaaaaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaltamIaltaadaaaaadaaaaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamJamJamJamJamJamJamJamJamJamJamJaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaalvamKamLamMalvamNamOaziamQamiamRalzalzalzakTalzakTamPalzalzaaaaaaaaaaaaaaaaaaaiIaiIaiIozbaeIahZamUamVaiHamXajLtioanaanaanaanbanaanaanaanbanaanaanauOWamZhnfamZkkqanaanaalLandandandiyNandaneamBflsnaRajEajEbjblzbalnapavKcxeRlQqaflbjebjebjebjfatKrWEbjkarDarDbjlarDarDaDMaKtauvaqGaadaaeaaeaaeaadanIanIanianIanIaaaaaaaadaaaaaaaadaaaaaaaaaaaaaaaaadatJaaaaltamIaltaadaadaadaadaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamJanjanjanjanjanjanjanjanjanjamJaadaaaaaaaaaaaaaaaaaaaaaaaaaadaaaaaaaaaaaaaaaaaaalvalvankanlalvanmamialzamiamiamiaziamiamiannamialBamSaoEakTaaaaaaaaaaaaaaafANdcwakVanpakrfORanrajDjOsafblFuanbanbanbanbanbanbanbanuanbanbanbanbanbanbanbanvanbanbanbanwanbanbanbanbanbanbanxalnanyaiXanAanBaiXanzamBaneamEanFaiVlfCbjenWVbjebjjgYUarKarDarDarDarDarDarDarDbiZavEaqGaaaatJaaaatJaaaanIanJanKanLanIaaaaaaaadaaaaaaaadaaaaadaaaaaaaaaatJaltaltaltamIaltaltaltaltaltaltaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG byGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamJanjanjanjanjanjanjanjanjanjamJamJanMamJamJaadaaaaaaaaaaaaalzalzalzalzalzaadaadalzanNanOanPanQamOalzalzakTakTalzalzalzalzakTalzalzamialzalzaaaaaaaaaaaaaaaaaaaiIaiIaiIdHZanTanTanUanVaiHanXanYanYanYanYanYanYanZaoaanYanYanYanYanYanYaalaoblYdaocafNaodaoeafNaofaogaohaoianeaojaokajdajdajdajdajdajdajdjouaolaqGaECbjebjebjebjfaszarKarDarDarDbjparDarDarDbiZasBbiOaaaatJaaaatJaaaanIaooaopaoqanIaaaaaaaadaaaaaaaadaaaaadaltalualtalualtaoramIamIamIamIamIamIaosaltaadaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyGbyG diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm index a3b4c4f755..611ab735b5 100644 --- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm +++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm @@ -84,7 +84,7 @@ . = ..() if(ishuman(mover)) var/mob/living/carbon/human/H = mover - if(H.nutrition >= NUTRITION_LEVEL_FAT) + if(H.fatness >= 1000) //GS13 edit - having over 1000 BFI lets you through H.visible_message("[H] pushes through [src]!", "You've seen and eaten worse than this.") return TRUE else