From ca2cf144e9adc128bd4f40a4eeb67f9e44c02b8d Mon Sep 17 00:00:00 2001 From: Chloe Date: Thu, 8 Jul 2021 16:02:20 +0100 Subject: [PATCH] [Ready] [Modular] Shameless Lizard Buff (Mining Change) (#6744) * lizard * farther of lies, cum in disguise * Update ice demon.dm * a * Update code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm a Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> --- .../hostile/mining_mobs/ice demon.dm | 2 +- .../items/mining/equipment/kinetic_crusher.dm | 22 ++++++++++++++++++ .../icons/obj/lavaland/artefacts.dmi | Bin 0 -> 721 bytes tgstation.dme | 1 + 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 modular_skyrat/modules/modular_items/code/game/objects/items/mining/equipment/kinetic_crusher.dm create mode 100644 modular_skyrat/modules/modular_items/icons/obj/lavaland/artefacts.dmi diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm index 7eaa16b1bce..7cab4c286ce 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/ice demon.dm @@ -34,7 +34,7 @@ pull_force = MOVE_FORCE_VERY_STRONG del_on_death = TRUE loot = list() - crusher_loot = /obj/item/crusher_trophy/watcher_wing/ice_wing + crusher_loot = list(/obj/item/crusher_trophy/demon_core = 1) /// SKYRAT EDIT CHANGE - ORIGINAL : crusher_loot = /obj/item/crusher_trophy/watcher_wing/ice_wing deathmessage = "fades as the energies that tied it to this world dissipate." deathsound = 'sound/magic/demon_dies.ogg' stat_attack = HARD_CRIT diff --git a/modular_skyrat/modules/modular_items/code/game/objects/items/mining/equipment/kinetic_crusher.dm b/modular_skyrat/modules/modular_items/code/game/objects/items/mining/equipment/kinetic_crusher.dm new file mode 100644 index 00000000000..24a2ef577cc --- /dev/null +++ b/modular_skyrat/modules/modular_items/code/game/objects/items/mining/equipment/kinetic_crusher.dm @@ -0,0 +1,22 @@ +//////////////////////////Demonic Watcher - Start////////////////////////// +/obj/item/crusher_trophy/demon_core + name = "demonic core" + desc = "The chipped core of a demonic watcher, it gently hums with weak bluespace energy." + icon = 'modular_skyrat/modules/modular_items/icons/obj/lavaland/artefacts.dmi' + icon_state = "demon_core" + denied_type = /obj/item/crusher_trophy/demon_core + +/obj/item/crusher_trophy/demon_core/effect_desc() + return "mark detonation to normalise your body and core temperature" + +/obj/item/crusher_trophy/demon_core/on_mark_detonation(mob/living/target, mob/living/user) + user.bodytemperature = user.get_body_temp_normal() + if(ishuman(user)) + var/mob/living/carbon/human/humi = user + humi.coretemperature = humi.get_body_temp_normal() + ..() + +/mob/living/simple_animal/hostile/asteroid/ice_demon/spawn_crusher_loot() + for(var/item_path in crusher_loot) + new item_path(loc) +//////////////////////////Demonic Watcher - End////////////////////////// diff --git a/modular_skyrat/modules/modular_items/icons/obj/lavaland/artefacts.dmi b/modular_skyrat/modules/modular_items/icons/obj/lavaland/artefacts.dmi new file mode 100644 index 0000000000000000000000000000000000000000..338168f00922e64a539e87f44aee69e0371cb708 GIT binary patch literal 721 zcmV;?0xtcDP)V=-0C=1w$Gr-GAQT4B+4~e9wMT!eOBmr$uMm;9bWlO1UcaI3oEp=-=nZPs z^l-{921txeOX78=SV#;#3Cr%bpBk zy?1%vkaRkYYRXep_ZmPA;6DJ=xf#5Am!zy`Wx+X$?5Oc4OM?hnxY^fsOp2>`$a{HEhe+$%;) zB2ghmOQK~&m=TD`sb#ety-d(}W)Dw_1TNrbn(M)m*(N3tl(^FgtK^b3ORmJd{2W{B53TY6cnV7}VNk+rc~oWx@No z-|%abTSa1RYT-+N>0|>fUF|5`KQP~Mm58iXuNtaXwQZ+g&xB5mD+b_JjsV_r#p(i7 zQcQsG_#B!@!?*iyxuUCxBzAUx1^@um>p>$gXnp-B=mbJdMn3{LINj3PW~tXI9joRC zr$^w#Cd+ZAi746|A`v-7=Z9tiJR-5PrLA5yw#$g|%ozj#69dEU0HVDi0^p;r-{f%J zAE2I2KYXPZ0MN3d)K<@&lr!|LDx&RIaCp24kMykd8+qZ&xiD(IXNJUlK_cW8NFr}r zj+xa^uZWzY-7