diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 8104b8e85c3..beac3d050a5 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -15,7 +15,7 @@ Possible to do for anyone motivated enough: // HOLOPAD MODE // 0 = RANGE BASED // 1 = AREA BASED -var/const/HOLOPAD_MODE = 1 +var/const/HOLOPAD_MODE = 0 /obj/machinery/hologram/holopad/attack_hand(var/mob/living/carbon/human/user) //Carn: Hologram requests. @@ -120,6 +120,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ if(hologram) step_to(hologram, master.eyeobj) // So it turns. hologram.loc = get_turf(master.eyeobj) + return 1 /obj/machinery/hologram/power_change() diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index a168a24ddcd..45ee9770318 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -1,5 +1,5 @@ //This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:33 - +var/global/list/obj/machinery/power/rad_collector/rad_collectors = list() /obj/machinery/power/rad_collector name = "Radiation Collector Array" @@ -17,6 +17,15 @@ var/locked = 0 var/drainratio = 1 +/obj/machinery/power/rad_collector/New() + ..() + spawn(5) + rad_collectors += src + +/obj/machinery/power/rad_collector/Del() + rad_collectors -= src + ..() + /obj/machinery/power/rad_collector/process() if(P) if(P.air_contents.toxins <= 0) @@ -56,7 +65,7 @@ user.drop_item() src.P = W W.loc = src - updateicon() + update_icons() else if(istype(W, /obj/item/weapon/crowbar)) if(P && !src.locked) eject() @@ -108,7 +117,7 @@ if(active) toggle_power() else - updateicon() + update_icons() /obj/machinery/power/rad_collector/proc/receive_pulse(var/pulse_strength) if(P && active) @@ -120,7 +129,7 @@ return -/obj/machinery/power/rad_collector/proc/updateicon() +/obj/machinery/power/rad_collector/proc/update_icons() overlays = null if(P) overlays += image('icons/obj/singularity.dmi', "ptank") @@ -138,6 +147,6 @@ else icon_state = "ca" flick("ca_deactive", src) - updateicon() + update_icons() return diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 38ffd5c1d8a..1dc464c3044 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -435,8 +435,9 @@ var/global/list/uneatable = list( /obj/machinery/singularity/proc/pulse() - for(var/obj/machinery/power/rad_collector/R in orange(15,src)) - if(istype(R,/obj/machinery/power/rad_collector)) + + for(var/obj/machinery/power/rad_collector/R in rad_collectors) + if(get_dist(R, src) <= 15) // Better than using orange() every process R.receive_pulse(energy) return diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 1540b5e9931..1974b1adde8 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -27,7 +27,7 @@ M << "\red You don't feel cool enough to name this gun, chump." return 0 - var/input = copytext(sanitize(input("What do you want to name the gun?",,"")),1,MAX_NAME_LEN) + var/input = stripped_input(usr,"What do you want to name the gun?", ,"", MAX_NAME_LEN) if(src && input && !M.stat && in_range(M,src)) name = input diff --git a/html/changelog.html b/html/changelog.html index 0605dae9118..8e39ee99f07 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -61,7 +61,6 @@ should be listed in the changelog upon commit tho. Thanks. -->

6 September 2012

Giacom updated: