cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Mass replace

Browse Source
This commit is contained in:
Tigercat2000
2016-07-07 19:34:02 -07:00
parent dc408f090d
commit 71e5344a98
870 changed files with 7679 additions and 7679 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/collector.dm
+2 -2
View File
@@ -84,7 +84,7 @@ var/global/list/rad_collectors = list()
else
disconnect_from_network()
else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
if (src.allowed(user))
if(src.allowed(user))
if(active)
src.locked = !src.locked
to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]")
@@ -109,7 +109,7 @@ var/global/list/rad_collectors = list()
/obj/machinery/power/rad_collector/proc/eject()
locked = 0
var/obj/item/weapon/tank/plasma/Z = src.P
if (!Z)
if(!Z)
return
Z.loc = get_turf(src)
Z.layer = initial(Z.layer)
code/modules/power/singularity/emitter.dm
+6 -6
View File
@@ -64,7 +64,7 @@
set category = "Object"
set src in oview(1)
if (src.anchored || usr:stat)
if(src.anchored || usr:stat)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 90)
@@ -117,7 +117,7 @@
return ..()
/obj/machinery/power/emitter/update_icon()
if (active && powernet && avail(active_power_usage))
if(active && powernet && avail(active_power_usage))
icon_state = "emitter_+a"
else
icon_state = "emitter"
@@ -253,12 +253,12 @@
if(0)
to_chat(user, "\red The [src.name] needs to be wrenched to the floor.")
if(1)
if (WT.remove_fuel(0,user))
if(WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
"You start to weld the [src] to the floor.", \
"You hear welding")
if (do_after(user,20, target = src))
if(do_after(user,20, target = src))
if(!src || !WT.isOn()) return
state = 2
to_chat(user, "You weld the [src] to the floor.")
@@ -266,12 +266,12 @@
else
to_chat(user, "\red You need more welding fuel to complete this task.")
if(2)
if (WT.remove_fuel(0,user))
if(WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
"You start to cut the [src] free from the floor.", \
"You hear welding")
if (do_after(user,20, target = src))
if(do_after(user,20, target = src))
if(!src || !WT.isOn()) return
state = 1
to_chat(user, "You cut the [src] free from the floor.")
code/modules/power/singularity/field_generator.dm
+13 -13
View File
@@ -125,24 +125,24 @@ field_generator power level display
to_chat(user, "<span class='warning'>The [src.name] needs to be wrenched to the floor!</span>")
return
if(1)
if (WT.remove_fuel(0,user))
if(WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
"<span class='notice'>You start to weld \the [src] to the floor...</span>", \
"<span class='italics'>You hear welding.</span>")
if (do_after(user,20, target = src))
if(do_after(user,20, target = src))
if(!src || !WT.isOn()) return
state = 2
to_chat(user, "<span class='notice'>You weld the field generator to the floor.</span>")
else
return
if(2)
if (WT.remove_fuel(0,user))
if(WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
"<span class='notice'>You start to cut \the [src] free from the floor...</span>", \
"<span class='italics'>You hear welding.</span>")
if (do_after(user,20, target = src))
if(do_after(user,20, target = src))
if(!src || !WT.isOn()) return
state = 1
to_chat(user, "<span class='notice'>You cut \the [src] free from the floor.</span>")
@@ -179,7 +179,7 @@ field_generator power level display
active = 0
spawn(1)
src.cleanup()
while (warming_up>0 && !active)
while(warming_up>0 && !active)
sleep(50)
warming_up--
update_icon()
@@ -187,7 +187,7 @@ field_generator power level display
/obj/machinery/field/generator/proc/turn_on()
active = 1
spawn(1)
while (warming_up<3 && active)
while(warming_up<3 && active)
sleep(50)
warming_up++
update_icon()
@@ -204,8 +204,8 @@ field_generator power level display
src.power = field_generator_max_power
var/power_draw = 2
for (var/obj/machinery/field/containment/F in fields)
if (isnull(F))
for(var/obj/machinery/field/containment/F in fields)
if(isnull(F))
continue
power_draw++
if(draw_power(round(power_draw/2,1)))
@@ -303,7 +303,7 @@ field_generator power level display
CF.Crossed(L)
var/listcheck = 0
for(var/obj/machinery/field/generator/FG in connected_gens)
if (isnull(FG))
if(isnull(FG))
continue
if(FG == G)
listcheck = 1
@@ -312,7 +312,7 @@ field_generator power level display
connected_gens.Add(G)
listcheck = 0
for(var/obj/machinery/field/generator/FG2 in G.connected_gens)
if (isnull(FG2))
if(isnull(FG2))
continue
if(FG2 == src)
listcheck = 1
@@ -323,13 +323,13 @@ field_generator power level display
/obj/machinery/field/generator/proc/cleanup()
clean_up = 1
for (var/obj/machinery/field/containment/F in fields)
if (isnull(F))
for(var/obj/machinery/field/containment/F in fields)
if(isnull(F))
continue
qdel(F)
fields = list()
for(var/obj/machinery/field/generator/FG in connected_gens)
if (isnull(FG))
if(isnull(FG))
continue
FG.connected_gens.Remove(src)
if(!FG.clean_up)//Makes the other gens clean up as well
code/modules/power/singularity/investigate.dm
+1 -1
View File
@@ -1,4 +1,4 @@
/area/engine/engineering/power_alert(var/alarming)
if (alarming)
if(alarming)
investigate_log("has a power alarm!","singulo")
..()
code/modules/power/singularity/particle_accelerator/particle.dm
+1 -1
View File
@@ -35,7 +35,7 @@
/obj/effect/accelerated_particle/Bump(atom/A)
if (A)
if(A)
if(ismob(A))
toxmob(A)
if((istype(A,/obj/machinery/the_singularitygen))||(istype(A,/obj/singularity/)))
code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+8 -8
View File
@@ -95,7 +95,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
if(usr.stat || !usr.canmove || usr.restrained())
return
if (src.anchored)
if(src.anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 270)
@@ -108,7 +108,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
if(usr.stat || !usr.canmove || usr.restrained())
return
if (src.anchored)
if(src.anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 90)
@@ -149,11 +149,11 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
qdel(src)
return
if(2.0)
if (prob(50))
if(prob(50))
qdel(src)
return
if(3.0)
if (prob(25))
if(prob(25))
qdel(src)
return
else
@@ -288,7 +288,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
if(usr.stat || !usr.canmove || usr.restrained())
return
if (src.anchored)
if(src.anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 270)
@@ -301,7 +301,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
if(usr.stat || !usr.canmove || usr.restrained())
return
if (src.anchored)
if(src.anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 90)
@@ -323,11 +323,11 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
qdel(src)
return
if(2.0)
if (prob(50))
if(prob(50))
qdel(src)
return
if(3.0)
if (prob(25))
if(prob(25))
qdel(src)
return
else
code/modules/power/singularity/particle_accelerator/particle_control.dm
+1 -1
View File
@@ -221,7 +221,7 @@
/obj/machinery/particle_accelerator/control_box/proc/toggle_power()
src.active = !src.active
investigate_log("turned [active?"<font color='red'>ON</font>":"<font color='green'>OFF</font>"] by [usr ? usr.key : "outside forces"]","singulo")
if (active)
if(active)
msg_admin_attack("PA Control Computer turned ON by [key_name(usr, usr.client)](<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
log_game("PA Control Computer turned ON by [usr.ckey]([usr]) in ([x],[y],[z])")
use_log += text("\[[time_stamp()]\] <font color='red'>[usr.name] ([usr.ckey]) has turned on the PA Control Computer.</font>")
code/modules/power/singularity/singularity.dm
+2 -2
View File
@@ -370,7 +370,7 @@
var/toxrange = 10
var/radiation = 15
var/radiationmin = 3
if (energy>200)
if(energy>200)
radiation += round((energy-150)/10,1)
radiationmin = round((radiation/5),1)
for(var/mob/living/M in view(toxrange, src.loc))
@@ -392,7 +392,7 @@
continue
if(M.stat == CONSCIOUS)
if (istype(M,/mob/living/carbon/human))
if(istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(istype(H.glasses, /obj/item/clothing/glasses/meson))
var/obj/item/clothing/glasses/meson/MS = H.glasses