cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-24 05:06:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace all modular HTML spans with defines spans

Browse Source 
In total:
- Adds span defines for `reallybig hypnophrase`, `big warning`, `header`
- Fixes a missing apostrophe for hypno stare
- Makes a special exception for cuddling.dm, which uses an irregular span
- Puts the spans file back
This commit is contained in:
Darius
2023-01-16 04:05:27 -05:00
parent 41e15dd097
commit ad0239b5de
108 changed files with 779 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_splurt/code/modules/projectiles/guns/ballistic/automatic.dm
+6 -6
View File
@@ -35,11 +35,11 @@
/obj/item/gun/ballistic/automatic/m2a1/examine(mob/user)
. = ..()
if(cover_open && magazine)
. += "<span class='notice'>It seems like you could use an <b>empty hand</b> to remove the magazine.</span>"
. += span_notice("It seems like you could use an <b>empty hand</b> to remove the magazine.")
/obj/item/gun/ballistic/automatic/m2a1/attack_self(mob/user)
cover_open = !cover_open
to_chat(user, "<span class='notice'>You [cover_open ? "open" : "close"] [src]'s cover.</span>")
to_chat(user, span_notice("You [cover_open ? "open" : "close"] [src]'s cover."))
if(cover_open)
playsound(user, 'sound/weapons/sawopen.ogg', 60, 1)
else
@@ -52,7 +52,7 @@
/obj/item/gun/ballistic/automatic/m2a1/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params)
if(cover_open)
to_chat(user, "<span class='warning'>[src]'s cover is open! Close it before firing!</span>")
to_chat(user, span_warning("[src]'s cover is open! Close it before firing!"))
else
. = ..()
update_icon()
@@ -70,12 +70,12 @@
user.put_in_hands(magazine)
magazine = null
update_icon()
to_chat(user, "<span class='notice'>You remove the magazine from [src].</span>")
to_chat(user, span_notice("You remove the magazine from [src]."))
playsound(user, 'sound/weapons/magout.ogg', 60, 1)
/obj/item/gun/ballistic/automatic/m2a1/attackby(obj/item/A, mob/user, params)
if(!cover_open && istype(A, mag_type))
to_chat(user, "<span class='warning'>[src]'s cover is closed! You can't insert a new mag.</span>")
to_chat(user, span_warning("[src]'s cover is closed! You can't insert a new mag."))
return
..()
@@ -108,7 +108,7 @@
if(auto_eject && magazine && magazine.stored_ammo && !magazine.stored_ammo.len && !chambered)
magazine.dropped()
user.visible_message(
"<span class='warning'>[magazine] flies out and clatters on the floor!</span>",
span_warning("[magazine] flies out and clatters on the floor!"),
to_chat("[magazine] flies out and clatters on the floor!")
)
if(auto_eject_sound)
modular_splurt/code/modules/projectiles/guns/ballistic/shotgun.dm
+1 -1
View File
@@ -104,7 +104,7 @@
if(recentpump > world.time)
return
if(IS_STAMCRIT(user))//CIT CHANGE - makes pumping shotguns impossible in stamina softcrit
to_chat(user, "<span class='warning'>You're too exhausted for that.</span>")//CIT CHANGE - ditto
to_chat(user, span_warning("You're too exhausted for that."))//CIT CHANGE - ditto
return//CIT CHANGE - ditto
pump(user, TRUE)
if(HAS_TRAIT(user, TRAIT_FAST_PUMP))