diff --git a/code/modules/admin/verbs/secrets.dm b/code/modules/admin/verbs/secrets.dm index 4960b29087c..a03d61d426e 100644 --- a/code/modules/admin/verbs/secrets.dm +++ b/code/modules/admin/verbs/secrets.dm @@ -587,7 +587,7 @@ GLOBAL_DATUM(everyone_a_traitor, /datum/everyone_is_a_traitor_controller) return var/datum/ctf_controller/ctf_controller = GLOB.ctf_games[selected_game] var/choice = tgui_alert(usr, "[ctf_controller.instagib_mode ? "Return to standard" : "Enable instagib"] mode?", "Instagib Mode", list("Yes", "No")) - if(choice == "No") + if(choice != "Yes") return ctf_controller.toggle_instagib_mode() message_admins("[key_name_admin(holder)] [ctf_controller.instagib_mode ? "enabled" : "disabled"] instagib mode in CTF game: [selected_game]") diff --git a/code/modules/capture_the_flag/ctf_classes.dm b/code/modules/capture_the_flag/ctf_classes.dm index 95a61bcf64f..0482bd1ec88 100644 --- a/code/modules/capture_the_flag/ctf_classes.dm +++ b/code/modules/capture_the_flag/ctf_classes.dm @@ -74,7 +74,7 @@ r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/shotgun belt = null icon_state = "ctf_assaulter" - class_description = "Close combat class. Armed with a shotgun and rocket gloves." + class_description = "Close combat class. Armed with a shotgun and rocket gloves. Has significantly lower shield values due to higher moving speed." /datum/outfit/ctf/marksman name = "CTF Marksman (Solo)" @@ -83,7 +83,7 @@ r_pocket = /obj/item/ammo_box/magazine/recharge/ctf/marksman belt = null icon_state = "ctf_marksman" - class_description = "Long range class. Armed with a hitscan laser rifle." + class_description = "Long range class. Armed with a hitscan laser rifle with a scope." // RED TEAM CLASSES diff --git a/code/modules/capture_the_flag/ctf_controller.dm b/code/modules/capture_the_flag/ctf_controller.dm index ed8ef652534..8e51f8ef733 100644 --- a/code/modules/capture_the_flag/ctf_controller.dm +++ b/code/modules/capture_the_flag/ctf_controller.dm @@ -48,7 +48,7 @@ for(var/team in teams) var/obj/machinery/ctf/spawner/spawner = teams[team].spawner notify_ghosts("[spawner.name] has been activated!", source = spawner, action = NOTIFY_ORBIT, header = "CTF has been activated") - + /datum/ctf_controller/proc/stop_ctf() ctf_enabled = FALSE clear_control_points() @@ -115,7 +115,7 @@ if(user.ckey in enemy_team_members) to_chat(user, span_warning("No switching teams while the round is going!")) return FALSE - if(friendly_team_members.len > enemy_team_members.len) + else if(friendly_team_members.len > enemy_team_members.len) to_chat(user, span_warning("[team_color] has more team members than [team]! Try joining [team] team to even things up.")) return FALSE return TRUE @@ -208,7 +208,7 @@ var/datum/component/ctf_player/ctf_player = team_members[player] ctf_player.end_game() return ..() - + ///Increases this teams number of points by the provided amount. /datum/ctf_team/proc/score_points(points_scored) points += points_scored diff --git a/code/modules/capture_the_flag/ctf_equipment.dm b/code/modules/capture_the_flag/ctf_equipment.dm index ec269bc6407..5ec412f9017 100644 --- a/code/modules/capture_the_flag/ctf_equipment.dm +++ b/code/modules/capture_the_flag/ctf_equipment.dm @@ -1,4 +1,3 @@ - // GENERIC PROJECTILE /obj/projectile/beam/ctf @@ -26,7 +25,6 @@ . = ..() AddElement(/datum/element/delete_on_drop) - /obj/item/ammo_casing/laser/ctf projectile_type = /obj/projectile/beam/ctf/ @@ -47,15 +45,12 @@ . = ..() AddElement(/datum/element/delete_on_drop) - /obj/item/ammo_box/magazine/recharge/ctf/rifle ammo_type = /obj/item/ammo_casing/laser/ctf/rifle - /obj/item/ammo_casing/laser/ctf/rifle projectile_type = /obj/projectile/beam/ctf/rifle - /obj/projectile/beam/ctf/rifle damage = 45 light_color = LIGHT_COLOR_BLUE @@ -85,13 +80,11 @@ ammo_type = /obj/item/ammo_casing/laser/ctf/shotgun max_ammo = 6 - /obj/item/ammo_casing/laser/ctf/shotgun projectile_type = /obj/projectile/beam/ctf/shotgun pellets = 6 variance = 25 - /obj/projectile/beam/ctf/shotgun damage = 15 light_color = LIGHT_COLOR_BLUE @@ -106,6 +99,10 @@ accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/marksman fire_delay = 1 SECONDS +/obj/item/gun/ballistic/automatic/laser/ctf/marksman/Initialize(mapload) + . = ..() + AddComponent(/datum/component/scope, range_modifier = 1.7) + /obj/item/ammo_box/magazine/recharge/ctf/marksman ammo_type = /obj/item/ammo_casing/laser/ctf/marksman max_ammo = 10 @@ -131,16 +128,13 @@ . = ..() AddElement(/datum/element/delete_on_drop) - /obj/item/ammo_box/magazine/recharge/ctf/deagle ammo_type = /obj/item/ammo_casing/laser/ctf/deagle max_ammo = 7 - /obj/item/ammo_casing/laser/ctf/deagle projectile_type = /obj/projectile/beam/ctf/deagle - /obj/projectile/beam/ctf/deagle icon_state = "bullet" damage = 60 @@ -207,7 +201,7 @@ ///Icon state to be fed into the shielded component var/team_shield_icon = "shield-old" var/max_charges = 150 - var/recharge_start_delay = 20 SECONDS + var/recharge_start_delay = 12 SECONDS var/charge_increment_delay = 1 SECONDS var/charge_recovery = 30 var/lose_multiple_charges = TRUE @@ -229,7 +223,6 @@ greyscale_config = /datum/greyscale_config/ctf_light greyscale_config_worn = /datum/greyscale_config/ctf_light/worn slowdown = -0.25 - max_charges = 30 // RED TEAM GUNS @@ -249,7 +242,6 @@ light_color = COLOR_SOFT_RED impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser - // Shotgun /obj/item/gun/ballistic/shotgun/ctf/red accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/red @@ -265,7 +257,6 @@ light_color = COLOR_SOFT_RED impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser - // DMR /obj/item/gun/ballistic/automatic/laser/ctf/marksman/red accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/marksman/red @@ -282,7 +273,6 @@ muzzle_type = /obj/effect/projectile/muzzle/laser impact_type = /obj/effect/projectile/impact/laser - // Instakill /obj/item/gun/energy/laser/instakill/ctf/red desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a red design." @@ -328,7 +318,6 @@ icon_state = "bluelaser" impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser - // DMR /obj/item/gun/ballistic/automatic/laser/ctf/marksman/blue accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/marksman/blue @@ -341,7 +330,6 @@ /obj/projectile/beam/ctf/marksman/blue - // Instakill /obj/item/gun/energy/laser/instakill/ctf/blue desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a blue design." @@ -374,7 +362,6 @@ light_color = COLOR_VERY_PALE_LIME_GREEN impact_effect_type = /obj/effect/temp_visual/impact_effect/green_laser - // Shotgun /obj/item/gun/ballistic/shotgun/ctf/green accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/green @@ -390,7 +377,6 @@ light_color = COLOR_VERY_PALE_LIME_GREEN impact_effect_type = /obj/effect/temp_visual/impact_effect/green_laser - // DMR /obj/item/gun/ballistic/automatic/laser/ctf/marksman/green accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/marksman/green @@ -407,7 +393,6 @@ muzzle_type = /obj/effect/projectile/muzzle/xray impact_type = /obj/effect/projectile/impact/xray - // Instakill /obj/item/gun/energy/laser/instakill/ctf/green desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a green design." @@ -440,7 +425,6 @@ light_color = COLOR_VERY_SOFT_YELLOW impact_effect_type = /obj/effect/temp_visual/impact_effect/yellow_laser - // Shotgun /obj/item/gun/ballistic/shotgun/ctf/yellow accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/shotgun/yellow @@ -456,7 +440,6 @@ light_color = COLOR_VERY_SOFT_YELLOW impact_effect_type = /obj/effect/temp_visual/impact_effect/yellow_laser - // DMR /obj/item/gun/ballistic/automatic/laser/ctf/marksman/yellow accepted_magazine_type = /obj/item/ammo_box/magazine/recharge/ctf/marksman/yellow @@ -473,7 +456,6 @@ muzzle_type = /obj/effect/projectile/muzzle/solar impact_type = /obj/effect/projectile/impact/solar - // Instakill /obj/item/gun/energy/laser/instakill/ctf/yellow desc = "A specialized ASMD laser-rifle, capable of flat-out disintegrating most targets in a single hit. This one has a yellow design." diff --git a/code/modules/capture_the_flag/ctf_game.dm b/code/modules/capture_the_flag/ctf_game.dm index 3e8a3a6fd44..4ab831f7060 100644 --- a/code/modules/capture_the_flag/ctf_game.dm +++ b/code/modules/capture_the_flag/ctf_game.dm @@ -135,7 +135,7 @@ var/datum/outfit/ctf/class = ctf_gear[key] var/datum/radial_menu_choice/option = new option.image = image(icon = initial(class.icon), icon_state = initial(class.icon_state)) - option.info = "[initial(class.class_description)]" + option.info = span_boldnotice("[initial(class.class_description)]") display_classes[key] = option sort_list(display_classes)