From f9ee9bdadfc527498831814e76e55c1eb5b394f2 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 26 Jan 2020 21:54:23 -0700 Subject: [PATCH 1/3] Update capture_the_flag.dm --- code/modules/awaymissions/capture_the_flag.dm | 38 +++++++++++-------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 8ceef76a06..8c5143ed38 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -264,6 +264,8 @@ M.key = new_team_member.key M.faction += team M.equipOutfit(ctf_gear) + M.dna.species.punch_damage_upper = 25 + M.dna.species.punch_damage_lower = 25 spawned_mobs += M /obj/machinery/capture_the_flag/Topic(href, href_list) @@ -368,6 +370,10 @@ CTF.ctf_gear = initial(ctf_gear) CTF.respawn_cooldown = DEFAULT_RESPAWN +/proc/ctf_floor_vanish(atom/target) + if(isturf(target.loc)) + qdel(target) + /obj/item/gun/ballistic/automatic/pistol/deagle/ctf desc = "This looks like it could really hurt in melee." force = 75 @@ -375,11 +381,7 @@ /obj/item/gun/ballistic/automatic/pistol/deagle/ctf/dropped() . = ..() - addtimer(CALLBACK(src, .proc/floor_vanish), 1) - -/obj/item/gun/ballistic/automatic/pistol/deagle/ctf/proc/floor_vanish() - if(isturf(loc)) - qdel(src) + addtimer(CALLBACK(GLOBAL_PROC, .proc/floor_vanish, src), 1) /obj/item/ammo_box/magazine/m50/ctf ammo_type = /obj/item/ammo_casing/a50/ctf @@ -402,22 +404,14 @@ /obj/item/gun/ballistic/automatic/laser/ctf/dropped() . = ..() - addtimer(CALLBACK(src, .proc/floor_vanish), 1) - -/obj/item/gun/ballistic/automatic/laser/ctf/proc/floor_vanish() - if(isturf(loc)) - qdel(src) + addtimer(CALLBACK(GLOBAL_PROC, .proc/floor_vanish, src), 1) /obj/item/ammo_box/magazine/recharge/ctf ammo_type = /obj/item/ammo_casing/caseless/laser/ctf /obj/item/ammo_box/magazine/recharge/ctf/dropped() . = ..() - addtimer(CALLBACK(src, .proc/floor_vanish), 1) - -/obj/item/ammo_box/magazine/recharge/ctf/proc/floor_vanish() - if(isturf(loc)) - qdel(src) + addtimer(CALLBACK(GLOBAL_PROC, .proc/floor_vanish, src), 1) /obj/item/ammo_casing/caseless/laser/ctf projectile_type = /obj/item/projectile/beam/ctf @@ -470,6 +464,19 @@ icon_state = "bluelaser" impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser +// MELEE GANG +/obj/item/claymore/ctf + slot_flags = SLOT_BACK + +/obj/item/claymore/ctf/pre_attack(atom/target, mob/user, params) + if(!is_ctf_target(target)) + return FALSE + return ..() + +/obj/item/claymore/ctf/dropped() + . = ..() + addtimer(CALLBACK(GLOBAL_PROC, .proc/floor_vanish, src), 1) + /datum/outfit/ctf name = "CTF" ears = /obj/item/radio/headset @@ -483,6 +490,7 @@ l_pocket = /obj/item/ammo_box/magazine/recharge/ctf r_pocket = /obj/item/ammo_box/magazine/recharge/ctf r_hand = /obj/item/gun/ballistic/automatic/laser/ctf + back = /obj/item/claymore/ctf /datum/outfit/ctf/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source) if(visualsOnly) From 2c1b63cdb9b13e040885941d85cb6c127814e1a8 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 26 Jan 2020 22:07:49 -0700 Subject: [PATCH 2/3] Update capture_the_flag.dm --- code/modules/awaymissions/capture_the_flag.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 8c5143ed38..930bab9f25 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -264,8 +264,8 @@ M.key = new_team_member.key M.faction += team M.equipOutfit(ctf_gear) - M.dna.species.punch_damage_upper = 25 - M.dna.species.punch_damage_lower = 25 + M.dna.species.melee_damage_upper = 25 + M.dna.species.melee_damage_lower = 25 spawned_mobs += M /obj/machinery/capture_the_flag/Topic(href, href_list) @@ -381,7 +381,7 @@ /obj/item/gun/ballistic/automatic/pistol/deagle/ctf/dropped() . = ..() - addtimer(CALLBACK(GLOBAL_PROC, .proc/floor_vanish, src), 1) + addtimer(CALLBACK(GLOBAL_PROC, /proc/floor_vanish, src), 1) /obj/item/ammo_box/magazine/m50/ctf ammo_type = /obj/item/ammo_casing/a50/ctf @@ -404,14 +404,14 @@ /obj/item/gun/ballistic/automatic/laser/ctf/dropped() . = ..() - addtimer(CALLBACK(GLOBAL_PROC, .proc/floor_vanish, src), 1) + addtimer(CALLBACK(GLOBAL_PROC, /proc/floor_vanish, src), 1) /obj/item/ammo_box/magazine/recharge/ctf ammo_type = /obj/item/ammo_casing/caseless/laser/ctf /obj/item/ammo_box/magazine/recharge/ctf/dropped() . = ..() - addtimer(CALLBACK(GLOBAL_PROC, .proc/floor_vanish, src), 1) + addtimer(CALLBACK(GLOBAL_PROC, /proc/floor_vanish, src), 1) /obj/item/ammo_casing/caseless/laser/ctf projectile_type = /obj/item/projectile/beam/ctf @@ -475,7 +475,7 @@ /obj/item/claymore/ctf/dropped() . = ..() - addtimer(CALLBACK(GLOBAL_PROC, .proc/floor_vanish, src), 1) + addtimer(CALLBACK(GLOBAL_PROC, /proc/floor_vanish, src), 1) /datum/outfit/ctf name = "CTF" From d5d0a7d7bad8ab1dc7dfc0c25782edd2a7716ec1 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sun, 26 Jan 2020 22:16:18 -0700 Subject: [PATCH 3/3] Update capture_the_flag.dm --- code/modules/awaymissions/capture_the_flag.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index 930bab9f25..3562350473 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -264,8 +264,8 @@ M.key = new_team_member.key M.faction += team M.equipOutfit(ctf_gear) - M.dna.species.melee_damage_upper = 25 - M.dna.species.melee_damage_lower = 25 + M.dna.species.punchdamagehigh = 25 + M.dna.species.punchdamagelow = 25 spawned_mobs += M /obj/machinery/capture_the_flag/Topic(href, href_list) @@ -381,7 +381,7 @@ /obj/item/gun/ballistic/automatic/pistol/deagle/ctf/dropped() . = ..() - addtimer(CALLBACK(GLOBAL_PROC, /proc/floor_vanish, src), 1) + addtimer(CALLBACK(GLOBAL_PROC, /proc/ctf_floor_vanish, src), 1) /obj/item/ammo_box/magazine/m50/ctf ammo_type = /obj/item/ammo_casing/a50/ctf @@ -404,14 +404,14 @@ /obj/item/gun/ballistic/automatic/laser/ctf/dropped() . = ..() - addtimer(CALLBACK(GLOBAL_PROC, /proc/floor_vanish, src), 1) + addtimer(CALLBACK(GLOBAL_PROC, /proc/ctf_floor_vanish, src), 1) /obj/item/ammo_box/magazine/recharge/ctf ammo_type = /obj/item/ammo_casing/caseless/laser/ctf /obj/item/ammo_box/magazine/recharge/ctf/dropped() . = ..() - addtimer(CALLBACK(GLOBAL_PROC, /proc/floor_vanish, src), 1) + addtimer(CALLBACK(GLOBAL_PROC, /proc/ctf_floor_vanish, src), 1) /obj/item/ammo_casing/caseless/laser/ctf projectile_type = /obj/item/projectile/beam/ctf @@ -475,7 +475,7 @@ /obj/item/claymore/ctf/dropped() . = ..() - addtimer(CALLBACK(GLOBAL_PROC, /proc/floor_vanish, src), 1) + addtimer(CALLBACK(GLOBAL_PROC, /proc/ctf_floor_vanish, src), 1) /datum/outfit/ctf name = "CTF"