diff --git a/code/__defines/nifsoft.dm b/code/__defines/nifsoft.dm index b9a1f776796..cca614f1fb4 100644 --- a/code/__defines/nifsoft.dm +++ b/code/__defines/nifsoft.dm @@ -19,31 +19,30 @@ #define NIF_BACKUP 14 #define NIF_MEDMONITOR 15 #define NIF_ENGMONITOR 16 -#define NIF_SECMONITOR 17 -#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 +#define NIF_ORGANIC_HEAL 17 +#define NIF_SYNTH_HEAL 18 +#define NIF_AUTOSTASIS 19 //These two are just part of +#define NIF_MED_ALARM 20 //medichines right now +#define NIF_TOXHEAL 21 //And this, for organics +#define NIF_SPAREBREATH 22 //Combat Related -#define NIF_BRUTEARMOR 24 -#define NIF_BURNARMOR 25 -#define NIF_PAINKILLERS 26 -#define NIF_HARDCLAWS 27 -#define NIF_HIDDENLASER 28 +#define NIF_BRUTEARMOR 23 +#define NIF_BURNARMOR 24 +#define NIF_PAINKILLERS 25 +#define NIF_HARDCLAWS 26 +#define NIF_HIDDENLASER 27 //Other -#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 +#define NIF_COMMLINK 28 +#define NIF_APCCHARGE 29 +#define NIF_PRESSURE 30 +#define NIF_HEATSINK 31 +#define NIF_COMPLIANCE 32 +#define NIF_SIZECHANGE 33 +#define NIF_SOULCATCHER 34 +#define NIF_WORLDBEND 35 // Must be equal to the highest number above -#define TOTAL_NIF_SOFTWARE 36 +#define TOTAL_NIF_SOFTWARE 35 ////////////////////// // NIF flag list hints diff --git a/code/modules/nifsoft/nifsoft.dm b/code/modules/nifsoft/nifsoft.dm index 79488c3425c..b4791003d0b 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/cameramonitor,/datum/nifsoft/flashprot) + software = list(/datum/nifsoft/ar_sec,/datum/nifsoft/flashprot) /obj/item/weapon/storage/box/nifsofts_security name = "security nifsoft disks" diff --git a/code/modules/nifsoft/software/06_screens.dm b/code/modules/nifsoft/software/06_screens.dm index 71ead93ad59..ad1140933db 100644 --- a/code/modules/nifsoft/software/06_screens.dm +++ b/code/modules/nifsoft/software/06_screens.dm @@ -55,32 +55,3 @@ stat_text() return "Show Monitor" - -/datum/nifsoft/cameramonitor - 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"