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

Reduce lines by removing blank lines added by PJ's script

Browse Source
This commit is contained in:
Tigercat2000
2016-04-05 08:25:57 -07:00
parent 9d430844c3
commit 78f53553f8
1049 changed files with 3 additions and 8630 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/singularity/collector.dm
-8
View File
@@ -45,7 +45,6 @@ var/global/list/rad_collectors = list()
return
else
to_chat(user, "\red The controls are locked!")
return
..()
@@ -53,18 +52,15 @@ var/global/list/rad_collectors = list()
/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/multitool))
to_chat(user, "<span class='notice'>The [W.name] detects that [last_power]W were recently produced.</span>")
return 1
else if(istype(W, /obj/item/device/analyzer) && P)
atmosanalyzer_scan(P.air_contents, user)
else if(istype(W, /obj/item/weapon/tank/plasma))
if(!src.anchored)
to_chat(user, "\red The [src] needs to be secured to the floor first.")
return 1
if(src.P)
to_chat(user, "\red There's already a plasma tank loaded.")
return 1
user.drop_item()
src.P = W
@@ -77,7 +73,6 @@ var/global/list/rad_collectors = list()
else if(istype(W, /obj/item/weapon/wrench))
if(P)
to_chat(user, "\blue Remove the plasma tank first.")
return 1
playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
src.anchored = !src.anchored
@@ -93,14 +88,11 @@ var/global/list/rad_collectors = list()
if(active)
src.locked = !src.locked
to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]")
else
src.locked = 0 //just in case it somehow gets locked
to_chat(user, "\red The controls can only be locked when the [src] is active")
else
to_chat(user, "\red Access denied!")
return 1
else
..()
code/modules/power/singularity/emitter.dm
-18
View File
@@ -66,7 +66,6 @@
if (src.anchored || usr:stat)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 90)
return 1
@@ -129,20 +128,17 @@
if(state == 2)
if(!powernet)
to_chat(user, "The emitter isn't connected to a wire.")
return 1
if(!src.locked)
if(src.active==1)
src.active = 0
to_chat(user, "You turn off the [src].")
message_admins("Emitter turned off by [key_name_admin(user)] in ([x], [y], [z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
log_game("Emitter turned off by [key_name(user)] in [x], [y], [z]")
investigate_log("turned <font color='red'>off</font> by [key_name(usr)]","singulo")
else
src.active = 1
to_chat(user, "You turn on the [src].")
src.shot_number = 0
src.fire_delay = maximum_fire_delay
message_admins("Emitter turned on by [key_name_admin(user)] in ([x], [y], [z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
@@ -151,10 +147,8 @@
update_icon()
else
to_chat(user, "\red The controls are locked!")
else
to_chat(user, "\red The [src] needs to be firmly secured to the floor first.")
return 1
@@ -230,7 +224,6 @@
if(istype(W, /obj/item/weapon/wrench))
if(active)
to_chat(user, "Turn off the [src] first.")
return
switch(state)
if(0)
@@ -249,19 +242,16 @@
src.anchored = 0
if(2)
to_chat(user, "\red The [src.name] needs to be unwelded from the floor.")
return
if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
if(active)
to_chat(user, "Turn off the [src] first.")
return
switch(state)
if(0)
to_chat(user, "\red The [src.name] needs to be wrenched to the floor.")
if(1)
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
@@ -272,11 +262,9 @@
if(!src || !WT.isOn()) return
state = 2
to_chat(user, "You weld the [src] to the floor.")
connect_to_network()
else
to_chat(user, "\red You need more welding fuel to complete this task.")
if(2)
if (WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
@@ -287,30 +275,24 @@
if(!src || !WT.isOn()) return
state = 1
to_chat(user, "You cut the [src] free from the floor.")
disconnect_from_network()
else
to_chat(user, "\red You need more welding fuel to complete this task.")
return
if(istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/device/pda))
if(emagged)
to_chat(user, "\red The lock seems to be broken")
return
if(src.allowed(user))
if(active)
src.locked = !src.locked
to_chat(user, "The controls are now [src.locked ? "locked." : "unlocked."]")
else
src.locked = 0 //just in case it somehow gets locked
to_chat(user, "\red The controls can only be locked when the [src] is online")
else
to_chat(user, "\red Access denied.")
return
if(default_deconstruction_screwdriver(user, "emitter_open", "emitter", W))
code/modules/power/singularity/field_generator.dm
-7
View File
@@ -80,7 +80,6 @@ field_generator power level display
if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on
if(src.active >= 1)
to_chat(user, "<span class='warning'>You are unable to turn off the [src.name] once it is online!</span>")
return 1
else
user.visible_message("[user.name] turns on the [src.name].", \
@@ -92,14 +91,12 @@ field_generator power level display
src.add_fingerprint(user)
else
to_chat(user, "<span class='warning'>The [src] needs to be firmly secured to the floor first!</span>")
return
/obj/machinery/field/generator/attackby(obj/item/W, mob/user, params)
if(active)
to_chat(user, "<span class='warning'>The [src] needs to be off!</span>")
return
else if(istype(W, /obj/item/weapon/wrench))
switch(state)
@@ -120,14 +117,12 @@ field_generator power level display
src.anchored = 0
if(2)
to_chat(user, "<span class='warning'>The [src.name] needs to be unwelded from the floor!</span>")
return
else if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
switch(state)
if(0)
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))
@@ -139,7 +134,6 @@ field_generator power level display
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)
@@ -152,7 +146,6 @@ field_generator power level display
if(!src || !WT.isOn()) return
state = 1
to_chat(user, "<span class='notice'>You cut \the [src] free from the floor.</span>")
else
return
else
code/modules/power/singularity/narsie.dm
-7
View File
@@ -25,10 +25,8 @@
/obj/singularity/narsie/large/New()
..()
to_chat(world, "<font size='15' color='red'><b>NAR-SIE HAS RISEN</b></font>")
to_chat(world, pick(sound('sound/hallucinations/im_here1.ogg'), sound('sound/hallucinations/im_here2.ogg')))
var/area/A = get_area(src)
if(A)
notify_ghosts("Nar-Sie has risen in \the [A.name]. Reach out to the Geometer to be given a new shell for your soul.")
@@ -41,7 +39,6 @@
/obj/singularity/narsie/large/attack_ghost(mob/dead/observer/user as mob)
if(!(src in view()))
to_chat(user, "Your soul is too far away.")
return
makeNewConstruct(/mob/living/simple_animal/construct/harvester, user, null, 1)
new /obj/effect/effect/sleep_smoke(user.loc)
@@ -80,7 +77,6 @@
if(M.stat == CONSCIOUS)
if(!iscultist(M))
to_chat(M, "<span class='warning'>You feel your sanity crumble away in an instant as you gaze upon [src.name]...</span>")
M.apply_effect(3, STUN)
@@ -128,15 +124,12 @@
/obj/singularity/narsie/proc/acquire(var/mob/food)
to_chat(target, "<span class='notice'>NAR-SIE HAS LOST INTEREST IN YOU</span>")
target = food
if(ishuman(target))
to_chat(target, "<span class ='userdanger'>NAR-SIE HUNGERS FOR YOUR SOUL</span>")
else
to_chat(target, "<span class ='userdanger'>NAR-SIE HAS CHOSEN YOU TO LEAD HIM TO HIS NEXT MEAL</span>")
//Wizard narsie
/obj/singularity/narsie/wizard
grav_pull = 0
code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
-5
View File
@@ -97,7 +97,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
return
if (src.anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 270)
return 1
@@ -111,7 +110,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
return
if (src.anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 90)
return 1
@@ -238,7 +236,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
temp_state++
else
to_chat(user, "<span class='warning'>You need one length of cable to wire the [src.name]!</span>")
return
if(2)
if(iswirecutter(O))//TODO:Shock user if its on?
@@ -293,7 +290,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
return
if (src.anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 270)
return 1
@@ -307,7 +303,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
return
if (src.anchored)
to_chat(usr, "It is fastened to the floor!")
return 0
src.dir = turn(src.dir, 90)
return 1
code/modules/power/singularity/particle_accelerator/particle_control.dm
-1
View File
@@ -87,7 +87,6 @@
if(!interface_control)
to_chat(usr, "<span class='error'>ERROR: Request timed out. Check wire contacts.</span>")
return
if( href_list["close"] )
code/modules/power/singularity/singularity.dm
-1
View File
@@ -391,7 +391,6 @@
var/obj/item/clothing/glasses/meson/MS = H.glasses
if(MS.vision_flags == SEE_TURFS)
to_chat(H, "<span class='notice'>You look directly into the [src.name], good thing you had your protective eyewear on!</span>")
return
M.apply_effect(3, STUN)