From 4e9a39064c5bb7a95f5d388f1e5acf690481c82a Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Mon, 24 Jan 2022 19:24:57 -0800 Subject: [PATCH 01/14] i forgot how to make an pr again wait had to save it oops (ignore this i'm just stealing the vortex talisman code as a reference) --- .../mining/equipment/kinetic_crusher.dm | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index ee6e35106eca..def61af6948c 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -412,3 +412,31 @@ /obj/effect/temp_visual/hierophant/wall/crusher duration = 75 + +//Legion (Megafauna) +/obj/item/crusher_trophy/malformed_bone + name = "malformed bone" + desc = "A glowing trinket that was originally the Hierophant's beacon. Suitable as a trophy for a kinetic crusher." + icon_state = "vortex_talisman" + denied_type = /obj/item/crusher_trophy/malformed_bone + +/obj/item/crusher_trophy/malformed_bone/effect_desc() + return "mark detonation has a chance to trigger a second detonation" + +/obj/item/crusher_trophy/malformed_bone/on_mark_detonation(mob/living/target, mob/living/user) + var/turf/current_location = get_turf(user)//yogs added a current location check that was totally ripped from the hand tele code honk + var/area/current_area = current_location.loc //yogs more location check stuff + if(current_area.noteleport) //yogs added noteleport + to_chat(user, "[src] fizzles uselessly.") + return + var/turf/T = get_turf(user) + new /obj/effect/temp_visual/hierophant/wall/crusher(T, user) //a wall only you can pass! + var/turf/otherT = get_step(T, turn(user.dir, 90)) + if(otherT) + new /obj/effect/temp_visual/hierophant/wall/crusher(otherT, user) + otherT = get_step(T, turn(user.dir, -90)) + if(otherT) + new /obj/effect/temp_visual/hierophant/wall/crusher(otherT, user) + +/obj/effect/temp_visual/hierophant/wall/crusher + duration = 75 From 3685c25f64338666641fc2243bf028b9f05bae76 Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Mon, 24 Jan 2022 23:19:30 -0800 Subject: [PATCH 02/14] 'expected end of statement' shut up --- .../mining/equipment/kinetic_crusher.dm | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index def61af6948c..74e094bf83b9 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -416,27 +416,22 @@ //Legion (Megafauna) /obj/item/crusher_trophy/malformed_bone name = "malformed bone" - desc = "A glowing trinket that was originally the Hierophant's beacon. Suitable as a trophy for a kinetic crusher." + desc = "A piece of bone caught in the act of division. Suitable as a trophy for a kinetic crusher." icon_state = "vortex_talisman" denied_type = /obj/item/crusher_trophy/malformed_bone + bonus_value = 30 /obj/item/crusher_trophy/malformed_bone/effect_desc() return "mark detonation has a chance to trigger a second detonation" /obj/item/crusher_trophy/malformed_bone/on_mark_detonation(mob/living/target, mob/living/user) - var/turf/current_location = get_turf(user)//yogs added a current location check that was totally ripped from the hand tele code honk - var/area/current_area = current_location.loc //yogs more location check stuff - if(current_area.noteleport) //yogs added noteleport - to_chat(user, "[src] fizzles uselessly.") - return - var/turf/T = get_turf(user) - new /obj/effect/temp_visual/hierophant/wall/crusher(T, user) //a wall only you can pass! - var/turf/otherT = get_step(T, turn(user.dir, 90)) - if(otherT) - new /obj/effect/temp_visual/hierophant/wall/crusher(otherT, user) - otherT = get_step(T, turn(user.dir, -90)) - if(otherT) - new /obj/effect/temp_visual/hierophant/wall/crusher(otherT, user) - -/obj/effect/temp_visual/hierophant/wall/crusher - duration = 75 + var/datum/status_effect/crusher_damage/C + if(rand(1, 100) <= bonus_value && target.stat != DEAD) + if((user.dir & backstab_dir) && (L.dir & backstab_dir)) + C.total_damage += detonation_damage + backstab_bonus //cheat a little and add the total before killing it, so certain mobs don't have much lower chances of giving an item + L.apply_damage(detonation_damage + backstab_bonus, BRUTE, blocked = def_check) + playsound(user, 'sound/weapons/kenetic_accel.ogg', 100, 1) //Seriously who spelled it wrong + else + if(!QDELETED(C)) + C.total_damage += detonation_damage + L.apply_damage(detonation_damage, BRUTE, blocked = def_check) From c4807209016ee4574fa8bc9d5596c28520cb106f Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Mon, 24 Jan 2022 23:51:38 -0800 Subject: [PATCH 03/14] told legion to drop crusher trophy --- .../modules/mob/living/simple_animal/hostile/megafauna/legion.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 68bfc5c0ea70..5edd51a38605 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -42,6 +42,7 @@ Difficulty: Medium pixel_y = -90 pixel_x = -75 loot = list(/obj/item/stack/sheet/bone = 3) + crusher_loot = /obj/item/crusher_trophy/malformed_bone //leaving this here since if you dont start with the crusher you're probably not gonna finish with it vision_range = 13 wander = FALSE elimination = TRUE From 4b2c3da77a320988a4664c3a77bc20b2c11924cd Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Thu, 27 Jan 2022 09:01:12 -0800 Subject: [PATCH 04/14] fixed one error and got like 5 in return --- code/modules/mining/equipment/kinetic_crusher.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 74e094bf83b9..cf6dc46436c8 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -417,7 +417,7 @@ /obj/item/crusher_trophy/malformed_bone name = "malformed bone" desc = "A piece of bone caught in the act of division. Suitable as a trophy for a kinetic crusher." - icon_state = "vortex_talisman" + icon_state = "malf_bone" denied_type = /obj/item/crusher_trophy/malformed_bone bonus_value = 30 @@ -428,7 +428,7 @@ var/datum/status_effect/crusher_damage/C if(rand(1, 100) <= bonus_value && target.stat != DEAD) if((user.dir & backstab_dir) && (L.dir & backstab_dir)) - C.total_damage += detonation_damage + backstab_bonus //cheat a little and add the total before killing it, so certain mobs don't have much lower chances of giving an item + C.total_damage += detonation_damage + backstab_bonus //cheat a little and add the total before killing it, so certain mobs don't have much lower chances of giving an item L.apply_damage(detonation_damage + backstab_bonus, BRUTE, blocked = def_check) playsound(user, 'sound/weapons/kenetic_accel.ogg', 100, 1) //Seriously who spelled it wrong else From 1f1b7e47628efd173ffa2d080b84407d63d4dad1 Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Thu, 27 Jan 2022 09:36:03 -0800 Subject: [PATCH 05/14] Update artefacts.dmi --- icons/obj/lavaland/artefacts.dmi | Bin 29644 -> 30478 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/lavaland/artefacts.dmi b/icons/obj/lavaland/artefacts.dmi index 9c3b2490c833da838dbfeabe82746b62569a4403..8200901f1825a4a35476dc7e6a85cdb95f9feb40 100644 GIT binary patch delta 10113 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 PJIHM{?VGQ!TZH}}GoA%M delta 9273 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 Date: Sat, 29 Jan 2022 20:14:15 -0800 Subject: [PATCH 06/14] another 'thing that doesnt work dont mind this just updating --- code/modules/mining/equipment/kinetic_crusher.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index cf6dc46436c8..aab1c59965de 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -425,7 +425,7 @@ return "mark detonation has a chance to trigger a second detonation" /obj/item/crusher_trophy/malformed_bone/on_mark_detonation(mob/living/target, mob/living/user) - var/datum/status_effect/crusher_damage/C + . = ..() if(rand(1, 100) <= bonus_value && target.stat != DEAD) if((user.dir & backstab_dir) && (L.dir & backstab_dir)) C.total_damage += detonation_damage + backstab_bonus //cheat a little and add the total before killing it, so certain mobs don't have much lower chances of giving an item From c980c8625fc801c1191eabaf1e3e72aa02b36688 Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Thu, 3 Feb 2022 01:28:28 -0800 Subject: [PATCH 07/14] Update kinetic_crusher.dm the hell is . = ..() --- code/modules/mining/equipment/kinetic_crusher.dm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index aab1c59965de..8d3a36d0ae2a 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -424,14 +424,7 @@ /obj/item/crusher_trophy/malformed_bone/effect_desc() return "mark detonation has a chance to trigger a second detonation" -/obj/item/crusher_trophy/malformed_bone/on_mark_detonation(mob/living/target, mob/living/user) - . = ..() - if(rand(1, 100) <= bonus_value && target.stat != DEAD) - if((user.dir & backstab_dir) && (L.dir & backstab_dir)) - C.total_damage += detonation_damage + backstab_bonus //cheat a little and add the total before killing it, so certain mobs don't have much lower chances of giving an item - L.apply_damage(detonation_damage + backstab_bonus, BRUTE, blocked = def_check) - playsound(user, 'sound/weapons/kenetic_accel.ogg', 100, 1) //Seriously who spelled it wrong - else - if(!QDELETED(C)) - C.total_damage += detonation_damage - L.apply_damage(detonation_damage, BRUTE, blocked = def_check) +/obj/item/crusher_trophy/malformed_bone/on_mark_detonation(mob/living/target/L, mob/living/user) + .=..() + var/backstab_dir = get_dir(user, L) + CALLBACK(src, .proc/on_mark_detonation, L, user) From ceb8ec7573728d8f8de3b4eb1bc8804a76d828ed Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Thu, 3 Feb 2022 02:22:24 -0800 Subject: [PATCH 08/14] whatever ill try again later --- code/modules/mining/equipment/kinetic_crusher.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 8d3a36d0ae2a..71dddb57edf5 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -427,4 +427,4 @@ /obj/item/crusher_trophy/malformed_bone/on_mark_detonation(mob/living/target/L, mob/living/user) .=..() var/backstab_dir = get_dir(user, L) - CALLBACK(src, .proc/on_mark_detonation, L, user) + addtimer(CALLBACK(src, .proc/on_mark_detonation, L, user), 1) From aa7e7478379466a7a3482b71458c86db6a1ff8ca Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Thu, 3 Feb 2022 22:28:03 -0800 Subject: [PATCH 09/14] less errors buyt thats probably a step backwards --- code/modules/mining/equipment/kinetic_crusher.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 71dddb57edf5..cea29db99473 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -424,7 +424,6 @@ /obj/item/crusher_trophy/malformed_bone/effect_desc() return "mark detonation has a chance to trigger a second detonation" -/obj/item/crusher_trophy/malformed_bone/on_mark_detonation(mob/living/target/L, mob/living/user) +/obj/item/crusher_trophy/malformed_bone/on_mark_detonation(mob/living/target, mob/living/user) .=..() - var/backstab_dir = get_dir(user, L) addtimer(CALLBACK(src, .proc/on_mark_detonation, L, user), 1) From a3752e274b3222395c4540e8f8c20fa1605aefc5 Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Thu, 3 Feb 2022 23:13:03 -0800 Subject: [PATCH 10/14] why did i remove the fuckin chance line --- code/modules/mining/equipment/kinetic_crusher.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index cea29db99473..ecccd30fa77c 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -422,8 +422,9 @@ bonus_value = 30 /obj/item/crusher_trophy/malformed_bone/effect_desc() - return "mark detonation has a chance to trigger a second detonation" + return "mark detonation to have a [bonus_value]% chance to trigger a second detonation" /obj/item/crusher_trophy/malformed_bone/on_mark_detonation(mob/living/target, mob/living/user) - .=..() - addtimer(CALLBACK(src, .proc/on_mark_detonation, L, user), 1) + for(var/mob/living/L in oview(2, user)) + if(rand(1, 100) <= bonus_value) + addtimer(CALLBACK(src, .proc/on_mark_detonation, L, user), 1) From ffdd114bc4fdf2444c58094eaf3be21b7441e83a Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Fri, 4 Feb 2022 00:20:12 -0800 Subject: [PATCH 11/14] new idea old one gone now im working on it --- code/modules/mining/equipment/kinetic_crusher.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index ecccd30fa77c..dc1eb54c5bfb 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -427,4 +427,4 @@ /obj/item/crusher_trophy/malformed_bone/on_mark_detonation(mob/living/target, mob/living/user) for(var/mob/living/L in oview(2, user)) if(rand(1, 100) <= bonus_value) - addtimer(CALLBACK(src, .proc/on_mark_detonation, L, user), 1) + target.apply_status_effect(STATUS_EFFECT_CRUSHERMARK) From feb74867d9160644f496244f103d64acfd2519d4 Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Fri, 4 Feb 2022 21:47:29 -0800 Subject: [PATCH 12/14] no more errors im fuckngi brilliant --- code/modules/mining/equipment/kinetic_crusher.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index dc1eb54c5bfb..4ae920787c2c 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -425,6 +425,7 @@ return "mark detonation to have a [bonus_value]% chance to trigger a second detonation" /obj/item/crusher_trophy/malformed_bone/on_mark_detonation(mob/living/target, mob/living/user) + var/obj/item/twohanded/required/kinetic_crusher/hammer_synced for(var/mob/living/L in oview(2, user)) if(rand(1, 100) <= bonus_value) - target.apply_status_effect(STATUS_EFFECT_CRUSHERMARK) + target.apply_status_effect(STATUS_EFFECT_CRUSHERMARK, hammer_synced) From d8ad18849655670925f5116efaa4e2c9be9a69af Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Fri, 4 Feb 2022 22:15:26 -0800 Subject: [PATCH 13/14] nevermind --- .../mob/living/simple_animal/hostile/megafauna/legion.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 5edd51a38605..1540b367ca15 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -42,7 +42,6 @@ Difficulty: Medium pixel_y = -90 pixel_x = -75 loot = list(/obj/item/stack/sheet/bone = 3) - crusher_loot = /obj/item/crusher_trophy/malformed_bone //leaving this here since if you dont start with the crusher you're probably not gonna finish with it vision_range = 13 wander = FALSE elimination = TRUE @@ -170,6 +169,9 @@ Difficulty: Medium loot = list(/obj/item/staff/storm, /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker, /obj/item/keycard/necropolis) + crusher_loot = list(/obj/item/crusher_trophy/malformed_bone,/obj/item/staff/storm, + /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker, + /obj/item/keycard/necropolis) elimination = FALSE else if(prob(10)) loot = list(/obj/structure/closet/crate/necropolis/tendril) From b9433de438678de3d9384f00a480d79957abbd29 Mon Sep 17 00:00:00 2001 From: LazennG <58535870+LazennG@users.noreply.github.com> Date: Sat, 5 Feb 2022 19:46:42 -0800 Subject: [PATCH 14/14] final changs thanks baiomu and chubbygummibear --- code/modules/mining/equipment/kinetic_crusher.dm | 14 +++++++------- .../simple_animal/hostile/megafauna/legion.dm | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm index 4ae920787c2c..721d086aca5b 100644 --- a/code/modules/mining/equipment/kinetic_crusher.dm +++ b/code/modules/mining/equipment/kinetic_crusher.dm @@ -102,7 +102,7 @@ var/target_health = L.health for(var/t in trophies) var/obj/item/crusher_trophy/T = t - T.on_mark_detonation(target, user) + T.on_mark_detonation(target, user, src) //we pass in the kinetic crusher so that on_mark_detonation can use the properties of the crusher to reapply marks: see malformed_bone if(!QDELETED(L)) if(!QDELETED(C)) C.total_damage += target_health - L.health //we did some damage, but let's not assume how much we did @@ -419,13 +419,13 @@ desc = "A piece of bone caught in the act of division. Suitable as a trophy for a kinetic crusher." icon_state = "malf_bone" denied_type = /obj/item/crusher_trophy/malformed_bone - bonus_value = 30 + bonus_value = 40 /obj/item/crusher_trophy/malformed_bone/effect_desc() return "mark detonation to have a [bonus_value]% chance to trigger a second detonation" -/obj/item/crusher_trophy/malformed_bone/on_mark_detonation(mob/living/target, mob/living/user) - var/obj/item/twohanded/required/kinetic_crusher/hammer_synced - for(var/mob/living/L in oview(2, user)) - if(rand(1, 100) <= bonus_value) - target.apply_status_effect(STATUS_EFFECT_CRUSHERMARK, hammer_synced) +/obj/item/crusher_trophy/malformed_bone/on_mark_detonation(mob/living/target, mob/living/user, obj/item/twohanded/required/kinetic_crusher/hammer_synced) + if(hammer_synced) + for(var/mob/living/L in oview(2,user))//fuck you and everything around you with a mark + if(prob(bonus_value) && !L.has_status_effect(STATUS_EFFECT_CRUSHERMARK)) + L.apply_status_effect(STATUS_EFFECT_CRUSHERMARK,hammer_synced) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm index 1540b367ca15..0e8dde35a30f 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm @@ -171,7 +171,7 @@ Difficulty: Medium /obj/item/keycard/necropolis) crusher_loot = list(/obj/item/crusher_trophy/malformed_bone,/obj/item/staff/storm, /obj/item/clothing/suit/space/hardsuit/ert/paranormal/beserker, - /obj/item/keycard/necropolis) + /obj/item/keycard/necropolis) //the way it is now you can get this if you just whip out the crusher towards the end but nobody's gonna do that probably elimination = FALSE else if(prob(10)) loot = list(/obj/structure/closet/crate/necropolis/tendril)