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

Fixes "3" (#4993)

Browse Source 
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:
Erki
2018-07-21 14:07:12 +02:00
committed by Werner
parent 1bd59b6532
commit 3d848e7cee
21 changed files with 95 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/rig/modules/ninja.dm
+2 -2
View File
@@ -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
code/modules/detectivework/microscope/dnascanner.dm
+1 -1
View File
@@ -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()
code/modules/holodeck/HolodeckObjects.dm
+5 -5
View File
@@ -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)
code/modules/library/lib_machines.dm
+1 -1
View File
@@ -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
code/modules/mining/minebot.dm
+2 -2
View File
@@ -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)
code/modules/projectiles/guns/energy/magic.dm
+3 -3
View File
@@ -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)
code/modules/research/xenoarchaeology/machinery/geosample_scanner.dm
+4 -4
View File
@@ -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
code/modules/vehicles/vehicle.dm
+1 -1
View File
@@ -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)