From 4f01edb7dba2fee16f64028e27b4d5da9dde1ddc Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Wed, 25 Apr 2012 20:17:59 +0100 Subject: [PATCH 1/3] Fix for singularity not growing, even on max power setting. --- code/modules/power/singularity/particle_accelerator/particle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/singularity/particle_accelerator/particle.dm b/code/modules/power/singularity/particle_accelerator/particle.dm index a152c32e18c..c39941c8aaa 100644 --- a/code/modules/power/singularity/particle_accelerator/particle.dm +++ b/code/modules/power/singularity/particle_accelerator/particle.dm @@ -36,7 +36,7 @@ toxmob(A) if((istype(A,/obj/machinery/the_singularitygen))||(istype(A,/obj/machinery/singularity/))) A:energy += energy - energy = 0 +// energy = 0 //This breaks the current singularity if( istype(A,/obj/machinery/rust/particle_catcher) ) var/obj/machinery/rust/particle_catcher/collided_catcher = A if(particle_type && particle_type != "neutron") From 3e9f5a24d53f42c2f6f1ab2bb765464405822f82 Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Wed, 25 Apr 2012 20:31:51 +0100 Subject: [PATCH 2/3] Fixes ghosts being ate (and immediately reformed) by the singularity, fixes them not being able to return to body. --- code/modules/power/singularity/singularity.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 9c98d192c99..668b969d3f2 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -1,7 +1,8 @@ var/global/list/uneatable = list( /turf/space, /obj/effect/overlay, - /mob/aiEye + /mob/aiEye, + /mob/dead/observer // Stop ghosts being ate and not being able to get back to their bodies ) /obj/machinery/singularity/ From c5a7bdc907872112104123e1420fb42c93ed5645 Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Wed, 25 Apr 2012 21:06:07 +0100 Subject: [PATCH 3/3] Fixes welding healing shortsightedness. Fixes changing rank on Security Records. --- code/game/machinery/computer/security.dm | 2 +- code/game/objects/items/weapons/tools.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index afa39cbdf3a..479e8edf240 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -458,7 +458,7 @@ What a mess.*/ temp = "
Rank:
" temp += "
    " for(var/rank in get_all_jobs()) - temp += "
  • [rank]
  • " + temp += "
  • [rank]
  • " temp += "
" else alert(usr, "You do not have the required rank to do this!") diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index d1e095b8f06..997ca128d7f 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -256,8 +256,8 @@ WELDINGTOOOL user.eye_blind = 5 user.eye_blurry = 5 user.disabilities |= 1 - spawn(100) - user.disabilities &= ~1 +// spawn(100) +// user.disabilities &= ~1 //Simpler to just leave them short sighted. return attack(mob/M as mob, mob/user as mob)