cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-16 04:34:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Few CTF changes. (#77533)

Browse Source 
## About The Pull Request
- Fixed that if you chose to press a cross while toggling instagib mode
it will react as `Yes` instead of just canceling
- Added description for assault class (with shotgun and rocket gloves)
so you know that you have faster moving speed and lover armor.
- Fixed that when you already chose a team and try to click on other
teams spawners you'll be asked to consider other teams to make them
equal.
- Decreased time of recharge start delay from 20 seconds to 12, because
when it takes soo much to regen your shield its just faster to die and
respawn with a new one.
- Added 1.7 scope to marksmans rifle.
- Little cleanup.

**Everything is arguable.**
**Ask if something is unclear or confusing.**
## Why It's Good For The Game
Less buggs, less wondering why do you die in 1 hit and others don't, a
little bit of consistency.
## Changelog
🆑
qol: CTF assault class' (with shotgun and rocket gloves) description now
mentions that it has low armor and increased moving speed.
balance: Decreased CTF recharge start delay for shields from 20 seconds
to 12 seconds.
balance: Marksmans rifle now has 1.7 scope.
fix: When toggling instagib mode for CTF and pressing a cross now will
just cancel instead of proceeding.
fix: When clicking on other CTF teams spawners and after you already
chose your team no more will ask you to join some other team to make
them even.
/🆑
This commit is contained in:
Helg2
2023-08-19 02:10:22 +03:00
committed by GitHub
parent 164c75f1df
commit 803f9edabe
5 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/admin/verbs/secrets.dm
View File

@@ -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]")

4
code/modules/capture_the_flag/ctf_classes.dm
View File

@@ -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

2
code/modules/capture_the_flag/ctf_controller.dm
View File

@@ -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

28
code/modules/capture_the_flag/ctf_equipment.dm
View File

@@ -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."

2
code/modules/capture_the_flag/ctf_game.dm
View File

@@ -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 = "<span class='boldnotice'>[initial(class.class_description)]</span>"
option.info = span_boldnotice("[initial(class.class_description)]")
display_classes[key] = option
sort_list(display_classes)