mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-27 23:14:18 +01:00
Fixes "3" (#4993)
In converting some things from show_message to visible_message, people forgot that the 2nd argument is not range. But is instead, either blind message or user message. So I fixed it. Also added some high lighting and user messages.
This commit is contained in:
@@ -478,11 +478,11 @@
|
||||
/datum/controller/subsystem/jobs/proc/centcomm_despawn_mob(mob/living/H)
|
||||
if(ishuman(H))
|
||||
global_announcer.autosay("[H.real_name], [H.mind.role_alt_title], has entered long-term storage.", "[current_map.dock_name] Cryogenic Oversight")
|
||||
H.visible_message("<span class='notice'>[H.name] makes their way to the [current_map.dock_short]'s cryostorage, and departs.</span>", 3)
|
||||
H.visible_message("<span class='notice'>[H.name] makes their way to the [current_map.dock_short]'s cryostorage, and departs.</span>", "<span class='notice'>You make your way into [current_map.dock_short]'s cryostorage, and depart.</span>", range = 3)
|
||||
DespawnMob(H)
|
||||
else
|
||||
global_announcer.autosay("[H.real_name], [H.mind.role_alt_title], has entered robotic storage.", "[current_map.dock_name] Robotic Oversight")
|
||||
H.visible_message("<span class='notice'>[H.name] makes their way to the [current_map.dock_short]'s robotic storage, and departs.</span>", 3)
|
||||
H.visible_message("<span class='notice'>[H.name] makes their way to the [current_map.dock_short]'s robotic storage, and departs.</span>", "<span class='notice'>You make your way into [current_map.dock_short]'s robotic storage, and depart.</span>", range = 3)
|
||||
DespawnMob(H)
|
||||
|
||||
/datum/controller/subsystem/jobs/proc/EquipPersonal(mob/living/carbon/human/H, rank, joined_late = FALSE, spawning_at)
|
||||
|
||||
@@ -113,9 +113,9 @@
|
||||
|
||||
|
||||
if(L == user)
|
||||
visible_message("[user] starts climbing onto the operating table.", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts climbing onto [src].</span>", "<span class='notice'>You start climbing onto [src].</span>", range = 3)
|
||||
else
|
||||
visible_message("[user] starts putting [L.name] onto the operating table.", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts putting [L] onto [src].</span>", "<span class='notice'>You start putting [L] onto [src].</span>", range = 3)
|
||||
if (do_mob(user, L, 10, needhand = 0))
|
||||
if (bucklestatus == 2)
|
||||
var/obj/structure/LB = L.buckled
|
||||
@@ -149,9 +149,9 @@
|
||||
|
||||
|
||||
if(L == user)
|
||||
visible_message("[user] starts climbing onto the operating table.", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts climbing onto [src].</span>", "<span class='notice'>You start climbing onto [src].</span>", range = 3)
|
||||
else
|
||||
visible_message("[user] starts putting [L.name] onto the operating table.", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts putting [L] onto [src].</span>", "<span class='notice'>You start putting [L] onto [src].</span>", range = 3)
|
||||
if (do_mob(user, L, 10, needhand = 0))
|
||||
if (bucklestatus == 2)
|
||||
var/obj/structure/LB = L.buckled
|
||||
|
||||
@@ -161,7 +161,7 @@
|
||||
user << "<span class='warning'>\The machine won't accept that.</span>"
|
||||
return
|
||||
|
||||
visible_message("[user] starts putting [G.affecting] into the [src].", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts putting [G.affecting] into [src].</span>", "<span class='notice'>You start putting [G.affecting] into [src].</span>", range = 3)
|
||||
|
||||
if (do_mob(user, G.affecting, 20, needhand = 0))
|
||||
if(occupant)
|
||||
|
||||
@@ -95,8 +95,8 @@
|
||||
src.icon_state = "body_scanner_0"
|
||||
return
|
||||
|
||||
/obj/machinery/bodyscanner/attackby(obj/item/weapon/grab/G as obj, user as mob)
|
||||
if ((!( istype(G, /obj/item/weapon/grab) ) || !( ismob(G.affecting) )))
|
||||
/obj/machinery/bodyscanner/attackby(obj/item/weapon/grab/G, mob/user)
|
||||
if ((!( istype(G, /obj/item/weapon/grab) ) || !( isliving(G.affecting) )))
|
||||
return
|
||||
if (src.occupant)
|
||||
user << "<span class='warning'>The scanner is already occupied!</span>"
|
||||
@@ -105,28 +105,26 @@
|
||||
user << "<span class='warning'>Subject cannot have abiotic items on.</span>"
|
||||
return
|
||||
|
||||
if(istype(G, /obj/item/weapon/grab))
|
||||
var/mob/living/M = G.affecting
|
||||
user.visible_message("<span class='notice'>[user] starts putting [M] into [src].</span>", "<span class='notice'>You start putting [M] into [src].</span>", range = 3)
|
||||
|
||||
var/mob/living/L = G:affecting
|
||||
visible_message("[user] starts putting [G:affecting] into the scanner bed.", 3)
|
||||
if (do_mob(user, G.affecting, 30, needhand = 0))
|
||||
var/bucklestatus = M.bucklecheck(user)
|
||||
if (!bucklestatus)//incase the patient got buckled during the delay
|
||||
return
|
||||
if (bucklestatus == 2)
|
||||
var/obj/structure/LB = M.buckled
|
||||
LB.user_unbuckle_mob(user)
|
||||
if (M.client)
|
||||
M.client.perspective = EYE_PERSPECTIVE
|
||||
M.client.eye = src
|
||||
|
||||
if (do_mob(user, G:affecting, 30, needhand = 0))
|
||||
var/bucklestatus = L.bucklecheck(user)
|
||||
if (!bucklestatus)//incase the patient got buckled during the delay
|
||||
return
|
||||
if (bucklestatus == 2)
|
||||
var/obj/structure/LB = L.buckled
|
||||
LB.user_unbuckle_mob(user)
|
||||
var/mob/M = G.affecting
|
||||
if (istype(M) && M.client)
|
||||
M.client.perspective = EYE_PERSPECTIVE
|
||||
M.client.eye = src
|
||||
M.loc = src
|
||||
src.occupant = M
|
||||
update_use_power(2)
|
||||
src.icon_state = "body_scanner_1"
|
||||
for(var/obj/O in src)
|
||||
O.loc = src.loc
|
||||
M.forceMove(src)
|
||||
src.occupant = M
|
||||
update_use_power(2)
|
||||
src.icon_state = "body_scanner_1"
|
||||
for(var/obj/O in src)
|
||||
O.forceMove(loc)
|
||||
//Foreach goto(154)
|
||||
src.add_fingerprint(user)
|
||||
//G = null
|
||||
@@ -153,9 +151,9 @@
|
||||
return
|
||||
|
||||
if(L == user)
|
||||
visible_message("[user] starts climbing into the scanner bed.", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts climbing into [src].</span>", "<span class='notice'>You start climbing into [src].</span>", range = 3)
|
||||
else
|
||||
visible_message("[user] starts putting [L.name] into the scanner bed.", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts putting [L] into [src].</span>", "<span class='notice'>You start putting [L] into [src].</span>", range = 3)
|
||||
|
||||
if (do_mob(user, L, 30, needhand = 0))
|
||||
if (bucklestatus == 2)
|
||||
|
||||
@@ -861,7 +861,7 @@
|
||||
|
||||
|
||||
/obj/machinery/bot/mulebot/explode()
|
||||
src.visible_message("<span class='danger'>[src] blows apart!</span>", 1)
|
||||
visible_message("<span class='danger'>[src] blows apart!</span>")
|
||||
var/turf/Tsec = get_turf(src)
|
||||
|
||||
new /obj/item/device/assembly/prox_sensor(Tsec)
|
||||
|
||||
+17
-16
@@ -181,26 +181,27 @@
|
||||
G.loc = src
|
||||
user.visible_message("[user] adds \a [G] to \the [src]!", "You add \a [G] to \the [src]!")
|
||||
else if(istype(G, /obj/item/weapon/grab))
|
||||
var/obj/item/weapon/grab/grab = G
|
||||
var/mob/living/L = grab.affecting
|
||||
|
||||
var/mob/living/L = G:affecting
|
||||
visible_message("[user] starts putting [G:affecting] into the cryopod.", 3)
|
||||
if (!istype(L))
|
||||
return
|
||||
|
||||
if (do_mob(user, G:affecting, 30, needhand = 0))
|
||||
user.visible_message("<span class='notice'>[user] starts putting [L] into [src].</span>", "<span class='notice'>You start putting [L] into [src].</span>", range = 3)
|
||||
|
||||
if (do_mob(user, L, 30, needhand = 0))
|
||||
var/bucklestatus = L.bucklecheck(user)
|
||||
if (!bucklestatus)//incase the patient got buckled during the delay
|
||||
return
|
||||
if (bucklestatus == 2)
|
||||
var/obj/structure/LB = L.buckled
|
||||
LB.user_unbuckle_mob(user)
|
||||
if(!ismob(G:affecting))
|
||||
return
|
||||
for(var/mob/living/carbon/slime/M in range(1,G:affecting))
|
||||
if(M.Victim == G:affecting)
|
||||
usr << "[G:affecting:name] will not fit into the cryo because they have a slime latched onto their head."
|
||||
for(var/mob/living/carbon/slime/M in range(1, L))
|
||||
if(M.Victim == L)
|
||||
user << "[L] will not fit into the cryo because they have a slime latched onto their head."
|
||||
return
|
||||
var/mob/M = G:affecting
|
||||
if(put_mob(M))
|
||||
visible_message("[user] puts [M.name] into the cryo cell.", 3)
|
||||
if(put_mob(L))
|
||||
user.visible_message("<span class='notice'>[user] puts [L] into [src].</span>", "<span class='notice'>You put [L] into [src].</span>", range = 3)
|
||||
qdel(G)
|
||||
return
|
||||
|
||||
@@ -221,18 +222,18 @@
|
||||
return
|
||||
|
||||
if(L == user)
|
||||
visible_message("[user] starts climbing into the cryopod.", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts climbing into [src].</span>", "<span class='notice'>You start climbing into [src].</span>", range = 3)
|
||||
else
|
||||
visible_message("[user] starts putting [L.name] into the cryopod.", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts putting [L] into the cryopod.</span>", "<span class='notice'>You start putting [L] into [src].</span>", range = 3)
|
||||
if (do_mob(user, L, 30, needhand = 0))
|
||||
if (bucklestatus == 2)
|
||||
var/obj/structure/LB = L.buckled
|
||||
LB.user_unbuckle_mob(user)
|
||||
if(put_mob(L))
|
||||
if(L == user)
|
||||
visible_message("[user] climbs into the cryo cell.", 3)
|
||||
user.visible_message("<span class='notice'>[user] climbs into [src].</span>", "<span class='notice'>You climb into [src].</span>", range = 3)
|
||||
else
|
||||
visible_message("[user] puts [L.name] into the cryo cell.", 3)
|
||||
user.visible_message("<span class='notice'>[user] puts [L] into [src].</span>", "<span class='notice'>You put [L] into [src].</span>", range = 3)
|
||||
if(user.pulling == L)
|
||||
user.pulling = null
|
||||
|
||||
@@ -395,7 +396,7 @@
|
||||
return
|
||||
if (usr.stat != 0)
|
||||
return
|
||||
visible_message("[usr] climbs into the cryo cell.", 3)
|
||||
usr.visible_message("<span class='notice'>[usr] climbs into [src].</span>", "<span class='notice'>You climb into [src].</span>", range = 3)
|
||||
put_mob(usr)
|
||||
return
|
||||
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
user << "<span class='notice'>\The [I] is no longer in storage.</span>"
|
||||
return
|
||||
|
||||
visible_message("<span class='notice'>The console beeps happily as it disgorges \the [I].</span>", 3)
|
||||
visible_message("<span class='notice'>The console beeps happily as it disgorges \the [I].</span>", range = 3)
|
||||
|
||||
I.forceMove(get_turf(src))
|
||||
frozen_items -= I
|
||||
@@ -121,7 +121,7 @@
|
||||
user << "<span class='notice'>There is nothing to recover from storage.</span>"
|
||||
return
|
||||
|
||||
visible_message("<span class='notice'>The console beeps happily as it disgorges the desired objects.</span>", 3)
|
||||
visible_message("<span class='notice'>The console beeps happily as it disgorges the desired objects.</span>", range = 3)
|
||||
|
||||
for(var/obj/item/I in frozen_items)
|
||||
I.forceMove(get_turf(src))
|
||||
@@ -320,44 +320,44 @@
|
||||
icon_state = base_icon_state
|
||||
|
||||
global_announcer.autosay("[occupant.real_name], [occupant.mind.role_alt_title], [on_store_message]", "[on_store_name]")
|
||||
visible_message("<span class='notice'>\The [initial(name)] hums and hisses as it moves [occupant.real_name] into storage.</span>", 3)
|
||||
visible_message("<span class='notice'>\The [initial(name)] hums and hisses as it moves [occupant.real_name] into storage.</span>")
|
||||
|
||||
// Let SSjobs handle the rest.
|
||||
SSjobs.DespawnMob(occupant)
|
||||
|
||||
set_occupant(null)
|
||||
|
||||
/obj/machinery/cryopod/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
|
||||
/obj/machinery/cryopod/attackby(var/obj/item/weapon/grab/G, var/mob/user as mob)
|
||||
|
||||
if(istype(G, /obj/item/weapon/grab))
|
||||
if(istype(G))
|
||||
|
||||
if(occupant)
|
||||
user << "<span class='notice'>\The [src] is in use.</span>"
|
||||
return
|
||||
|
||||
if(!ismob(G:affecting))
|
||||
if(!ismob(G.affecting))
|
||||
return
|
||||
|
||||
if(!check_occupant_allowed(G:affecting))
|
||||
if(!check_occupant_allowed(G.affecting))
|
||||
return
|
||||
|
||||
var/willing = null //We don't want to allow people to be forced into despawning.
|
||||
var/mob/M = G:affecting
|
||||
var/mob/M = G.affecting
|
||||
|
||||
if(M.client)
|
||||
var/originalloc = M.loc
|
||||
if(alert(M,"Would you like to enter long-term storage?",,"Yes","No") == "Yes")
|
||||
if(!M || !G || !G:affecting || M.loc != originalloc) return
|
||||
if(!M || !G || !G.affecting || M.loc != originalloc) return
|
||||
willing = 1
|
||||
else
|
||||
willing = 1
|
||||
|
||||
if(willing)
|
||||
|
||||
visible_message("[user] starts putting [G:affecting:name] into \the [name].", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts putting [G.affecting] into [src].</span>", "<span class='notice'>You start putting [G.affecting] into [src].</span>", range = 3)
|
||||
|
||||
if(do_after(user, 20))
|
||||
if(!M || !G || !G:affecting) return
|
||||
if(!M || !G || !G.affecting) return
|
||||
|
||||
M.forceMove(src)
|
||||
|
||||
@@ -410,9 +410,9 @@
|
||||
|
||||
if(willing)
|
||||
if(L == user)
|
||||
visible_message("[user] starts climbing into \the [name].", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts climbing into [src].</span>", "<span class='notice'>You start climbing into [src].</span>", range = 3)
|
||||
else
|
||||
visible_message("[user] starts putting [L] into \the [name].", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts putting [L] into [src].</span>", "<span class='notice'>You start putting [L] into [src].</span>", range = 3)
|
||||
|
||||
if(do_after(user, 20))
|
||||
if(!L) return
|
||||
@@ -483,7 +483,7 @@
|
||||
usr << "You're too busy getting your life sucked out of you."
|
||||
return
|
||||
|
||||
visible_message("[usr] starts climbing into \the [src].", 3)
|
||||
usr.visible_message("<span class='notice'>[usr] starts climbing into [src].</span>", "<span class='notice'>You start climbing into [src].</span>", range = 3)
|
||||
|
||||
if(do_after(usr, 20))
|
||||
|
||||
|
||||
@@ -151,7 +151,7 @@
|
||||
if(H.species.can_shred(H))
|
||||
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
|
||||
playsound(src.loc, 'sound/effects/Glasshit.ogg', 75, 1)
|
||||
visible_message("<span class='danger'>[user] smashes against the [src.name].</span>", 1)
|
||||
user.visible_message("<span class='danger'>[user] smashes against [src].</span>", "<span class='danger'>You smash against [src]!</span>")
|
||||
take_damage(25)
|
||||
return
|
||||
return src.attackby(user, user)
|
||||
|
||||
@@ -154,7 +154,7 @@ datum/track/New(var/title_name, var/audio)
|
||||
|
||||
/obj/machinery/media/jukebox/proc/explode()
|
||||
walk_to(src,0)
|
||||
src.visible_message("<span class='danger'>\the [src] blows apart!</span>", 1)
|
||||
visible_message("<span class='danger'>\the [src] blows apart!</span>")
|
||||
|
||||
explosion(src.loc, 0, 0, 1, rand(1,2), 1)
|
||||
|
||||
|
||||
@@ -358,7 +358,7 @@
|
||||
src.SUIT = null
|
||||
if(src.MASK)
|
||||
src.MASK = null
|
||||
visible_message("<font color='red'>With a loud whining noise, the Suit Storage Unit's door grinds open. Puffs of ashen smoke come out of its chamber.</font>", 3)
|
||||
visible_message("<font color='red'>With a loud whining noise, [src]'s door grinds open. Puffs of ashen smoke come out of its chamber.</font>", range = 3)
|
||||
src.isbroken = 1
|
||||
src.isopen = 1
|
||||
src.islocked = 0
|
||||
@@ -453,7 +453,7 @@
|
||||
if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) )
|
||||
usr << "<font color='red'>It's too cluttered inside for you to fit in!</font>"
|
||||
return
|
||||
visible_message("[usr] starts squeezing into the suit storage unit!", 3)
|
||||
usr.visible_message("<span class='notice'>[usr] starts squeezing into [src]!</span>", "<span class='notice'>You start squeezing into [src]!</span>", range = 3)
|
||||
if(do_after(usr, 10))
|
||||
usr.stop_pulling()
|
||||
usr.client.perspective = EYE_PERSPECTIVE
|
||||
@@ -497,7 +497,7 @@
|
||||
if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) ) //Unit needs to be absolutely empty
|
||||
user << "<font color='red'>The unit's storage area is too cluttered.</font>"
|
||||
return
|
||||
visible_message("[user] starts putting [G.affecting.name] into the Suit Storage Unit.", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts putting [G.affecting] into [src].</span>", "<span class='notice'>You start putting [G.affecting] into [src].</span>", range = 3)
|
||||
if(do_after(user, 20))
|
||||
if(!G || !G.affecting) return //derpcheck
|
||||
var/mob/M = G.affecting
|
||||
@@ -700,7 +700,7 @@
|
||||
user << "<span class='danger'>There is no room inside the cycler for [G.affecting.name].</span>"
|
||||
return
|
||||
|
||||
visible_message("<span class='notice'>[user] starts putting [G.affecting.name] into the suit cycler.</span>", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts putting [G.affecting] into [src].</span>", "<span class='notice'>You start putting [G.affecting] into [src].</span>", range = 3)
|
||||
|
||||
if(do_after(user, 20))
|
||||
if(!G || !G.affecting) return
|
||||
|
||||
@@ -192,7 +192,7 @@
|
||||
return
|
||||
|
||||
if(prob(50))
|
||||
src.visible_message("<span class='notice'>You hear something squeezing through the ventilation ducts.</span>",2)
|
||||
visible_message("<span class='notice'>You hear something squeezing through the ventilation ducts.</span>", range = 2)
|
||||
sleep(travel_time)
|
||||
|
||||
if(!exit_vent || exit_vent.welded)
|
||||
|
||||
@@ -334,7 +334,7 @@
|
||||
|
||||
|
||||
var/mob/living/L = G.affecting
|
||||
visible_message("[user] starts putting [L] into the pod bed.", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts putting [L] into [src].</span>", "<span class='notice'>You start putting [L] into [src].</span>", range = 3)
|
||||
|
||||
if (do_mob(user, L, 30, needhand = 0))
|
||||
var/bucklestatus = L.bucklecheck(user)
|
||||
@@ -378,9 +378,9 @@
|
||||
return
|
||||
|
||||
if(H == user)
|
||||
visible_message("[user] starts climbing into the pod bed.", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts climbing into [src].</span>", "<span class='notice'>You start climbing into [src].</span>", range = 3)
|
||||
else
|
||||
visible_message("[user] starts putting [H.name] into the pod bed.", 3)
|
||||
user.visible_message("<span class='notice'>[user] starts putting [H] into [src].</span>", "<span class='notice'>You start putting [H] into [src].</span>", range = 3)
|
||||
|
||||
if (do_mob(user, H, 30, needhand = 0))
|
||||
if (bucklestatus == 2)
|
||||
|
||||
@@ -46,7 +46,7 @@
|
||||
|
||||
anim(get_turf(H), H, 'icons/effects/effects.dmi', "electricity",null,20,null)
|
||||
|
||||
H.visible_message("[H.name] vanishes into thin air!",1)
|
||||
H.visible_message("<span class='notice'>[H] vanishes into thin air!</span>", "<span class='notice'>You vanish into thin air!</span>")
|
||||
|
||||
/obj/item/rig_module/stealth_field/deactivate()
|
||||
|
||||
@@ -278,4 +278,4 @@
|
||||
interface_name = "integrated cryptographic sequencer"
|
||||
interface_desc = "A complex uprade that allows the user to apply an EMAG effect to certain objects. High power cost."
|
||||
|
||||
device_type = /obj/item/weapon/robot_emag
|
||||
device_type = /obj/item/weapon/robot_emag
|
||||
|
||||
@@ -99,7 +99,7 @@
|
||||
last_process_worldtime = world.time
|
||||
|
||||
/obj/machinery/dnaforensics/proc/complete_scan()
|
||||
src.visible_message("<span class='notice'>\icon[src] makes an insistent chime.</span>", 2)
|
||||
visible_message("<span class='notice'>\icon[src] makes an insistent chime.</span>", range = 2)
|
||||
update_icon()
|
||||
if(bloodsamp)
|
||||
var/obj/item/weapon/paper/P = new()
|
||||
|
||||
@@ -324,12 +324,12 @@
|
||||
return
|
||||
G.affecting.loc = src.loc
|
||||
G.affecting.Weaken(5)
|
||||
visible_message("<span class='warning'>[G.assailant] dunks [G.affecting] into the [src]!</span>", 3)
|
||||
visible_message("<span class='warning'>[G.assailant] dunks [G.affecting] into the [src]!</span>", range = 3)
|
||||
qdel(W)
|
||||
return
|
||||
else if (istype(W, /obj/item) && get_dist(src,user)<2)
|
||||
user.drop_item(src.loc)
|
||||
visible_message("<span class='notice'>[user] dunks [W] into the [src]!</span>", 3)
|
||||
visible_message("<span class='notice'>[user] dunks [W] into the [src]!</span>", range = 3)
|
||||
return
|
||||
|
||||
/obj/structure/holohoop/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
|
||||
@@ -339,9 +339,9 @@
|
||||
return
|
||||
if(prob(50))
|
||||
I.loc = src.loc
|
||||
visible_message("<span class='notice'>Swish! \the [I] lands in \the [src].</span>", 3)
|
||||
visible_message("<span class='notice'>Swish! \the [I] lands in \the [src].</span>", range = 3)
|
||||
else
|
||||
visible_message("<span class='warning'>\The [I] bounces off of \the [src]'s rim!</span>", 3)
|
||||
visible_message("<span class='warning'>\The [I] bounces off of \the [src]'s rim!</span>", range = 3)
|
||||
return 0
|
||||
else
|
||||
return ..(mover, target, height, air_group)
|
||||
@@ -482,4 +482,4 @@
|
||||
|
||||
/mob/living/simple_animal/penguin/holodeck/proc/derez()
|
||||
visible_message("<span class='notice'>\The [src] fades away!</span>")
|
||||
qdel(src)
|
||||
qdel(src)
|
||||
|
||||
@@ -150,7 +150,7 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
|
||||
if(src.arcanecheckout)
|
||||
new /obj/item/weapon/book/tome(src.loc)
|
||||
user << "<span class='warning'>Your sanity barely endures the seconds spent in the vault's browsing window. The only thing to remind you of this when you stop browsing is a dusty old tome sitting on the desk. You don't really remember printing it.</span>"
|
||||
user.visible_message("<span class='notice'>\The [user] stares at the blank screen for a few moments, \his expression frozen in fear. When \he finally awakens from it, \he looks a lot older.</span>", 2)
|
||||
user.visible_message("<span class='notice'>\The [user] stares at the blank screen for a few moments, \his expression frozen in fear. When \he finally awakens from it, \he looks a lot older.</span>", range = 2)
|
||||
src.arcanecheckout = 0
|
||||
if(1)
|
||||
// Inventory
|
||||
|
||||
@@ -151,7 +151,7 @@
|
||||
<font size = \"1\">[status_report]</font><br>
|
||||
<center><img src = barcode[rand(0, 3)].png></center></center>"}
|
||||
P.update_icon()
|
||||
visible_message("\icon[src] <span class = 'notice'>The [usr] pings, \"[P.name] ready for review\", and happily disgorges a small printout.</span>", 2)
|
||||
visible_message("\icon[src] <span class = 'notice'>The [usr] pings, \"[P.name] ready for review\", and happily disgorges a small printout.</span>", range = 2)
|
||||
playsound(src.loc, 'sound/machines/ping.ogg', 50, 0)
|
||||
|
||||
/**********************Minebot Upgrades**********************/
|
||||
@@ -220,4 +220,4 @@
|
||||
M.recalculate_synth_capacities()
|
||||
if(!M.jetpack)
|
||||
M.jetpack = new /obj/item/weapon/tank/jetpack/carbondioxide/synthetic(src)
|
||||
qdel(src)
|
||||
qdel(src)
|
||||
|
||||
@@ -45,8 +45,8 @@ obj/item/weapon/gun/energy/staff/special_check(var/mob/living/user)
|
||||
LL.droplimb(0,DROPLIMB_BLUNT)
|
||||
RL.droplimb(0,DROPLIMB_BLUNT)
|
||||
playsound(user, 'sound/effects/splat.ogg', 50, 1)
|
||||
user.visible_message("<span class = 'danger'> With a sickening series of crunches, [user]'s body shrinks, and they begin to sprout feathers!</span>")
|
||||
user.visible_message("<b>[user]</b> screams!",2)
|
||||
user.visible_message("<span class = 'danger'>With a sickening series of crunches, [user]'s body shrinks, and they begin to sprout feathers!</span>")
|
||||
user.visible_message("<b>[user]</b> screams!")
|
||||
new_mob = new /mob/living/simple_animal/parrot(H.loc)
|
||||
new_mob.universal_speak = 1
|
||||
new_mob.key = H.key
|
||||
@@ -84,7 +84,7 @@ obj/item/weapon/gun/energy/staff/animate/special_check(var/mob/living/user)
|
||||
var/active_hand = H.hand
|
||||
playsound(user, 'sound/effects/blobattack.ogg', 40, 1)
|
||||
user.visible_message("<span class = 'danger'> With a sickening crunch, [user]'s hand rips itself off, and begins crawling away!</span>")
|
||||
user.visible_message("<b>[user]</b> screams!",2)
|
||||
user.visible_message("<b>[user]</b> screams!")
|
||||
user.drop_item()
|
||||
if(active_hand)
|
||||
LA.droplimb(0,DROPLIMB_EDGE)
|
||||
|
||||
@@ -236,16 +236,16 @@
|
||||
//emergency stop if seal integrity reaches 0
|
||||
if(scanner_seal_integrity <= 0 || (scanner_temperature >= 1273 && !rad_shield))
|
||||
stop_scanning()
|
||||
src.visible_message("<span class='notice'>\icon[src] buzzes unhappily. It has failed mid-scan!</span>", 2)
|
||||
visible_message("<span class='notice'>\icon[src] buzzes unhappily. It has failed mid-scan!</span>", range = 2)
|
||||
|
||||
if(prob(5))
|
||||
src.visible_message("<span class='notice'>\icon[src] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].</span>", 2)
|
||||
visible_message("<span class='notice'>\icon[src] [pick("whirrs","chuffs","clicks")][pick(" excitedly"," energetically"," busily")].</span>", range = 2)
|
||||
else
|
||||
//gradually cool down over time
|
||||
if(scanner_temperature > 0)
|
||||
scanner_temperature = max(scanner_temperature - 5 - 10 * rand(), 0)
|
||||
if(prob(0.75))
|
||||
src.visible_message("<span class='notice'>\icon[src] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].</span>", 2)
|
||||
visible_message("<span class='notice'>\icon[src] [pick("plinks","hisses")][pick(" quietly"," softly"," sadly"," plaintively")].</span>", range = 2)
|
||||
last_process_worldtime = world.time
|
||||
|
||||
/obj/machinery/radiocarbon_spectrometer/proc/stop_scanning()
|
||||
@@ -263,7 +263,7 @@
|
||||
used_coolant = 0
|
||||
|
||||
/obj/machinery/radiocarbon_spectrometer/proc/complete_scan()
|
||||
src.visible_message("<span class='notice'>\icon[src] makes an insistent chime.</span>", 2)
|
||||
visible_message("<span class='notice'>\icon[src] makes an insistent chime.</span>", range = 2)
|
||||
|
||||
if(scanned_item)
|
||||
//create report
|
||||
|
||||
@@ -195,7 +195,7 @@
|
||||
return 1
|
||||
|
||||
/obj/vehicle/proc/explode()
|
||||
src.visible_message("<span class='danger'>[src] blows apart!</span>", 1)
|
||||
visible_message("<span class='danger'>[src] blows apart!</span>")
|
||||
var/turf/Tsec = get_turf(src)
|
||||
|
||||
new /obj/item/stack/rods(Tsec)
|
||||
|
||||
@@ -0,0 +1,5 @@
|
||||
author: Skull132
|
||||
delete-after: true
|
||||
|
||||
changes:
|
||||
- bugfix: "Fixed a slew of cases where an action would or might print a numeric value to the user."
|
||||
Reference in New Issue
Block a user