From c9a4b30e7313ae80fd4a76352df80ccb0194a2b6 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 12 Mar 2019 10:51:45 -0400 Subject: [PATCH 1/5] New file Adds new file for overlays when using NIF. Ported from VoreStation. --- vorestation.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/vorestation.dme b/vorestation.dme index e8af4b73df..437620ba10 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2329,6 +2329,7 @@ #include "code\modules\nifsoft\nifsoft.dm" #include "code\modules\nifsoft\software\01_vision.dm" #include "code\modules\nifsoft\software\05_health.dm" +#include "code\modules\nifsoft\software\06_screens.dm" #include "code\modules\nifsoft\software\10_combat.dm" #include "code\modules\nifsoft\software\13_soulcatcher.dm" #include "code\modules\nifsoft\software\14_commlink.dm" From dba3dc37263663871b20f70cbb84d5539af78c91 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 12 Mar 2019 10:53:08 -0400 Subject: [PATCH 2/5] Remove Crew Monitor To be moved to new file, appropriately named. --- code/modules/nifsoft/software/05_health.dm | 32 ++-------------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/code/modules/nifsoft/software/05_health.dm b/code/modules/nifsoft/software/05_health.dm index 37727c7851..a8a3cef720 100644 --- a/code/modules/nifsoft/software/05_health.dm +++ b/code/modules/nifsoft/software/05_health.dm @@ -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" \ No newline at end of file + return "Store Backup" From 28b7f450d0d30629a96dbf0ed525de7d8e15ddd2 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 12 Mar 2019 10:55:02 -0400 Subject: [PATCH 3/5] Create 06_screens.dm Ports from VoreStation a new set of things for Engy, Sec, and Med, third of which was already here but whatevs. The first two allows respective departments to check on certain station alarms that relate to their prerogatives in said departments. --- code/modules/nifsoft/software/06_screens.dm | 88 +++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 code/modules/nifsoft/software/06_screens.dm diff --git a/code/modules/nifsoft/software/06_screens.dm b/code/modules/nifsoft/software/06_screens.dm new file mode 100644 index 0000000000..4d33bf1d50 --- /dev/null +++ b/code/modules/nifsoft/software/06_screens.dm @@ -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" From 53da4f532b063be9ddce6a2669cd2ceb0558c46b Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 12 Mar 2019 10:57:44 -0400 Subject: [PATCH 4/5] New Programs to Disks Adds Station Alarms for Engy to Engy Disk, Station Alarms for Sec to Sec Disk. Ported from VoreStation. --- code/modules/nifsoft/nifsoft.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/nifsoft/nifsoft.dm b/code/modules/nifsoft/nifsoft.dm index 4307435da9..fb4ed71354 100644 --- a/code/modules/nifsoft/nifsoft.dm +++ b/code/modules/nifsoft/nifsoft.dm @@ -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) \ No newline at end of file + new /obj/item/weapon/disk/nifsoft/mining(src) From f4a1f056a8ce79999e86410a02bfd6c9ca35b51c Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Tue, 12 Mar 2019 10:59:47 -0400 Subject: [PATCH 5/5] Add New Defines --- code/__defines/nifsoft.dm | 44 ++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/code/__defines/nifsoft.dm b/code/__defines/nifsoft.dm index dc03b2b411..4bfe728945 100644 --- a/code/__defines/nifsoft.dm +++ b/code/__defines/nifsoft.dm @@ -17,31 +17,33 @@ #define NIF_FLASHPROT 13 //Health-related #define NIF_BACKUP 14 -#define NIF_CREWMONITOR 15 -#define NIF_ORGANIC_HEAL 16 -#define NIF_SYNTH_HEAL 17 -#define NIF_AUTOSTASIS 18 //These two are just part of -#define NIF_MED_ALARM 19 //medichines right now -#define NIF_TOXHEAL 20 //And this, for organics -#define NIF_SPAREBREATH 21 +#define NIF_MEDMONITOR 15 // TFF: Name +#define NIF_ENGMONITOR 16 // changes +#define NIF_SECMONITOR 17 // happening +#define NIF_ORGANIC_HEAL 18 +#define NIF_SYNTH_HEAL 19 +#define NIF_AUTOSTASIS 20 //These two are just part of +#define NIF_MED_ALARM 21 //medichines right now +#define NIF_TOXHEAL 22 //And this, for organics +#define NIF_SPAREBREATH 23 //Combat Related -#define NIF_BRUTEARMOR 22 -#define NIF_BURNARMOR 23 -#define NIF_PAINKILLERS 24 -#define NIF_HARDCLAWS 25 -#define NIF_HIDDENLASER 26 +#define NIF_BRUTEARMOR 24 +#define NIF_BURNARMOR 25 +#define NIF_PAINKILLERS 26 +#define NIF_HARDCLAWS 27 +#define NIF_HIDDENLASER 28 //Other -#define NIF_COMMLINK 27 -#define NIF_APCCHARGE 28 -#define NIF_PRESSURE 29 -#define NIF_HEATSINK 30 -#define NIF_COMPLIANCE 31 -#define NIF_SIZECHANGE 32 -#define NIF_SOULCATCHER 33 -#define NIF_WORLDBEND 34 +#define NIF_COMMLINK 29 +#define NIF_APCCHARGE 30 +#define NIF_PRESSURE 31 +#define NIF_HEATSINK 32 +#define NIF_COMPLIANCE 33 +#define NIF_SIZECHANGE 34 +#define NIF_SOULCATCHER 35 +#define NIF_WORLDBEND 36 // Must be equal to the highest number above -#define TOTAL_NIF_SOFTWARE 34 +#define TOTAL_NIF_SOFTWARE 36 ////////////////////// // NIF flag list hints