From 5c149e7084146f4f8b0d4c0b814ef395a9f42f6e Mon Sep 17 00:00:00 2001
From: evilew <mipsio117@gmail.com>
Date: Sun, 19 Jan 2025 21:31:57 +0100
Subject: [PATCH] detailing out mage hand

- adding fat mage hands to maps
- finishing work on fattening mage hand
---
 GainStation13/code/mobs/chocoslime.dm         |  11 ++++----
 GainStation13/icons/mob/fathand.dmi           | Bin 659 -> 576 bytes
 .../lavaland_surface_caloritealtar.dmm        |   6 ++---
 .../lavaland_surface_caloriteshrine.dmm       |  13 ++++++----
 _maps/map_files/Mining/Lavaland_Lower.dmm     |  24 +++++++++++++-----
 5 files changed, 35 insertions(+), 19 deletions(-)

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 ab9a7634356e263759270c15fef3a8fc39c70a8f..ef601cd1237cd6dcc6ab47a100b93d13eaedc70c 100644
GIT binary patch
delta 509
zcmbQtdVnRkGr-TCmrII^fq{Y7)59eQNGE_W3p0=u*p|f&q(lRJLR=3VIIyQk`*EMm
ziWKEn3!|>LnmwQD=BSx#1XRFS666=m;PC858j#aGG19+Y)lSva(6zJMSatIXi6zs!
zjn`@znu{JWI}*?nklwN6oQTG(S(76;g|0O^>7}xU+ly~F%<$S!r&oSbh!fB}FHaZ8
zkcif|Q#a-vGLUHDJ;gksqfD>tY|o@s#i^a|Jg<l+Joqcmxb4RMoqm$5yr%Add+vX|
znWROs)>N;hK`Z~%>*oHx@#omhyUvWi?Rq}8v3y|q{q7!LD?_Bk_hJcd#!U~}4}SMn
zVJ=C0akr*VOkl#o?S~(J$!)kWYx&8u9~WO{SZG~(kN5OqQ-(KpQ`C3!7&ugXJDy-a
zot5py<U?PJdc-6Ya&~ps@7429aL7yERMwLsHR0}u_}vj|jF!8;m@CyQl(%}G-+jq_
z*XCI66M_ruyDs+{o|JxaD!xHKX6c`)TK`#IvP)gK#BZ`<seFcmxBUfyvvm`WEljib
zcpR`<eo5gHhb8hEOQL=?vTgms%$o&Nd<CjF0I2u`&jR_36t)ZeCMgb3C6XM^j*2|o
v_($CQX|0fn;^u{VaTWG=*KL2$zk`wONbte3i4vy3$YJnw^>bP0l+XkK_aNAt

delta 592
zcmV-W0<ZnR1d|0>iBL{Q4GJ0x0000DNk~Le0001h0001B1Oos704G#udH?_b8&FJC
zMZmzo(qA#(jchVTR+B;?QE-PrT5s>jw!px^!)8*+00001bW%=J06^y0W&i*HgppHE
ze?^IlGbOXA7${=M#hF%=n41b>n*&8ta}p~-!a7J0LwkHmY9f*uCP-!&aw#jg`niA|
z2LL!=ElJ5VC6)jH0hUQbK~z|U?Uk`k!!Q&@U(|en?HaMxkx|xG6`ku~DKkI8P8R<@
z4pe}zL!P593_e4p8(p8YO{7coZxHtie-3vF8?#Y}d4HNeWw{XZNsHtZCrooZJJ>5V
z{`~#LIAN0KUhA%;^~14LnB@Igh_-X2t+^HnF<;)CXeUj><coxucdtgfX0&p&R3yaQ
zD&J{28h;b8Ld@j#X#L|P<FyiDb^}3joMa#Rn}8EyCMB&3eF(w0A|d9+de?<8e|1I<
zLKFxwYbRAa9xuEP#uNxKUsNAV%u@*3zX(>C-Qc4Apu&8m3)UQ2A!d5E@qg_iQW^bp
zWQCY%7vCnQjErc1E)YWgdbIO#?>}EmPKf#TXe0E)nh^6cE5fDB1Hvp<Du2MOF?-;^
z<P0dRukiv{SY6{Ku&}zuOC$wuZjCdbz^!ox7PvLee?Ju1HAbMot}%iIc8!s&z^ri&
z6u33czyi0%8Bk!?7{LO&#t0VJHAb=nC2O1rpis8Pzre!gHC`%gUgNB=d5!B_S1OfC
erBbO>5<URwu>|Fr`>)9W0000<MNUMnLSTY}5&cd8

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