mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Fixed issue 286. DNA machines now have to recharge the injector when they're first built.
Fixed issue 388. Fixed issue 403. Fixed spaceheaters appearing to be off when they are both off and the hatch is open. Fixed being able to waste rods out of existence by building them where lattice already exists. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3268 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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()
|
||||
|
||||
@@ -174,7 +174,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
|
||||
get_data()
|
||||
var/dat = {"
|
||||
<b>Implant Specifications:</b><BR>
|
||||
<b>Name:</b> NanoTrasen Employee Management Implant<BR>
|
||||
<b>Name:</b> Nanotrasen Employee Management Implant<BR>
|
||||
<b>Life:</b> Ten years.<BR>
|
||||
<b>Important Notes:</b> Personnel injected with this device tend to be much more loyal to the company.<BR>
|
||||
<HR>
|
||||
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
Reference in New Issue
Block a user