cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-27 23:14:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

The Great Spanning (#9320)

Browse Source 
This PR get rid of all (most of) the span("thing", spans and replaces them with the SPAN_THING( variant, which has gained more popularity recently.
This commit is contained in:
Geeves
2020-07-12 15:53:28 +03:00
committed by GitHub
parent 29cfd74770
commit 33ad8096fb
260 changed files with 1527 additions and 1525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/gun.dm
+33 -33
View File
@@ -167,19 +167,19 @@
return FALSE
if(user.is_pacified())
to_chat(user, span("notice", "You don't want to risk harming anyone!"))
to_chat(user, SPAN_NOTICE("You don't want to risk harming anyone!"))
return FALSE
var/mob/living/M = user
if(HULK in M.mutations)
to_chat(M, span("danger", "Your fingers are much too large for the trigger guard!"))
to_chat(M, SPAN_DANGER("Your fingers are much too large for the trigger guard!"))
return FALSE
if(ishuman(M))
var/mob/living/carbon/human/A = M
if(A.martial_art?.no_guns)
to_chat(A, span("warning", "[A.martial_art.no_guns_message]"))
to_chat(A, SPAN_WARNING("[A.martial_art.no_guns_message]"))
return FALSE
if((M.is_clumsy()) && prob(40)) //Clumsy handling
@@ -188,8 +188,8 @@
if(process_projectile(P, user, user, pick(BP_L_FOOT, BP_R_FOOT)))
handle_post_fire(user, user)
user.visible_message(
span("danger","\The [user] shoots \himself in the foot with \the [src]!"),
span("danger","You shoot yourself in the foot with \the [src]!")
SPAN_DANGER("\The [user] shoots \himself in the foot with \the [src]!"),
SPAN_DANGER("You shoot yourself in the foot with \the [src]!")
)
M.drop_item()
else
@@ -204,7 +204,7 @@
return FALSE
else
if(needspin)
to_chat(user, span("warning","\The [src]'s trigger is locked. This weapon doesn't have a firing pin installed!"))
to_chat(user, SPAN_WARNING("\The [src]'s trigger is locked. This weapon doesn't have a firing pin installed!"))
return FALSE
else
return TRUE
@@ -218,7 +218,7 @@
toggle_wield(usr)
update_held_icon()
else
to_chat(usr, span("warning", "You can't wield \the [src]!"))
to_chat(usr, SPAN_WARNING("You can't wield \the [src]!"))
/obj/item/gun/ui_action_click()
if(src in usr)
@@ -287,7 +287,7 @@
if(world.time < next_fire_time)
if (world.time % 3) //to prevent spam
to_chat(user, span("warning","\The [src] is not ready to fire again!"))
to_chat(user, SPAN_WARNING("\The [src] is not ready to fire again!"))
return FALSE
var/shoot_time = (burst - 1) * burst_delay
@@ -407,7 +407,7 @@
//called if there was no projectile to shoot
/obj/item/gun/proc/handle_click_empty(mob/user)
if(user)
to_chat(user, span("danger","*click*"))
to_chat(user, SPAN_DANGER("*click*"))
else
src.visible_message("*click click*")
playsound(loc, 'sound/weapons/empty.ogg', 100, 1)
@@ -515,20 +515,20 @@
var/mob/living/carbon/human/M = user
mouthshoot = TRUE
M.visible_message(span("warning", "\The [user] sticks their gun in their mouth, ready to pull the trigger..."))
M.visible_message(SPAN_WARNING("\The [user] sticks their gun in their mouth, ready to pull the trigger..."))
if(!do_after(user, 40))
M.visible_message(span("notice", "\The [user] decided life was worth living"))
M.visible_message(SPAN_NOTICE("\The [user] decided life was worth living"))
mouthshoot = FALSE
return
var/obj/item/projectile/in_chamber = consume_next_projectile()
if (istype(in_chamber))
user.visible_message(span("warning", "\The [user] pulls the trigger."))
user.visible_message(SPAN_WARNING("\The [user] pulls the trigger."))
if (!pin && needspin)//Checks the pin of the gun.
user.visible_message(span("warning", "*click click*"))
user.visible_message(SPAN_WARNING("*click click*"))
mouthshoot = FALSE
return
if (!pin.pin_auth() && needspin)
user.visible_message(span("warning", "*click click*"))
user.visible_message(SPAN_WARNING("*click click*"))
mouthshoot = FALSE
return
if(safety() && user.a_intent != I_HURT)
@@ -544,11 +544,11 @@
in_chamber.on_hit(M)
if (in_chamber.damage == 0)
user.show_message(span("warning", "You feel rather silly, trying to commit suicide with a toy."))
user.show_message(SPAN_WARNING("You feel rather silly, trying to commit suicide with a toy."))
mouthshoot = FALSE
return
else if (in_chamber.damage_type == PAIN)
to_chat(user, span("notice", "Ow..."))
to_chat(user, SPAN_NOTICE("Ow..."))
user.apply_effect(110,PAIN,0)
else
log_and_message_admins("[key_name(user)] commited suicide using \a [src]")
@@ -625,7 +625,7 @@
/obj/item/gun/attack_self(mob/user)
var/datum/firemode/new_mode = switch_firemodes(user)
if(new_mode)
to_chat(user, span("notice", "\The [src] is now set to [new_mode.name]."))
to_chat(user, SPAN_NOTICE("\The [src] is now set to [new_mode.name]."))
// Safety Procs
@@ -633,7 +633,7 @@
safety_state = !safety_state
update_icon()
if(user)
to_chat(user, span("notice", "You switch the safety [safety_state ? "on" : "off"] on \the [src]."))
to_chat(user, SPAN_NOTICE("You switch the safety [safety_state ? "on" : "off"] on \the [src]."))
playsound(src, 'sound/weapons/safety_click.ogg', 30, 1)
/obj/item/gun/verb/toggle_safety_verb()
@@ -660,20 +660,20 @@
if(!is_wieldable)
return
if(!istype(user.get_active_hand(), /obj/item/gun))
to_chat(user, span("warning", "You need to be holding \the [name] in your active hand."))
to_chat(user, SPAN_WARNING("You need to be holding \the [name] in your active hand."))
return
if(!ishuman(user))
to_chat(user, span("warning", "It's too heavy for you to stabilize properly."))
to_chat(user, SPAN_WARNING("It's too heavy for you to stabilize properly."))
return
var/mob/living/carbon/human/M = user
if(M.isMonkey())
to_chat(user, span("warning", "It's too heavy for you to stabilize properly."))
to_chat(user, SPAN_WARNING("It's too heavy for you to stabilize properly."))
return
if(wielded)
unwield()
to_chat(user, span("notice", "You are no-longer stabilizing \the [name] with both hands."))
to_chat(user, SPAN_NOTICE("You are no-longer stabilizing \the [name] with both hands."))
var/obj/item/offhand/O = user.get_inactive_hand()
if(O && istype(O))
@@ -684,10 +684,10 @@
else
if(user.get_inactive_hand())
to_chat(user, span("warning", "You need your other hand to be empty."))
to_chat(user, SPAN_WARNING("You need your other hand to be empty."))
return
wield()
to_chat(user, span("notice", "You stabilize \the [initial(name)] with both hands."))
to_chat(user, SPAN_NOTICE("You stabilize \the [initial(name)] with both hands."))
var/obj/item/offhand/O = new(user)
O.name = "[initial(name)] - offhand"
@@ -725,7 +725,7 @@
if(is_wieldable)
if(wielded)
if(!disable_warning) // unfortunately not sure there's a way to get this to only fire once when it's looped
to_chat(M, span("warning", "Lower \the [initial(name)] first!"))
to_chat(M, SPAN_WARNING("Lower \the [initial(name)] first!"))
return FALSE
return ..()
@@ -776,7 +776,7 @@
if(user)
var/obj/item/gun/O = user.get_inactive_hand()
if(istype(O))
to_chat(user, span("notice", "You are no-longer stabilizing \the [name] with both hands."))
to_chat(user, SPAN_NOTICE("You are no-longer stabilizing \the [name] with both hands."))
O.unwield()
unwield()
@@ -824,31 +824,31 @@
return ..()
if(bayonet)
to_chat(user, span("danger", "There is a bayonet attached to \the [src] already."))
to_chat(user, SPAN_DANGER("There is a bayonet attached to \the [src] already."))
return
user.drop_from_inventory(I,src)
bayonet = I
to_chat(user, span("notice", "You attach \the [I] to the front of \the [src]."))
to_chat(user, SPAN_NOTICE("You attach \the [I] to the front of \the [src]."))
update_icon()
if(I.iscrowbar() && bayonet)
to_chat(user, span("notice", "You detach \the [bayonet] from \the [src]."))
to_chat(user, SPAN_NOTICE("You detach \the [bayonet] from \the [src]."))
bayonet.forceMove(get_turf(src))
bayonet = null
update_icon()
if(pin && I.isscrewdriver())
visible_message(span("warning", "\The [user] begins to try and pry out \the [src]'s firing pin!"))
visible_message(SPAN_WARNING("\The [user] begins to try and pry out \the [src]'s firing pin!"))
if(do_after(user,45 SECONDS,act_target = src))
if(pin.durable || prob(50))
visible_message(span("notice", "\The [user] pops \the [pin] out of \the [src]!"))
visible_message(SPAN_NOTICE("\The [user] pops \the [pin] out of \the [src]!"))
pin.forceMove(get_turf(src))
pin = null//clear it out.
else
user.visible_message(
span("warning", "\The [user] breaks some electronics free from \the [src] with a crack."),
span("alert", "You apply a bit too much force to \the [pin], and it breaks in two. Oops."),
SPAN_WARNING("\The [user] breaks some electronics free from \the [src] with a crack."),
SPAN_ALERT("You apply a bit too much force to \the [pin], and it breaks in two. Oops."),
"You hear a metallic crack.")
qdel(pin)
pin = null
code/modules/projectiles/guns/energy/blaster.dm
+1 -1
View File
@@ -57,7 +57,7 @@
else
return
user.visible_message(span("warning","\The [user] spins the cylinder of \the [src]!"),span("warning","You spin the cylinder of \the [src]!"),span("notice","You hear something metallic spin and click."))
user.visible_message(SPAN_WARNING("\The [user] spins the cylinder of \the [src]!"), SPAN_WARNING("You spin the cylinder of \the [src]!"), SPAN_NOTICE("You hear something metallic spin and click."))
playsound(src.loc, 'sound/weapons/revolver_spin.ogg', 100, 1)
/obj/item/gun/energy/blaster/revolver/pilot
code/modules/projectiles/guns/projectile.dm
+1 -1
View File
@@ -213,7 +213,7 @@
playsound(src.loc, 'sound/weapons/empty.ogg', 50, 1)
jam_num--
if(!jam_num)
visible_message(span("danger", "\The [user] unjams \the [src]!"))
visible_message(SPAN_DANGER("\The [user] unjams \the [src]!"))
playsound(src.loc, 'sound/items/glowstick.ogg', 100, 1)
unjam_cooldown = world.time
else if(unjam_cooldown + 2 SECONDS > world.time)
code/modules/projectiles/modular/laser_base.dm
+1 -1
View File
@@ -173,7 +173,7 @@
for(var/v in gun_mods)
var/obj/item/laser_components/modifier/M = v
if(M.type == m.type)
to_chat(user, span("warning", "\The [name] already has [m]."))
to_chat(user, SPAN_WARNING("\The [name] already has [m]."))
return FALSE
gun_mods += A
user.drop_from_inventory(A,src)
code/modules/projectiles/targeting/targeting_triggers.dm
+1 -1
View File
@@ -15,7 +15,7 @@
G.toggle_safety()
else
G.handle_click_empty(owner)
to_chat(owner, span("warning", "Your [G]'s safety prevents firing."))
to_chat(owner, SPAN_WARNING("Your [G]'s safety prevents firing."))
if(!owner || !aiming_with || !aiming_at || !locked)
return
if(perm && (target_permissions & perm))