mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2025-12-15 12:11:45 +00:00
Few CTF changes. (#77533)
## 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:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user