diff --git a/GainStation13/code/mobs/chocoslime.dm b/GainStation13/code/mobs/chocoslime.dm index c9453b270d..fae2ad040f 100644 --- a/GainStation13/code/mobs/chocoslime.dm +++ b/GainStation13/code/mobs/chocoslime.dm @@ -108,17 +108,18 @@ turns_per_move = 5 aggro_vision_range = 10 see_in_dark = 10 - maxHealth = 50 - health = 50 + maxHealth = 20 + health = 20 del_on_death = TRUE movement_type = FLYING - attack_verb_continuous = "fattens" - attack_verb_simple = "fattens" + attack_verb_continuous = "pokes" + attack_verb_simple = "pokes" + a_intent = INTENT_HARM pass_flags = PASSTABLE move_to_delay = 2 attack_sound = 'sound/weapons/pulse.ogg' unique_name = 1 - faction = list("cult") + faction = list(ROLE_WIZARD) lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE /mob/living/simple_animal/hostile/fatten diff --git a/GainStation13/icons/mob/fathand.dmi b/GainStation13/icons/mob/fathand.dmi index ab9a763435..ef601cd123 100644 Binary files a/GainStation13/icons/mob/fathand.dmi 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 82bb4ee305..4f9a05545d 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_caloritealtar.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_caloritealtar.dmm @@ -2,7 +2,7 @@ "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/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) +"j" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/machinery/light{dir = 4; color = "#ffa500"},/mob/living/simple_animal/hostile/fatten/magehand,/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) "l" = (/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/structure/railing{color = FFA500; dir = 8},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) "o" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow,/obj/structure/railing{color = FFA500},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) @@ -30,8 +30,8 @@ "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) "W" = (/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/brown{dir = 1},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"X" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/machinery/light{dir = 8; color = "#ffa500"},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) -"Y" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"X" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 4},/obj/machinery/light{dir = 8; color = "#ffa500"},/mob/living/simple_animal/hostile/fatten/magehand,/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) +"Y" = (/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 8},/mob/living/simple_animal/hostile/fatten/magehand,/turf/open/floor/plasteel/cult,/area/ruin/powered/gluttony) (1,1,1) = {" yyyyyyyyyyyyy diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_caloriteshrine.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_caloriteshrine.dmm index 1afd2b3f06..ef72b6abda 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_caloriteshrine.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_caloriteshrine.dmm @@ -10,6 +10,8 @@ "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) +"iJ" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow,/mob/living/simple_animal/hostile/fatten/magehand,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"jP" = (/mob/living/simple_animal/hostile/fatten/magehand,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "kf" = (/obj/structure/bonfire,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "kz" = (/obj/structure/table/bronze,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "kB" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 2},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) @@ -55,6 +57,7 @@ "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) +"Gv" = (/mob/living/simple_animal/hostile/fatten/magehand,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "IX" = (/obj/item/flashlight/lantern{anchored = 1; icon_state = null; icon = null},/turf/open/floor/plating/asteroid/basalt,/area/lavaland/surface/outdoors) "Jx" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/item/reagent_containers/food/drinks/soda_cans/fizzwiz,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "JC" = (/obj/item/trash/blueberry_gum,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) @@ -103,12 +106,12 @@ mRmRmRmRmRmRmRmRmRmRmRmRpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRmRmRpVpVpVpVpVpVAqAqAqAqAqAqAqAqAqAqAqpVpVpVpVpVpVmRmRmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRpVpVpVpVpVAqAqAqAqbtbtbtbtgsbtbtbtbtAqAqAqAqpVpVpVmRmRmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRpVpVpVpVAqAqbtbtbtJxSwBzZLdaZLBzSwkBbtbtbtAqAqpVpVpVmRmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRmRpVpVpVpVAqbtYeSwSwkFTWcssfsfsfcsTWaFSwSwkBbtAqTnpVpVmRmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRmRpVpVpVAqAqbthdcscsQMPaPaPaPaPaPaPahocscseFbtAqAqpVpVpVmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRmRpVpVAqAqbtYecscsAqyrlynWlyAQlyyRlyhdAqcsYMsqbtAqAqpVTnmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRmRpVpVpVpVAqbtYeSwSwkFTWcssfsfsfjPTWaFSwSwkBbtAqTnpVpVmRmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRmRpVpVpVAqAqbthdcscsQMiJPaPaPaPaPaPahocscseFbtAqAqpVpVpVmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRmRpVpVAqAqbtYecscsAqyrlynWlyAQGvyRlyhdAqcsYMsqbtAqAqpVTnmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRpVTnAqbtwtcsgIYzuLyrsuWNrhkzAdkzsAhdSUcscsYMTLbtAqpVpVmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRpVpVAqAqbthdTWZUvNkGpFlykzWaCTWaPYVIhdcsOccsTWeFbtAqAqpVmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRpVpVAqbtYekFcscsSUUlyrsuQKlykflyoHlyhdcsgIRVcsaFVLbtAqpVmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRpVpVAqAqbthdTWZUvNkGpFlykzWaCTWaPYVIhdcsOcjPTWeFbtAqAqpVmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRpVpVAqbtYekFcsjPSUUlyrsuQKlykflyoHlyhdcsgIRVcsaFVLbtAqpVmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRpVpVAqbthdcsAqcscscsyrlyWzlykfmSQTlychcsXXsaAqcsNIbtAqpVmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRpVpVAqbthdqXAqcscscsJCsuDJuDlyWakzlyokcsZUsaAqcsNIbtAqpVmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRpVpVAqbtushocscscscsyrlysIkzlyWzVxsAhdcsxBkGcsQMaGbtAqpVmRmRmRmRmRmRmRmRmR diff --git a/_maps/map_files/Mining/Lavaland_Lower.dmm b/_maps/map_files/Mining/Lavaland_Lower.dmm index 3556ae0971..b144346616 100644 --- a/_maps/map_files/Mining/Lavaland_Lower.dmm +++ b/_maps/map_files/Mining/Lavaland_Lower.dmm @@ -9495,6 +9495,10 @@ /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"zD" = ( +/mob/living/simple_animal/hostile/fatten/magehand, +/turf/open/floor/carpet/orange, +/area/lavaland/surface/outdoors) "zF" = ( /obj/structure/lattice/catwalk, /obj/structure/ore_box, @@ -13882,6 +13886,10 @@ /obj/structure/chair/stool, /turf/open/floor/plasteel/dark, /area/xenoarch/gen) +"RK" = ( +/mob/living/simple_animal/hostile/fatten/magehand, +/turf/open/floor/plating, +/area/lavaland/surface/outdoors) "RL" = ( /obj/structure/closet/crate{ icon_state = "crateopen" @@ -14247,6 +14255,10 @@ }, /turf/open/floor/plasteel, /area/xenoarch/gen) +"Td" = ( +/mob/living/simple_animal/hostile/fatten/magehand, +/turf/open/floor/plating/asteroid/basalt/lava_land_surface, +/area/lavaland/surface/outdoors) "Te" = ( /obj/structure/table/wood, /obj/item/trash/candle, @@ -46062,7 +46074,7 @@ ab ab Aw FN -DV +RK vZ Aw Aw @@ -47345,11 +47357,11 @@ lQ Ui lQ Aw -ZH +zD Aw Fo Aw -DV +RK Aw ab ab @@ -50262,7 +50274,7 @@ BP zm lQ lQ -lQ +Td lQ lQ lQ @@ -59250,7 +59262,7 @@ vx ab lQ lQ -lQ +Td lQ lQ lQ @@ -60802,7 +60814,7 @@ ab ab Mz lQ -lQ +Td lQ ab ab