diff --git a/code/game/dna.dm b/code/game/dna.dm index c8779569fc4..4c820e46597 100644 --- a/code/game/dna.dm +++ b/code/game/dna.dm @@ -748,8 +748,10 @@ /obj/machinery/computer/scan_consolenew/New() ..() - spawn( 5 ) + spawn(5) src.connected = locate(/obj/machinery/dna_scannernew, get_step(src, WEST)) + spawn(250) + src.injectorready = 1 return return diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 532df625ba3..4f3d10d77f8 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -27,7 +27,7 @@ var/buffer2iue = 0 var/buffer3iue = 0 var/delete = 0 - var/injectorready = 1 + var/injectorready = 0 //Quick fix for issue 286 (screwdriver the screen twice to restore injector) -Pete var/temphtml = null var/obj/machinery/dna_scanner/connected = null var/obj/item/weapon/disk/data/diskette = null diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index 7df6d84f0c9..ac99ed5b355 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -478,7 +478,7 @@ /obj/machinery/computer/communications/proc/post_status(var/command, var/data1, var/data2) - var/datum/radio_frequency/frequency = radio_controller.return_frequency(status_display_freq) + var/datum/radio_frequency/frequency = radio_controller.return_frequency(1435) if(!frequency) return diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index a46e1efec73..52b79c05f3b 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -23,10 +23,10 @@ return update_icon() + overlays = null + icon_state = "sheater[on]" if(open) - icon_state = "sheater-open" - else - icon_state = "sheater[on]" + overlays += "sheater-open" return examine() diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm index 8a75655bb37..4c7750e269f 100644 --- a/code/game/objects/items/weapons/implants/implant.dm +++ b/code/game/objects/items/weapons/implants/implant.dm @@ -174,7 +174,7 @@ the implant may become unstable and either pre-maturely inject the subject or si get_data() var/dat = {" Implant Specifications:
-Name: NanoTrasen Employee Management Implant
+Name: Nanotrasen Employee Management Implant
Life: Ten years.
Important Notes: Personnel injected with this device tend to be much more loyal to the company.

@@ -189,10 +189,9 @@ the implant may become unstable and either pre-maturely inject the subject or si if(!istype(M, /mob/living/carbon/human)) return var/mob/living/carbon/human/H = M if(H.mind in ticker.mode.head_revolutionaries) - for(var/mob/O in viewers(H, null)) - O.show_message(text("\red [] seems to resist the implant.", H), 1) - return + H.visible_message("[H] seems to resist the implant!", "You feel the corporate tendrils of Nanotrasen try to invade your mind!") + return else if(H.mind in ticker.mode:revolutionaries) ticker.mode:remove_revolutionary(H.mind) - H << "\blue You feel a surge of loyalty towards NanoTrasen." + H << "\blue You feel a surge of loyalty towards Nanotrasen." return diff --git a/code/game/turf.dm b/code/game/turf.dm index 4cf72f09851..7aa015542db 100644 --- a/code/game/turf.dm +++ b/code/game/turf.dm @@ -1232,6 +1232,9 @@ turf/simulated/floor/return_siding_icon_state() /turf/space/attackby(obj/item/C as obj, mob/user as mob) if (istype(C, /obj/item/stack/rods)) + var/obj/structure/lattice/L = locate(/obj/structure/lattice, src) + if(L) + return var/obj/item/stack/rods/R = C user << "\blue Constructing support lattice ..." playsound(src.loc, 'Genhit.ogg', 50, 1) diff --git a/icons/obj/atmos.dmi b/icons/obj/atmos.dmi index 59af7c49d52..a80de32c0c6 100644 Binary files a/icons/obj/atmos.dmi and b/icons/obj/atmos.dmi differ