cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 20:43:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

SOFTREF macro (#2574)

Browse Source 
Adds a SOFTREF macro because it's an actual PITA to write out. Refactors all applicable usecases of it to use it. I've left out some NanoUI stuff because you know my preference at being explicit when needed.
This commit is contained in:
skull132
2017-06-02 20:22:38 +03:00
committed by GitHub
parent e2acfcd38e
commit 61826d2fa1
7 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences_notification.dm
+2 -2
View File
@@ -31,8 +31,8 @@
note_wrapper = new_wrapper
note_text = new_text
note_text = replacetextEx(note_text, ":src_ref", "\ref[src]")
note_wrapper[1] = replacetextEx(note_wrapper[1], ":src_ref", "\ref[src]")
note_text = replacetextEx(note_text, ":src_ref", SOFTREF(src))
note_wrapper[1] = replacetextEx(note_wrapper[1], ":src_ref", SOFTREF(src))
if (new_persistence)
persistent = new_persistence
code/modules/events/carp_migration.dm
+3 -3
View File
@@ -43,10 +43,10 @@
for (var/j = 1, j <= group_size, j++)
if(prob(99))
var/mob/living/simple_animal/hostile/carp/carp = new(spawn_locations[i])
spawned_carp += "\ref[carp]"
spawned_carp += SOFTREF(carp)
else
var/mob/living/simple_animal/hostile/carp/shark/carp = new(spawn_locations[i])
spawned_carp += "\ref[carp]"
spawned_carp += SOFTREF(carp)
i++
/datum/event/carp_migration/proc/spawn_caverndweller(var/num_groups, var/group_size_min=2, var/group_size_max=3)
@@ -63,7 +63,7 @@
var/group_size = rand(group_size_min, group_size_max)
for (var/j = 1, j <= group_size, j++)
var/mob/living/simple_animal/hostile/retaliate/cavern_dweller/dweller = new(spawn_locations[i])
spawned_dweller += "\ref[dweller]"
spawned_dweller += SOFTREF(dweller)
i++
/datum/event/carp_migration/end()
code/modules/power/apc.dm
+2 -2
View File
@@ -754,9 +754,9 @@
H << "<span class='danger'>The APC power currents surge eratically, damaging your chassis!</span>"
H.adjustFireLoss(10, 0)
if(infected)
if("\ref[H]" in hacked_ipcs)
if(SOFTREF(H) in hacked_ipcs)
return
LAZYADD(hacked_ipcs, "\ref[H]")
LAZYADD(hacked_ipcs, SOFTREF(H))
infected = 0
H << "<span class = 'danger'>Fil$ Transfer Complete. Er-@4!#%!. New Master detected: [hacker]! Obey their commands.</span>"
hacker << "<span class = 'notice'>Corrupt files transfered to [H]. They are now under your control until they are reparied.</span>"