Merge pull request #521 from TheFurryFeline/TFF-Station_Alarms_on_NIF

Station Alarms Now on NIFS
This commit is contained in:
Vollybally
2019-03-13 15:35:10 -04:00
committed by GitHub
5 changed files with 117 additions and 54 deletions
+3 -3
View File
@@ -242,7 +242,7 @@
stored = /datum/nifsoft/package/security
/datum/nifsoft/package/security
software = list(/datum/nifsoft/ar_sec,/datum/nifsoft/flashprot)
software = list(/datum/nifsoft/ar_sec,/datum/nifsoft/cameramonitor,/datum/nifsoft/flashprot) //TFF: Add Station Alarms - Sec version
/obj/item/weapon/storage/box/nifsofts_security
name = "security nifsoft disks"
@@ -265,7 +265,7 @@
stored = /datum/nifsoft/package/engineering
/datum/nifsoft/package/engineering
software = list(/datum/nifsoft/ar_eng,/datum/nifsoft/uvblocker)
software = list(/datum/nifsoft/ar_eng,/datum/nifsoft/alarmmonitor,/datum/nifsoft/uvblocker) //TFF: Add Station Alarms - Eng version
/obj/item/weapon/storage/box/nifsofts_engineering
name = "engineering nifsoft disks"
@@ -321,4 +321,4 @@
/obj/item/weapon/storage/box/nifsofts_mining/New()
..()
for(var/i = 0 to 7)
new /obj/item/weapon/disk/nifsoft/mining(src)
new /obj/item/weapon/disk/nifsoft/mining(src)
+2 -30
View File
@@ -1,32 +1,4 @@
/datum/nifsoft/crewmonitor
name = "Crew Monitor"
desc = "A link to the local crew monitor sensors. Useful for finding people in trouble."
list_pos = NIF_CREWMONITOR
access = access_medical
cost = 1250
p_drain = 0.025
var/datum/nano_module/crew_monitor/arscreen
New()
..()
arscreen = new(nif)
Destroy()
qdel_null(arscreen)
return ..()
activate()
if((. = ..()))
arscreen.ui_interact(nif.human,"main",null,1,nif_state)
return TRUE
deactivate()
if((. = ..()))
return TRUE
stat_text()
return "Show Monitor"
//TFF: Removed Crew Monitor, moved to an appropriate file.
/datum/nifsoft/medichines_org
name = "Medichines"
desc = "An internal swarm of nanites to make sure you stay in good shape and to promote healing, or to preserve you if you are critically injured."
@@ -233,4 +205,4 @@
return TRUE
stat_text()
return "Store Backup"
return "Store Backup"
@@ -0,0 +1,88 @@
//TFF: Ports monitors for NIFs from VOREStation. Adding notes for what does what.
/datum/nifsoft/crewmonitor //TFF: Medical access - like with AR-M glasses, allows one to keep track of who needs medical help.
name = "Crew Monitor"
desc = "A link to the local crew monitor sensors. Useful for finding people in trouble."
list_pos = NIF_MEDMONITOR
access = access_medical
cost = 1250
p_drain = 0.025
var/datum/nano_module/crew_monitor/arscreen
New()
..()
arscreen = new(nif)
Destroy()
qdel_null(arscreen)
return ..()
activate()
if((. = ..()))
arscreen.ui_interact(nif.human,"main",null,1,nif_state)
return TRUE
deactivate()
if((. = ..()))
return TRUE
stat_text()
return "Show Monitor"
/datum/nifsoft/alarmmonitor //TFF: Monitor for station alarms - Engy access
name = "Alarm Monitor"
desc = "A link to the local alarm monitors. Useful for detecting alarms in a pinch."
list_pos = NIF_ENGMONITOR
access = access_engine
cost = 1250
p_drain = 0.025
var/datum/nano_module/alarm_monitor/engineering/arscreen
New()
..()
arscreen = new(nif)
Destroy()
qdel_null(arscreen)
return ..()
activate()
if((. = ..()))
arscreen.ui_interact(nif.human,"main",null,1,nif_state)
return TRUE
deactivate()
if((. = ..()))
return TRUE
stat_text()
return "Show Monitor"
/datum/nifsoft/cameramonitor //TFF: Sec access - Alarm Monitor, Sec version, allows Sec to see if there's a busted camera or motion where there shouldn't be motion.
name = "Security Monitor"
desc = "A link to the local camera alarm monitors. Useful for knowing where the trouble is."
list_pos = NIF_SECMONITOR
access = access_security
cost = 1250
p_drain = 0.025
var/datum/nano_module/alarm_monitor/security/arscreen
New()
..()
arscreen = new(nif)
Destroy()
qdel_null(arscreen)
return ..()
activate()
if((. = ..()))
arscreen.ui_interact(nif.human,"main",null,1,nif_state)
return TRUE
deactivate()
if((. = ..()))
return TRUE
stat_text()
return "Show Monitor"