From 69537dd60c31ad4581960fbe0a8cb4c9be0f189a Mon Sep 17 00:00:00 2001 From: variableundefined <40092670+variableundefined@users.noreply.github.com> Date: Mon, 9 Sep 2019 22:57:31 -0400 Subject: [PATCH 01/10] Port TG hitby refactor and detonation of items by projectiles --- .../gamemodes/changeling/powers/mutations.dm | 2 +- code/game/gamemodes/cult/cult_items.dm | 2 +- .../miniantags/abduction/abduction_gear.dm | 4 ++-- .../machinery/computer/HolodeckControl.dm | 2 +- code/game/objects/items.dm | 2 +- code/game/objects/items/robot/robot_items.dm | 2 +- code/game/objects/items/toys.dm | 2 +- .../objects/items/weapons/flamethrower.dm | 5 +++-- .../items/weapons/grenades/chem_grenade.dm | 5 ++++- .../objects/items/weapons/holy_weapons.dm | 2 +- .../objects/items/weapons/melee/energy.dm | 4 ++-- code/game/objects/items/weapons/melee/misc.dm | 2 +- code/game/objects/items/weapons/shields.dm | 6 +++--- code/game/objects/items/weapons/stunbaton.dm | 2 +- .../objects/items/weapons/swords_axes_etc.dm | 2 +- code/game/objects/items/weapons/twohanded.dm | 4 ++-- code/game/objects/items/weapons/weaponry.dm | 6 +++--- code/modules/clothing/spacesuits/hardsuit.dm | 2 +- code/modules/clothing/suits/armor.dm | 8 ++++---- code/modules/clothing/under/color.dm | 2 +- code/modules/clothing/under/jobs/civilian.dm | 2 +- code/modules/customitems/item_defines.dm | 2 +- code/modules/martial_arts/martial.dm | 2 +- .../mining/lavaland/loot/ashdragon_loot.dm | 2 +- .../carbon/alien/humanoid/caste/hunter.dm | 2 +- .../mob/living/carbon/human/human_defense.dm | 20 +++++++++---------- code/modules/projectiles/guns/magic/staff.dm | 2 +- 27 files changed, 51 insertions(+), 47 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 59e93e2d513..ad754c496c6 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -382,7 +382,7 @@ if(ismob(loc)) loc.visible_message("The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!", "We inflate our hand into a strong shield.", "You hear organic matter ripping and tearing!") -/obj/item/shield/changeling/hit_reaction() +/obj/item/shield/changeling/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(remaining_uses < 1) if(ishuman(loc)) var/mob/living/carbon/human/H = loc diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index a1bec7a2a83..7ef5baced97 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -160,7 +160,7 @@ user.Dizzy(30) user.Weaken(5) -/obj/item/clothing/suit/hooded/cultrobes/cult_shield/hit_reaction(mob/living/carbon/human/owner, attack_text, isinhands) +/obj/item/clothing/suit/hooded/cultrobes/cult_shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(current_charges) owner.visible_message("\The [attack_text] is deflected in a burst of blood-red sparks!") current_charges-- diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index f6bed7b539f..3491c043b4c 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -80,7 +80,7 @@ M.overlays.Cut() M.regenerate_icons() -/obj/item/clothing/suit/armor/abductor/vest/hit_reaction() +/obj/item/clothing/suit/armor/abductor/vest/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) DeactivateStealth() return 0 @@ -455,7 +455,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(ishuman(L)) var/mob/living/carbon/human/H = L - if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK)) + if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK)) playsound(L, 'sound/weapons/genhit.ogg', 50, 1) return 0 diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index d3edc588e2d..aeecfa827a2 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -420,7 +420,7 @@ /obj/item/holo/esword/red/New() item_color = "red" -/obj/item/holo/esword/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance) +/obj/item/holo/esword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(active) return ..() return 0 diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index a5e3ad4205b..e925b3b1629 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -336,7 +336,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d else return ..() -/obj/item/proc/hit_reaction(mob/living/carbon/human/owner, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, atom/movable/AM) +/obj/item/proc/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) SEND_SIGNAL(src, COMSIG_ITEM_HIT_REACT, args) if(prob(final_block_chance)) owner.visible_message("[owner] blocks [attack_text] with [src]!") diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index f38398180ee..1b20716783a 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -12,7 +12,7 @@ /obj/item/borg/stun/attack(mob/living/M, mob/living/silicon/robot/user) if(ishuman(M)) var/mob/living/carbon/human/H = M - if(H.check_shields(0, "[M]'s [name]", src, MELEE_ATTACK)) + if(H.check_shields(src, 0, "[M]'s [name]", MELEE_ATTACK)) playsound(M, 'sound/weapons/genhit.ogg', 50, 1) return 0 diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index cc7270e73c8..edc7b855c99 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -210,7 +210,7 @@ brightness_on = 0 sharp_when_wielded = FALSE // It's a toy -/obj/item/twohanded/dualsaber/toy/hit_reaction() +/obj/item/twohanded/dualsaber/toy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) return 0 /obj/item/twohanded/dualsaber/toy/IsReflect()//Stops Toy Dualsabers from reflecting energy projectiles diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm index dd67d7c67a4..9051954ae4d 100644 --- a/code/game/objects/items/weapons/flamethrower.dm +++ b/code/game/objects/items/weapons/flamethrower.dm @@ -213,10 +213,11 @@ ptank = new /obj/item/tank/plasma/full(src) update_icon() -/obj/item/flamethrower/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type) +/obj/item/flamethrower/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(ptank && damage && attack_type == PROJECTILE_ATTACK && prob(15)) owner.visible_message("[attack_text] hits the fueltank on [owner]'s [src], rupturing it! What a shot!") - var/target_turf = get_turf(owner) + var/turf/target_turf = get_turf(owner) + log_game("A projectile ([hitby]) detonated a flamethrower tank held by [key_name(owner)] at [COORD(target_turf)]") ignite_turf(target_turf, 100) qdel(ptank) return 1 //It hit the flamethrower, not them diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index 3e313bcac33..5c1c7587d8c 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -113,9 +113,12 @@ spawn(det_time) prime() -/obj/item/grenade/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type) +/obj/item/grenade/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(damage && attack_type == PROJECTILE_ATTACK && prob(15)) owner.visible_message("[attack_text] hits [owner]'s [src], setting it off! What a shot!") + var/turf/T = get_turf(src) + log_game("A projectile ([hitby]) detonated a grenade held by [key_name(owner)] at [COORD(T)]") + message_admins("A projectile ([hitby]) detonated a grenade held by [key_name_admin(owner)] at [ADMIN_COORDJMP(T)]") prime() return 1 //It hit the grenade, not them diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm index 68e731b8c44..0de138805f1 100644 --- a/code/game/objects/items/weapons/holy_weapons.dm +++ b/code/game/objects/items/weapons/holy_weapons.dm @@ -137,7 +137,7 @@ hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") -/obj/item/nullrod/claymore/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type) +/obj/item/nullrod/claymore/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(attack_type == PROJECTILE_ATTACK) final_block_chance = 0 //Don't bring a sword to a gunfight return ..() diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm index 5e8d170f50b..52e0b24ec4d 100644 --- a/code/game/objects/items/weapons/melee/energy.dm +++ b/code/game/objects/items/weapons/melee/energy.dm @@ -119,7 +119,7 @@ if(item_color == null) item_color = pick("red", "blue", "green", "purple") -/obj/item/melee/energy/sword/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance) +/obj/item/melee/energy/sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(active) return ..() return 0 @@ -156,7 +156,7 @@ ..() item_color = null -/obj/item/melee/energy/sword/cyborg/saw/hit_reaction() +/obj/item/melee/energy/sword/cyborg/saw/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) return 0 /obj/item/melee/energy/sword/saber diff --git a/code/game/objects/items/weapons/melee/misc.dm b/code/game/objects/items/weapons/melee/misc.dm index 943d20e9699..b9f1fa679a8 100644 --- a/code/game/objects/items/weapons/melee/misc.dm +++ b/code/game/objects/items/weapons/melee/misc.dm @@ -44,7 +44,7 @@ hitsound = 'sound/weapons/rapierhit.ogg' materials = list(MAT_METAL = 1000) -/obj/item/melee/rapier/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type) +/obj/item/melee/rapier/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(attack_type == PROJECTILE_ATTACK) final_block_chance = 0 //Don't bring a sword to a gunfight return ..() diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm index 61f83fdea25..2cbf80a6388 100644 --- a/code/game/objects/items/weapons/shields.dm +++ b/code/game/objects/items/weapons/shields.dm @@ -3,7 +3,7 @@ block_chance = 50 armor = list(melee = 50, bullet = 50, laser = 50, energy = 0, bomb = 30, bio = 0, rad = 0) -/obj/item/shield/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type) +/obj/item/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(attack_type == THROWN_PROJECTILE_ATTACK) final_block_chance += 30 if(attack_type == LEAP_ATTACK) @@ -63,7 +63,7 @@ attack_verb = list("shoved", "bashed") var/active = 0 -/obj/item/shield/energy/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance) +/obj/item/shield/energy/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) return 0 /obj/item/shield/energy/IsReflect() @@ -110,7 +110,7 @@ w_class = WEIGHT_CLASS_NORMAL var/active = 0 -/obj/item/shield/riot/tele/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance) +/obj/item/shield/riot/tele/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(active) return ..() return 0 diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index 526340daea5..1be32df4d2a 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -175,7 +175,7 @@ if(ishuman(L)) var/mob/living/carbon/human/H = L - if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK)) //No message; check_shields() handles that + if(H.check_shields(src, "[user]'s [name]", MELEE_ATTACK)) //No message; check_shields() handles that playsound(L, 'sound/weapons/genhit.ogg', 50, 1) return diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index d0526ebbcb8..409e5575df3 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -51,7 +51,7 @@ if(cooldown <= 0) if(ishuman(target)) var/mob/living/carbon/human/H = target - if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK)) + if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK)) return if(check_martial_counter(H, user)) return diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 15456386541..dc20b8582c6 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -267,7 +267,7 @@ user.SpinAnimation(7, 1) sleep(1) -/obj/item/twohanded/dualsaber/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance) +/obj/item/twohanded/dualsaber/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(wielded) return ..() return FALSE @@ -507,7 +507,7 @@ armour_penetration = 100 force_on = 30 -/obj/item/twohanded/required/chainsaw/doomslayer/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type) +/obj/item/twohanded/required/chainsaw/doomslayer/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(attack_type == PROJECTILE_ATTACK) owner.visible_message("Ranged attacks just make [owner] angrier!") playsound(src, pick('sound/weapons/bulletflyby.ogg','sound/weapons/bulletflyby2.ogg','sound/weapons/bulletflyby3.ogg'), 75, 1) diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 501f1780a0b..c1f45a9fc9b 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -171,11 +171,11 @@ desc = "This thing looks dangerous... Dangerously good at baseball, that is." homerun_able = 1 -/obj/item/melee/baseball_bat/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type, atom/movable/AM) +/obj/item/melee/baseball_bat/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) . = ..() - if(!istype(AM, /obj/item) || attack_type != THROWN_PROJECTILE_ATTACK) + if(!isitem(hitby) || attack_type != THROWN_PROJECTILE_ATTACK) return FALSE - var/obj/item/I = AM + var/obj/item/I = hitby if(I.w_class <= WEIGHT_CLASS_NORMAL || istype(I, /obj/item/beach_ball)) // baseball bat deflecting if(deflectmode) if(prob(10)) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index b56d2122ee8..f342cf9f04f 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -527,7 +527,7 @@ var/shield_on = "shield-old" sprite_sheets = null -/obj/item/clothing/suit/space/hardsuit/shielded/hit_reaction(mob/living/carbon/human/owner, attack_text) +/obj/item/clothing/suit/space/hardsuit/shielded/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(current_charges > 0) do_sparks(2, 1, src) owner.visible_message("[owner]'s shields deflect [attack_text] in a shower of sparks!") diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index c5242d072e0..1ab7fe58c2b 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -301,7 +301,7 @@ desc = "Someone seperated our Research Director from his own head!" var/tele_range = 6 -/obj/item/clothing/suit/armor/reactive/teleport/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance) +/obj/item/clothing/suit/armor/reactive/teleport/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(!active) return 0 if(prob(hit_reaction_chance)) @@ -332,7 +332,7 @@ /obj/item/clothing/suit/armor/reactive/fire name = "reactive incendiary armor" -/obj/item/clothing/suit/armor/reactive/fire/hit_reaction(mob/living/carbon/human/owner, attack_text) +/obj/item/clothing/suit/armor/reactive/fire/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(!active) return 0 if(prob(hit_reaction_chance)) @@ -349,7 +349,7 @@ /obj/item/clothing/suit/armor/reactive/stealth name = "reactive stealth armor" -/obj/item/clothing/suit/armor/reactive/stealth/hit_reaction(mob/living/carbon/human/owner, attack_text) +/obj/item/clothing/suit/armor/reactive/stealth/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(!active) return 0 if(prob(hit_reaction_chance)) @@ -366,7 +366,7 @@ /obj/item/clothing/suit/armor/reactive/tesla name = "reactive tesla armor" -/obj/item/clothing/suit/armor/reactive/tesla/hit_reaction(mob/living/carbon/human/owner, attack_text) +/obj/item/clothing/suit/armor/reactive/tesla/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(!active) return 0 if(prob(hit_reaction_chance)) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index e7f29305929..17db1997174 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -60,7 +60,7 @@ name = "ancient jumpsuit" desc = "A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade." -/obj/item/clothing/under/color/grey/glorf/hit_reaction(mob/living/carbon/human/owner) +/obj/item/clothing/under/color/grey/glorf/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) owner.forcesay(GLOB.hit_appends) return 0 diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 81c6d15562a..df04075306d 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -74,7 +74,7 @@ . = ..() AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg' = 1), 50) -/obj/item/clothing/under/rank/clown/hit_reaction() +/obj/item/clothing/under/rank/clown/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(ishuman(loc)) var/mob/living/carbon/human/H = loc if(H.mind && H.mind.assigned_role == "Clown") diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index b4aa0a62379..e21d0f80c76 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -135,7 +135,7 @@ force = 5 sharp = 0 -/obj/item/claymore/fluff/hit_reaction() +/obj/item/claymore/fluff/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) return 0 /obj/item/fluff/rsik_katana //Xydonus: Rsik Ugsharki Atan diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 2940e810ade..571eefcfb00 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -277,7 +277,7 @@ return ..() return ..() -/obj/item/twohanded/bostaff/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance) +/obj/item/twohanded/bostaff/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(wielded) return ..() return 0 diff --git a/code/modules/mining/lavaland/loot/ashdragon_loot.dm b/code/modules/mining/lavaland/loot/ashdragon_loot.dm index c9b35e6f883..6a1e563da7a 100644 --- a/code/modules/mining/lavaland/loot/ashdragon_loot.dm +++ b/code/modules/mining/lavaland/loot/ashdragon_loot.dm @@ -101,7 +101,7 @@ user.visible_message("[user] strikes with the force of [ghost_counter] vengeful spirits!") ..() -/obj/item/melee/ghost_sword/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type) +/obj/item/melee/ghost_sword/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) var/ghost_counter = ghost_check() final_block_chance += Clamp((ghost_counter * 5), 0, 75) owner.visible_message("[owner] is protected by a ring of [ghost_counter] ghosts!") diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm index bf2158ae58e..f950eee4dbf 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -99,7 +99,7 @@ var/blocked = 0 if(ishuman(A)) var/mob/living/carbon/human/H = A - if(H.check_shields(0, "the [name]", src, attack_type = LEAP_ATTACK)) + if(H.check_shields(src, 0, "the [name]", attack_type = LEAP_ATTACK)) blocked = 1 if(!blocked) L.visible_message("[src] pounces on [L]!", "[src] pounces on you!") diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index d172fabef00..70ecf8a33c2 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -34,7 +34,7 @@ emp_act return -1 // complete projectile permutation //Shields - if(check_shields(P.damage, "the [P.name]", P, PROJECTILE_ATTACK, P.armour_penetration)) + if(check_shields(P, P.damage, "the [P.name]", PROJECTILE_ATTACK, P.armour_penetration)) P.on_hit(src, 100, def_zone) return 2 @@ -136,24 +136,24 @@ emp_act //End Here -/mob/living/carbon/human/proc/check_shields(damage = 0, attack_text = "the attack", atom/movable/AM, attack_type = MELEE_ATTACK, armour_penetration = 0) +/mob/living/carbon/human/proc/check_shields(atom/AM, var/damage, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0) var/block_chance_modifier = round(damage / -3) if(l_hand && !istype(l_hand, /obj/item/clothing)) var/final_block_chance = l_hand.block_chance - (Clamp((armour_penetration-l_hand.armour_penetration)/2,0,100)) + block_chance_modifier //So armour piercing blades can still be parried by other blades, for example - if(l_hand.hit_reaction(src, attack_text, final_block_chance, damage, attack_type, AM)) + if(l_hand.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type)) return 1 if(r_hand && !istype(r_hand, /obj/item/clothing)) var/final_block_chance = r_hand.block_chance - (Clamp((armour_penetration-r_hand.armour_penetration)/2,0,100)) + block_chance_modifier //Need to reset the var so it doesn't carry over modifications between attempts - if(r_hand.hit_reaction(src, attack_text, final_block_chance, damage, attack_type, AM)) + if(r_hand.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type)) return 1 if(wear_suit) var/final_block_chance = wear_suit.block_chance - (Clamp((armour_penetration-wear_suit.armour_penetration)/2,0,100)) + block_chance_modifier - if(wear_suit.hit_reaction(src, attack_text, final_block_chance, damage, attack_type, AM)) + if(wear_suit.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type)) return 1 if(w_uniform) var/final_block_chance = w_uniform.block_chance - (Clamp((armour_penetration-w_uniform.armour_penetration)/2,0,100)) + block_chance_modifier - if(w_uniform.hit_reaction(src, attack_text, final_block_chance, damage, attack_type, AM)) + if(w_uniform.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type)) return 1 return 0 @@ -217,7 +217,7 @@ emp_act if(user != src) user.do_attack_animation(src) - if(check_shields(I.force, "the [I.name]", I, MELEE_ATTACK, I.armour_penetration)) + if(check_shields(I, I.force, "the [I.name]", MELEE_ATTACK, I.armour_penetration)) return 0 if(check_block()) @@ -311,7 +311,7 @@ emp_act throwpower = I.throwforce if(I.thrownby == src) //No throwing stuff at yourself to trigger reactions return ..() - if(check_shields(throwpower, "\the [AM.name]", AM, THROWN_PROJECTILE_ATTACK)) + if(check_shields(AM, throwpower, "\the [AM.name]", THROWN_PROJECTILE_ATTACK)) hitpush = 0 skipcatch = 1 blocked = 1 @@ -392,7 +392,7 @@ emp_act updatehealth("larva attack") /mob/living/carbon/human/attack_alien(mob/living/carbon/alien/humanoid/M) - if(check_shields(0, M.name)) + if(check_shields(M, 0, M.name)) visible_message("[M] attempted to touch [src]!") return 0 @@ -439,7 +439,7 @@ emp_act /mob/living/carbon/human/attack_animal(mob/living/simple_animal/M) if(..()) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) - if(check_shields(damage, "the [M.name]", null, MELEE_ATTACK, M.armour_penetration)) + if(check_shields(M, damage, "the [M.name]", null, MELEE_ATTACK, M.armour_penetration)) return 0 var/dam_zone = pick("head", "chest", "groin", "l_arm", "l_hand", "r_arm", "r_hand", "l_leg", "l_foot", "r_leg", "r_foot") var/obj/item/organ/external/affecting = get_organ(ran_zone(dam_zone)) diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index 560ecf44684..9196596c8b5 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/code/modules/projectiles/guns/magic/staff.dm @@ -89,7 +89,7 @@ sharp = 1 max_charges = 4 -/obj/item/gun/magic/staff/spellblade/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type) +/obj/item/gun/magic/staff/spellblade/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(attack_type == PROJECTILE_ATTACK) final_block_chance = 0 return ..() From 40428e47d9021e9c8d76230a513ab2cc94c0bc48 Mon Sep 17 00:00:00 2001 From: Fox McCloud Date: Tue, 10 Sep 2019 03:08:44 -0400 Subject: [PATCH 02/10] Refactors Shards, Improved Light Replacer, Adds Plasmaspear --- .../objects/items/devices/lightreplacer.dm | 229 ++++++++++-------- code/game/objects/items/weapons/shards.dm | 116 +++++---- code/game/objects/items/weapons/twohanded.dm | 21 +- code/game/objects/items/weapons/weaponry.dm | 7 +- .../mob/living/silicon/robot/robot_modules.dm | 8 +- code/modules/power/lighting.dm | 5 +- icons/mob/inhands/items_lefthand.dmi | Bin 153294 -> 154068 bytes icons/mob/inhands/items_righthand.dmi | Bin 150314 -> 151108 bytes icons/obj/items.dmi | Bin 148797 -> 149035 bytes 9 files changed, 200 insertions(+), 186 deletions(-) diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm index 6c58b4e1414..94731757895 100644 --- a/code/game/objects/items/devices/lightreplacer.dm +++ b/code/game/objects/items/devices/lightreplacer.dm @@ -41,160 +41,160 @@ /obj/item/lightreplacer name = "light replacer" - desc = "A device to automatically replace lights. Refill with working lightbulbs." + desc = "A device to automatically replace lights. Refill with broken or working light bulbs, or sheets of glass." icon = 'icons/obj/janitor.dmi' icon_state = "lightreplacer0" item_state = "electronic" - + w_class = WEIGHT_CLASS_SMALL flags = CONDUCT slot_flags = SLOT_BELT origin_tech = "magnets=3;engineering=4" + force = 8 + var/emagged = FALSE var/max_uses = 20 - var/uses = 0 - var/shards = 0 - var/recycle = 3 - var/emagged = 0 - var/failmsg = "" + var/uses = 10 // How much to increase per each glass? var/increment = 5 // How much to take from the glass? var/decrement = 1 var/charge = 1 -/obj/item/lightreplacer/New() - uses = max_uses / 2 - failmsg = "The [name]'s refill light blinks red." - ..() + // Eating used bulbs gives us bulb shards + var/bulb_shards = 0 + // when we get this many shards, we get a free bulb. + var/shards_required = 4 + /obj/item/lightreplacer/examine(mob/user) - if(..(user, 2)) - to_chat(user, "It has [uses] lights and [shards] shards remaining.") + ..() + to_chat(user, status_string()) -/obj/item/lightreplacer/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/stack/sheet/glass)) - var/obj/item/stack/sheet/glass/G = W - if(G.amount - decrement >= 0 && uses < max_uses) - var/remaining = max(G.amount - decrement, 0) - if(!remaining && !(G.amount - decrement) == 0) - to_chat(user, "There isn't enough glass.") - return - G.amount = remaining - if(!G.amount) - user.drop_item() - qdel(G) - AddUses(increment) - to_chat(user, "You insert a piece of glass into the [src.name]. You have [uses] lights remaining.") +/obj/item/lightreplacer/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/stack/sheet/glass)) + var/obj/item/stack/sheet/glass/G = I + if(uses >= max_uses) + to_chat(user, "[src] is full.") return + else if(G.use(decrement)) + AddUses(increment) + to_chat(user, "You insert a piece of glass into [src]. You have [uses] light\s remaining.") + return + else + to_chat(user, "You need one sheet of glass to replace lights!") + return - if(istype(W, /obj/item/light)) - var/obj/item/light/L = W + if(istype(I, /obj/item/shard)) + if(uses >= max_uses) + to_chat(user, "[src] is full.") + return + if(!user.unEquip(I)) + return + AddUses(round(increment * 0.75)) + to_chat(user, "You insert a shard of glass into [src]. You have [uses] light\s remaining.") + qdel(I) + return + + if(istype(I, /obj/item/light)) + var/obj/item/light/L = I if(L.status == 0) // LIGHT OKAY - if(!user.drop_item()) - to_chat(user, "[L] is stuck to your hand!") - return if(uses < max_uses) + if(!user.unEquip(L)) + return AddUses(1) - to_chat(user, "You insert the [L.name] into the [src.name]. You have [uses] lights remaining.") - user.drop_item() - qdel(L) - return - else if(L.status == 2 || L.status == 3) - if(!user.drop_item()) - to_chat(user, "[L] is stuck to your hand!") - return - else - AddShards(1) - to_chat(user, "You insert [L] into [src]. You have [shards] shards remaining.") - user.drop_item() qdel(L) + else + if(!user.unEquip(L)) return + to_chat(user, "You insert [L] into [src].") + AddShards(1, user) + qdel(L) + return - if(istype(W, /obj/item/storage)) - var/obj/item/storage/S = W - var/found_lightbulbs = 0 + if(istype(I, /obj/item/storage)) + var/obj/item/storage/S = I + var/found_lightbulbs = FALSE + var/replaced_something = TRUE - for(var/obj/item/I in S.contents) - if(istype(I,/obj/item/light)) - var/obj/item/light/L = I - found_lightbulbs = 1 + for(var/obj/item/IT in S.contents) + if(istype(IT, /obj/item/light)) + var/obj/item/light/L = IT + found_lightbulbs = TRUE if(uses >= max_uses) - to_chat(user, "[src] is full!") break - if(L.status == 0) + if(L.status == LIGHT_OK) + replaced_something = TRUE AddUses(1) qdel(L) - else if(L.status == 2 || L.status == 3) - AddShards(1) + + else if(L.status == LIGHT_BROKEN || L.status == LIGHT_BURNED) + replaced_something = TRUE + AddShards(1, user) qdel(L) - to_chat(user, "You fill [src] with lights from [S].") + if(!found_lightbulbs) to_chat(user, "[S] contains no bulbs.") return + if(!replaced_something && uses == max_uses) + to_chat(user, "[src] is full!") + return + + to_chat(user, "You fill [src] with lights from [S]. " + status_string() + "") + return + return ..() + /obj/item/lightreplacer/emag_act(user as mob) if(!emagged) Emag() /obj/item/lightreplacer/attack_self(mob/user) - /* // This would probably be a bit OP. If you want it though, uncomment the code. - if(isrobot(user)) - var/mob/living/silicon/robot/R = user - if(R.emagged) - src.Emag() - to_chat(usr, "You shortcircuit the [src].") - return - */ - to_chat(usr, "It has [uses] lights remaining.") + for(var/obj/machinery/light/target in user.loc) + ReplaceLight(target, user) + to_chat(user, status_string()) /obj/item/lightreplacer/update_icon() icon_state = "lightreplacer[emagged]" +/obj/item/lightreplacer/proc/status_string() + return "It has [uses] light\s remaining (plus [bulb_shards] fragment\s)." -/obj/item/lightreplacer/proc/Use(var/mob/user) - - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) +/obj/item/lightreplacer/proc/Use(mob/user) + playsound(loc, 'sound/machines/click.ogg', 50, TRUE) AddUses(-1) return 1 // Negative numbers will subtract -/obj/item/lightreplacer/proc/AddUses(var/amount = 1) - uses = min(max(uses + amount, 0), max_uses) +/obj/item/lightreplacer/proc/AddUses(amount = 1) + uses = Clamp(uses + amount, 0, max_uses) -/obj/item/lightreplacer/proc/AddShards(amount = 1) - shards += amount - var/recycled_lights = round(shards / recycle) - if(recycled_lights > 0) - AddUses(recycled_lights) - shards = shards % recycle - return recycled_lights +/obj/item/lightreplacer/proc/AddShards(amount = 1, user) + bulb_shards += amount + var/new_bulbs = round(bulb_shards / shards_required) + if(new_bulbs > 0) + AddUses(new_bulbs) + bulb_shards = bulb_shards % shards_required + if(new_bulbs != 0) + to_chat(user, "[src] has fabricated a new bulb from the broken glass it has stored. It now has [uses] uses.") + playsound(loc, 'sound/machines/ding.ogg', 50, TRUE) + return new_bulbs /obj/item/lightreplacer/proc/Charge(var/mob/user) charge += 1 - if(charge > 7) + if(charge > 3) AddUses(1) charge = 1 -/obj/item/lightreplacer/proc/ReplaceLight(var/obj/machinery/light/target, var/mob/living/U) - +/obj/item/lightreplacer/proc/ReplaceLight(obj/machinery/light/target, mob/living/U) if(target.status != LIGHT_OK) if(CanUse(U)) - if(!Use(U)) return - to_chat(U, "You replace the [target.fitting] with the [src].") + if(!Use(U)) + return + to_chat(U, "You replace [target.fitting] with [src].") if(target.status != LIGHT_EMPTY) - - var/obj/item/light/L1 = new target.light_type(target.loc) - L1.status = target.status - L1.rigged = target.rigged - L1.brightness_range = target.brightness_range - L1.brightness_power = target.brightness_power - L1.brightness_color = target.brightness_color - L1.switchcount = target.switchcount - target.switchcount = 0 - L1.update() - + AddShards(1, U) target.status = LIGHT_EMPTY target.update() @@ -215,37 +215,54 @@ return else - to_chat(U, failmsg) + to_chat(U, "[src]'s refill light blinks red.") return else - to_chat(U, "There is a working [target.fitting] already inserted.") + to_chat(U, "There is a working [target.fitting] already inserted!") return /obj/item/lightreplacer/proc/Emag() emagged = !emagged - playsound(src.loc, "sparks", 100, 1) + playsound(loc, "sparks", 100, TRUE) if(emagged) - name = "Shortcircuited [initial(name)]" + name = "shortcircuited [initial(name)]" else name = initial(name) update_icon() -//Can you use it? +/obj/item/lightreplacer/proc/CanUse(mob/living/user) + add_fingerprint(user) + if(uses > 0) + return 1 + else + return 0 + +/obj/item/lightreplacer/afterattack(atom/T, mob/U, proximity) + if(!proximity) + return + if(!isturf(T)) + return + + var/used = FALSE + for(var/atom/A in T) + if(!CanUse(U)) + break + used = TRUE + if(istype(A, /obj/machinery/light)) + ReplaceLight(A, U) + + if(!used) + to_chat(U, "[src]'s refill light blinks red.") /obj/item/lightreplacer/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J) J.put_in_cart(src, user) J.myreplacer = src J.update_icon() -/obj/item/lightreplacer/proc/CanUse(var/mob/living/user) - src.add_fingerprint(user) - //Not sure what else to check for. Maybe if clumsy? - if(uses > 0) - return 1 - else - return 0 +/obj/item/lightreplacer/cyborg/janicart_insert(mob/user, obj/structure/janitorialcart/J) + return #undef LIGHT_OK #undef LIGHT_EMPTY #undef LIGHT_BROKEN -#undef LIGHT_BURNED +#undef LIGHT_BURNED \ No newline at end of file diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index 4c8697da247..35418aaf01a 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -1,27 +1,30 @@ // Glass shards /obj/item/shard - name = "glass shard" + name = "shard" + desc = "A nasty looking shard of glass." icon = 'icons/obj/shards.dmi' icon_state = "large" - sharp = TRUE - desc = "Could probably be used as ... a throwing weapon?" w_class = WEIGHT_CLASS_TINY force = 5 throwforce = 10 item_state = "shard-glass" - materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT) + materials = list(MAT_GLASS = MINERAL_MATERIAL_AMOUNT) attack_verb = list("stabbed", "slashed", "sliced", "cut") hitsound = 'sound/weapons/bladeslice.ogg' armor = list("melee" = 100, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0) + sharp = TRUE + var/cooldown = 0 + var/icon_prefix + var/obj/item/stack/sheet/welded_type = /obj/item/stack/sheet/glass /obj/item/shard/suicide_act(mob/user) to_chat(viewers(user), pick("[user] is slitting [user.p_their()] wrists with [src]! It looks like [user.p_theyre()] trying to commit suicide.", "[user] is slitting [user.p_their()] throat with [src]! It looks like [user.p_theyre()] trying to commit suicide.")) return BRUTELOSS -/obj/item/shard/New() - ..() +/obj/item/shard/Initialize(mapload) + . = ..() icon_state = pick("large", "medium", "small") switch(icon_state) if("small") @@ -33,8 +36,11 @@ if("large") pixel_x = rand(-5, 5) pixel_y = rand(-5, 5) + if(icon_prefix) + icon_state = "[icon_prefix][icon_state]" /obj/item/shard/afterattack(atom/movable/AM, mob/user, proximity) + . = ..() if(!proximity || !(src in user)) return if(isturf(AM)) @@ -48,15 +54,17 @@ if(affecting.is_robotic()) return to_chat(H, "[src] cuts into your hand!") - if(affecting.receive_damage(force*0.5)) + if(affecting.receive_damage(force * 0.5)) H.UpdateDamageIcon() /obj/item/shard/attackby(obj/item/I, mob/user, params) if(iswelder(I)) var/obj/item/weldingtool/WT = I if(WT.remove_fuel(0, user)) - var/obj/item/stack/sheet/glass/NG = new (user.loc) - for(var/obj/item/stack/sheet/glass/G in user.loc) + var/obj/item/stack/sheet/NG = new welded_type(user.loc) + for(var/obj/item/stack/sheet/G in user.loc) + if(!istype(G, welded_type)) + continue if(G == NG) continue if(G.amount >= G.max_amount) @@ -64,64 +72,48 @@ G.attackby(NG, user) to_chat(user, "You add the newly-formed glass to the stack. It now contains [NG.amount] sheet\s.") qdel(src) - else - return ..() + return + if(istype(I, /obj/item/lightreplacer)) + I.attackby(src, user) + return + return ..() -/obj/item/shard/Crossed(AM as mob|obj, oldloc) - if(isliving(AM)) - var/mob/living/M = AM - if(M.incorporeal_move || M.flying || M.throwing)//you are incorporal or flying or being thrown ..no shard stepping! +/obj/item/shard/Crossed(mob/living/L, oldloc) + if(istype(L) && has_gravity(loc)) + if(L.incorporeal_move || L.flying) return - to_chat(M, "You step on \the [src]!") - playsound(loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds - if(ishuman(M)) - var/mob/living/carbon/human/H = M + playsound(loc, 'sound/effects/glass_step.ogg', 50, TRUE) + if(ishuman(L)) + var/mob/living/carbon/human/H = L + var/obj/item/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot")) + if(!affecting) + return + if(affecting.is_robotic()) + return + var/feetCover = (H.wear_suit && H.wear_suit.body_parts_covered & FEET) || (H.w_uniform && H.w_uniform.body_parts_covered & FEET) + if(H.shoes || feetCover || H.buckled) + return + if(affecting.receive_damage(force, 0)) + H.UpdateDamageIcon() - if( !H.shoes && ( !H.wear_suit || !(H.wear_suit.body_parts_covered & FEET) ) ) - var/obj/item/organ/external/affecting = H.get_organ(pick("l_foot", "r_foot")) - if(!affecting) - return - if(affecting.is_robotic()) - return - H.Weaken(3) - if(affecting.receive_damage(5, 0)) - H.UpdateDamageIcon() - ..() + if(cooldown < world.time - 10) //cooldown to avoid message spam. + if(!H.incapacitated(ignore_restraints = TRUE)) + H.visible_message("[H] steps on [src]!", \ + "You step on [src]!") + else + H.visible_message("[H] slides on [src]!", \ + "You slide on [src]!") + + cooldown = world.time + H.Weaken(3) + return ..() /obj/item/shard/plasma name = "plasma shard" desc = "A shard of plasma glass. Considerably tougher then normal glass shards. Apparently not tough enough to be a window." - force = 8 - throwforce = 15 + force = 6 + throwforce = 11 icon_state = "plasmalarge" - sharp = TRUE - -/obj/item/shard/plasma/New() - ..() - icon_state = pick("plasmalarge", "plasmamedium", "plasmasmall") - switch(icon_state) - if("plasmasmall") - pixel_x = rand(-12, 12) - pixel_y = rand(-12, 12) - if("plasmamedium") - pixel_x = rand(-8, 8) - pixel_y = rand(-8, 8) - if("plasmalarge") - pixel_x = rand(-5, 5) - pixel_y = rand(-5, 5) - -/obj/item/shard/plasma/attackby(obj/item/W, mob/user, params) - if(iswelder(W)) - var/obj/item/weldingtool/WT = W - if(WT.remove_fuel(0, user)) - var/obj/item/stack/sheet/plasmaglass/NG = new (user.loc) - for(var/obj/item/stack/sheet/plasmaglass/G in user.loc) - if(G == NG) - continue - if(G.amount >= G.max_amount) - continue - G.attackby(NG, user, params) - to_chat(usr, "You add the newly-formed plasma glass to the stack. It now contains [NG.amount] sheets.") - qdel(src) - else - return ..() + materials = list(MAT_PLASMA = MINERAL_MATERIAL_AMOUNT * 0.5, MAT_GLASS = MINERAL_MATERIAL_AMOUNT) + icon_prefix = "plasma" + welded_type = /obj/item/stack/sheet/plasmaglass \ No newline at end of file diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 15456386541..0f0a657f0ab 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -337,14 +337,23 @@ sharp = TRUE no_spin_thrown = TRUE var/obj/item/grenade/explosive = null + var/icon_prefix = "spearglass" /obj/item/twohanded/spear/update_icon() - if(explosive) - icon_state = "spearbomb[wielded]" - else - icon_state = "spearglass[wielded]" + icon_state = "[icon_prefix][wielded]" + +/obj/item/twohanded/spear/CheckParts(list/parts_list) + var/obj/item/shard/tip = locate() in parts_list + if(istype(tip, /obj/item/shard/plasma)) + force_wielded = 19 + force_unwielded = 11 + throwforce = 21 + icon_prefix = "spearplasma" + update_icon() + qdel(tip) ..() + /obj/item/twohanded/spear/afterattack(atom/movable/AM, mob/user, proximity) if(!proximity) return @@ -370,9 +379,7 @@ force_wielded = 20 //I have no idea how to balance throwforce = 22 armour_penetration = 15 //Enhanced armor piercing - -/obj/item/twohanded/spear/bonespear/update_icon() - icon_state = "bone_spear[wielded]" + icon_prefix = "bone_spear" //GREY TIDE /obj/item/twohanded/spear/grey_tide diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 501f1780a0b..56a692e7645 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -105,7 +105,12 @@ ..() if(istype(I, /obj/item/shard)) var/obj/item/twohanded/spear/S = new /obj/item/twohanded/spear - + if(istype(I, /obj/item/shard/plasma)) + S.force_wielded = 19 + S.force_unwielded = 11 + S.throwforce = 21 + S.icon_prefix = "spearplasma" + S.update_icon() if(!remove_item_from_storage(user)) user.unEquip(src) user.unEquip(I) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 699376c927f..76c7f5bc1af 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -252,7 +252,7 @@ modules += new /obj/item/soap/nanotrasen(src) modules += new /obj/item/storage/bag/trash/cyborg(src) modules += new /obj/item/mop/advanced/cyborg(src) - modules += new /obj/item/lightreplacer(src) + modules += new /obj/item/lightreplacer/cyborg(src) modules += new /obj/item/holosign_creator(src) emag = new /obj/item/reagent_containers/spray(src) @@ -544,7 +544,7 @@ modules += new /obj/item/crowbar/cyborg(src) modules += new /obj/item/wirecutters/cyborg(src) modules += new /obj/item/multitool/cyborg(src) - modules += new /obj/item/lightreplacer(src) + modules += new /obj/item/lightreplacer/cyborg(src) modules += new /obj/item/gripper(src) modules += new /obj/item/matter_decompiler(src) modules += new /obj/item/reagent_containers/spray/cleaner/drone(src) @@ -562,10 +562,6 @@ /obj/item/robot_module/drone/respawn_consumable(mob/living/silicon/robot/R) var/obj/item/reagent_containers/spray/cleaner/C = locate() in modules C.reagents.add_reagent("cleaner", 3) - - var/obj/item/lightreplacer/LR = locate() in modules - LR.Charge(R) - ..() diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index b186e862f01..6b4b5f05e82 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -303,10 +303,7 @@ //Light replacer code if(istype(W, /obj/item/lightreplacer)) var/obj/item/lightreplacer/LR = W - if(isliving(user)) - var/mob/living/U = user - LR.ReplaceLight(src, U) - return + LR.ReplaceLight(src, user) // attempt to insert light if(istype(W, /obj/item/light)) diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 10eef3b03379e2e0c0fb2e8563a836bbd0a5d2d0..7d0961fc449acad260b304736c2c238467559319 100644 GIT binary patch delta 6806 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 delta 6024 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 VgF!=-HYJD@s)}0BB83+p{|~J59b*6h diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index 926e04b28bf2f5ddff3896b123723080573d074f..5850e4d8d8c600a22d733b9c0203fbaa1f8d0387 100644 GIT binary patch delta 6049 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 delta 5249 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 diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 463e135d35f8cbbcc7a4a67a6543705cc1ebec27..35f0fb7349dc7453d94d0ba17d330fcc916e970f 100644 GIT binary patch delta 24419 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 Date: Tue, 10 Sep 2019 03:21:41 -0400 Subject: [PATCH 03/10] fix --- code/game/objects/items/weapons/shards.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/weapons/shards.dm b/code/game/objects/items/weapons/shards.dm index 35418aaf01a..e2fc07712bf 100644 --- a/code/game/objects/items/weapons/shards.dm +++ b/code/game/objects/items/weapons/shards.dm @@ -40,7 +40,6 @@ icon_state = "[icon_prefix][icon_state]" /obj/item/shard/afterattack(atom/movable/AM, mob/user, proximity) - . = ..() if(!proximity || !(src in user)) return if(isturf(AM)) From 86eb450c567ccef9743e7207ff681b33d9d0619a Mon Sep 17 00:00:00 2001 From: TDSSS <32099540+TDSSS@users.noreply.github.com> Date: Wed, 11 Sep 2019 07:48:45 +0200 Subject: [PATCH 04/10] Fix really silly mistake --- code/modules/reagents/chemistry/reagents/medicine.dm | 1 + code/modules/ruins/lavalandruin_code/fountain_hall.dm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index 09ee8cb3948..0f8c5e42dab 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -292,6 +292,7 @@ /datum/reagent/medicine/omnizine/godblood name = "Godblood" + id = "godblood" description = "Slowly heals all damage types. Has a rather high overdose threshold. Glows with mysterious power." overdose_threshold = 150 diff --git a/code/modules/ruins/lavalandruin_code/fountain_hall.dm b/code/modules/ruins/lavalandruin_code/fountain_hall.dm index 917ea4e4bd0..5a232286558 100644 --- a/code/modules/ruins/lavalandruin_code/fountain_hall.dm +++ b/code/modules/ruins/lavalandruin_code/fountain_hall.dm @@ -38,7 +38,7 @@ return last_process = world.time to_chat(user, "The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.") - user.reagents.add_reagent(/datum/reagent/medicine/omnizine/godblood, 20) + user.reagents.add_reagent("godblood", 20) //why is add_reagent so stupid ?!? update_icon() addtimer(CALLBACK(src, .proc/update_icon), time_between_uses) From f02cbc4e60ae5a3dcd50ba2110ee2bf111a6b0f8 Mon Sep 17 00:00:00 2001 From: TDSSS <32099540+TDSSS@users.noreply.github.com> Date: Wed, 11 Sep 2019 12:05:47 +0200 Subject: [PATCH 05/10] [Comment redacted] --- code/modules/reagents/chemistry/reagents/medicine.dm | 12 ++++++------ .../modules/ruins/lavalandruin_code/fountain_hall.dm | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index 0f8c5e42dab..b379386801d 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -290,12 +290,6 @@ addiction_chance = 5 taste_description = "health" -/datum/reagent/medicine/omnizine/godblood - name = "Godblood" - id = "godblood" - description = "Slowly heals all damage types. Has a rather high overdose threshold. Glows with mysterious power." - overdose_threshold = 150 - /datum/reagent/medicine/omnizine/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE update_flags |= M.adjustToxLoss(-1*REAGENTS_EFFECT_MULTIPLIER, FALSE) @@ -963,6 +957,12 @@ metabolization_rate = 0.1 taste_description = "faint hope" +/datum/reagent/medicine/omnizine_diluted/godblood + name = "Godblood" + id = "godblood" + description = "Slowly heals all damage types. Has a rather high overdose threshold. Glows with mysterious power." + overdose_threshold = 150 + /datum/reagent/medicine/omnizine_diluted/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE update_flags |= M.adjustToxLoss(-0.5*REAGENTS_EFFECT_MULTIPLIER, FALSE) diff --git a/code/modules/ruins/lavalandruin_code/fountain_hall.dm b/code/modules/ruins/lavalandruin_code/fountain_hall.dm index 5a232286558..3de758ac0c9 100644 --- a/code/modules/ruins/lavalandruin_code/fountain_hall.dm +++ b/code/modules/ruins/lavalandruin_code/fountain_hall.dm @@ -38,7 +38,7 @@ return last_process = world.time to_chat(user, "The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.") - user.reagents.add_reagent("godblood", 20) //why is add_reagent so stupid ?!? + user.reagents.add_reagent("godblood", 20) update_icon() addtimer(CALLBACK(src, .proc/update_icon), time_between_uses) From 2529ebfdea6468d0f06d40c2eecff0f609d0e3d6 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 11 Sep 2019 06:38:53 -0400 Subject: [PATCH 06/10] Automatic changelog generation for PR #12265 [ci skip] --- html/changelogs/AutoChangeLog-pr-12265.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12265.yml diff --git a/html/changelogs/AutoChangeLog-pr-12265.yml b/html/changelogs/AutoChangeLog-pr-12265.yml new file mode 100644 index 00000000000..1abb27cad08 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12265.yml @@ -0,0 +1,4 @@ +author: "TDSSS" +delete-after: True +changes: + - bugfix: "healing fountain lavaland ruin now correctly heals" From d6a475de5b5ba99c3c4dec8cc52e7609effdb4dd Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 11 Sep 2019 10:10:20 -0400 Subject: [PATCH 07/10] Automatic changelog generation for PR #12255 [ci skip] --- html/changelogs/AutoChangeLog-pr-12255.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12255.yml diff --git a/html/changelogs/AutoChangeLog-pr-12255.yml b/html/changelogs/AutoChangeLog-pr-12255.yml new file mode 100644 index 00000000000..a320bb2b102 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12255.yml @@ -0,0 +1,7 @@ +author: "Fox McCloud" +delete-after: True +changes: + - tweak: "Plasma glass shards do less damage when attacking, but slightly more when stepping on them" + - tweak: "Spears made out of plasma glass do slightly more damage" + - tweak: "Light replacer can now be used in-hand to attempt to reload empty lighting fixtures around you in addition to showing how many lights it has" + - tweak: "Light replacer needs less shards to increment bulbs" From 7778c91c45cf0b97645c517dde875e89da7a5cca Mon Sep 17 00:00:00 2001 From: Kyep Date: Wed, 11 Sep 2019 16:13:35 -0700 Subject: [PATCH 08/10] semi-mirror TG PR 46425 --- code/__DEFINES/admin.dm | 9 ++++- code/modules/client/client defines.dm | 5 +++ code/modules/keybindings/bindings_client.dm | 45 ++++++++++++++++++++- code/modules/keybindings/setup.dm | 20 ++++++--- 4 files changed, 72 insertions(+), 7 deletions(-) diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index 3877ac213c5..65f4da2b50a 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -63,4 +63,11 @@ #define AREACOORD(src) "[src ? "[get_area_name(src, TRUE)] [COORD(src)]" : "nonexistent location" ]" #define ADMIN_COORDJMP(src) "[src ? "[COORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]" #define ADMIN_VERBOSEJMP(src) "[src ? "[AREACOORD(src)] [ADMIN_JMP(src)]" : "nonexistent location"]" -#define ADMIN_SHOWDETAILS(mask, content) "[mask]" \ No newline at end of file +#define ADMIN_SHOWDETAILS(mask, content) "[mask]" + +///Max length of a keypress command before it's considered to be a forged packet/bogus command +#define MAX_KEYPRESS_COMMANDLENGTH 16 +///Max amount of keypress messages per second over two seconds before client is autokicked +#define MAX_KEYPRESS_AUTOKICK 50 +///Length of held key rolling buffer +#define HELD_KEY_BUFFER_LENGTH 15 \ No newline at end of file diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm index 22325fed75f..0feca103c12 100644 --- a/code/modules/client/client defines.dm +++ b/code/modules/client/client defines.dm @@ -95,3 +95,8 @@ // Has the client been varedited by an admin? [Inherits from datum now] // var/var_edited = FALSE + + var/client_keysend_amount = 0 + var/next_keysend_reset = 0 + var/next_keysend_trip_reset = 0 + var/keysend_tripped = FALSE \ No newline at end of file diff --git a/code/modules/keybindings/bindings_client.dm b/code/modules/keybindings/bindings_client.dm index e3925aa5283..d59e3da4e8e 100644 --- a/code/modules/keybindings/bindings_client.dm +++ b/code/modules/keybindings/bindings_client.dm @@ -3,7 +3,46 @@ /client/verb/keyDown(_key as text) set instant = TRUE set hidden = TRUE + + client_keysend_amount += 1 + + var/cache = client_keysend_amount + + if(keysend_tripped && next_keysend_trip_reset <= world.time) + keysend_tripped = FALSE + + if(next_keysend_reset <= world.time) + client_keysend_amount = 0 + next_keysend_reset = world.time + (1 SECONDS) + + //The "tripped" system is to confirm that flooding is still happening after one spike + //not entirely sure how byond commands interact in relation to lag + //don't want to kick people if a lag spike results in a huge flood of commands being sent + if(cache >= MAX_KEYPRESS_AUTOKICK) + if(!keysend_tripped) + keysend_tripped = TRUE + next_keysend_trip_reset = world.time + (2 SECONDS) + else + log_admin("Client [ckey] was just autokicked for flooding keysends; likely abuse but potentially lagspike.") + message_admins("Client [ckey] was just autokicked for flooding keysends; likely abuse but potentially lagspike.") + QDEL_IN(src, 1) + return + + ///Check if the key is short enough to even be a real key + if(LAZYLEN(_key) > MAX_KEYPRESS_COMMANDLENGTH) + to_chat(src, "Invalid KeyDown detected! You have been disconnected from the server automatically.") + log_admin("Client [ckey] just attempted to send an invalid keypress. Keymessage was over [MAX_KEYPRESS_COMMANDLENGTH] characters, autokicking due to likely abuse.") + message_admins("Client [ckey] just attempted to send an invalid keypress. Keymessage was over [MAX_KEYPRESS_COMMANDLENGTH] characters, autokicking due to likely abuse.") + QDEL_IN(src, 1) + return + //offset by 1 because the buffer address is 0 indexed because the math was simpler + keys_held[current_key_address + 1] = _key + //the time a key was pressed isn't actually used anywhere (as of 2019-9-10) but this allows easier access usage/checking + keys_held[_key] = world.time + + current_key_address = ((current_key_address + 1) % HELD_KEY_BUFFER_LENGTH) + var/movement = SSinput.movement_keys[_key] if (prefs.toggles & AZERTY) movement = SSinput.alt_movement_keys[_key] if(!(next_move_dir_sub & movement) && !keys_held["Ctrl"]) @@ -40,7 +79,11 @@ /client/verb/keyUp(_key as text) set instant = TRUE set hidden = TRUE - keys_held -= _key + //Can't just do a remove because it would alter the length of the rolling buffer, instead search for the key then null it out if it exists + for(var/i in 1 to HELD_KEY_BUFFER_LENGTH) + if(keys_held[i] == _key) + keys_held[i] = null + break var/movement = SSinput.movement_keys[_key] if (prefs.toggles & AZERTY) movement = SSinput.alt_movement_keys[_key] if(!(next_move_dir_add & movement)) diff --git a/code/modules/keybindings/setup.dm b/code/modules/keybindings/setup.dm index cc76256386e..b6e80452304 100644 --- a/code/modules/keybindings/setup.dm +++ b/code/modules/keybindings/setup.dm @@ -1,9 +1,14 @@ /client - var/list/keys_held = list() // A list of any keys held currently - // These next two vars are to apply movement for keypresses and releases made while move delayed. - // Because discarding that input makes the game less responsive. - var/next_move_dir_add // On next move, add this dir to the move that would otherwise be done - var/next_move_dir_sub // On next move, subtract this dir from the move that would otherwise be done + /// A rolling buffer of any keys held currently + var/list/keys_held = list() + ///used to keep track of the current rolling buffer position + var/current_key_address = 0 + /// These next two vars are to apply movement for keypresses and releases made while move delayed. + /// Because discarding that input makes the game less responsive. + /// On next move, add this dir to the move that would otherwise be done + var/next_move_dir_add + /// On next move, subtract this dir from the move that would otherwise be done + var/next_move_dir_sub // Set a client's focus to an object and override these procs on that object to let it handle keypresses @@ -31,6 +36,11 @@ /client/proc/set_macros() set waitfor = FALSE + //Reset and populate the rolling buffer + keys_held.Cut() + for(var/i in 1 to HELD_KEY_BUFFER_LENGTH) + keys_held += null + erase_all_macros() var/list/macro_sets = SSinput.macro_sets From 4867e8d6b7ca4c3d542be0b8a38170156751df2e Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Wed, 11 Sep 2019 19:25:26 -0400 Subject: [PATCH 09/10] Automatic changelog generation for PR #12276 [ci skip] --- html/changelogs/AutoChangeLog-pr-12276.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12276.yml diff --git a/html/changelogs/AutoChangeLog-pr-12276.yml b/html/changelogs/AutoChangeLog-pr-12276.yml new file mode 100644 index 00000000000..731eb403af1 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12276.yml @@ -0,0 +1,4 @@ +author: "Kyep" +delete-after: True +changes: + - bugfix: "fixed an issue with keyboard input" From 74fe92477fd8b216a0fb1a85cfc825b4a78d68b8 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Thu, 12 Sep 2019 00:14:32 -0400 Subject: [PATCH 10/10] Automatic changelog generation for PR #12251 [ci skip] --- html/changelogs/AutoChangeLog-pr-12251.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-12251.yml diff --git a/html/changelogs/AutoChangeLog-pr-12251.yml b/html/changelogs/AutoChangeLog-pr-12251.yml new file mode 100644 index 00000000000..98f31a5ec8d --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-12251.yml @@ -0,0 +1,5 @@ +author: "variableundefined" +delete-after: True +changes: + - tweak: "Hit_reaction proc has been refactored." + - tweak: "Flamethrower and grenade detonation by shot is now logged."