cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 08:08:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #47052 from kingofkosmos/misc_span_fixes1

Browse Source 
Misc span fixes
This commit is contained in:
81Denton
2019-10-20 18:46:54 +02:00
committed by GitHub
parent c292e945d0 56b8461580
commit f5bd6a381d
249 changed files with 654 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/ballistic.dm
+1 -2
View File
@@ -406,7 +406,7 @@
/obj/item/gun/ballistic/suicide_act(mob/user)
var/obj/item/organ/brain/B = user.getorganslot(ORGAN_SLOT_BRAIN)
if (B && chambered && chambered.BB && can_trigger_gun(user) && !chambered.BB.nodamage)
user.visible_message("<span class='suicide'>[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!</span>")
user.visible_message("<span class='suicide'>[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!</span>")
sleep(25)
if(user.is_holding(src))
var/turf/T = get_turf(user)
@@ -486,4 +486,3 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list(
/obj/item/suppressor/specialoffer
name = "cheap suppressor"
desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits most weapons."
code/modules/projectiles/guns/ballistic/rifle.dm
+1 -1
View File
@@ -21,7 +21,7 @@ obj/item/gun/ballistic/rifle/update_icon()
obj/item/gun/ballistic/rifle/rack(mob/user = null)
if (bolt_locked == FALSE)
to_chat(user, "<span class='notice'>You open the bolt of \the [src]</span>")
to_chat(user, "<span class='notice'>You open the bolt of \the [src].</span>")
playsound(src, rack_sound, rack_sound_volume, rack_sound_vary)
process_chamber(FALSE, FALSE, FALSE)
bolt_locked = TRUE
code/modules/projectiles/guns/ballistic/shotgun.dm
+2 -2
View File
@@ -101,9 +101,9 @@
alternate_magazine = current_mag
toggled = !toggled
if(toggled)
to_chat(user, "You switch to tube B.")
to_chat(user, "<span class='notice'>You switch to tube B.</span>")
else
to_chat(user, "You switch to tube A.")
to_chat(user, "<span class='notice'>You switch to tube A.</span>")
/obj/item/gun/ballistic/shotgun/automatic/dual_tube/AltClick(mob/living/user)
if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
code/modules/projectiles/guns/energy.dm
+1 -1
View File
@@ -168,7 +168,7 @@
/obj/item/gun/energy/suicide_act(mob/living/user)
if (istype(user) && can_shoot() && can_trigger_gun(user) && user.get_bodypart(BODY_ZONE_HEAD))
user.visible_message("<span class='suicide'>[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!</span>")
user.visible_message("<span class='suicide'>[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!</span>")
sleep(25)
if(user.is_holding(src))
user.visible_message("<span class='suicide'>[user] melts [user.p_their()] face off with [src]!</span>")
code/modules/projectiles/projectile/magic.dm
+1 -1
View File
@@ -579,7 +579,7 @@
return
if(LAZYLEN(candidates))
var/mob/dead/observer/C = pick(candidates)
to_chat(M, "You have been noticed by a ghost, and it has possessed you!")
to_chat(M, "<span class='boldnotice'>You have been noticed by a ghost and it has possessed you!</span>")
var/oldkey = M.key
M.ghostize(0)
M.key = C.key