From 9d6dec8975126787ff9c2296322c1e23196a303b Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 27 Jun 2017 05:12:05 -0500 Subject: [PATCH] Update cart.dm --- code/game/objects/items/devices/PDA/cart.dm | 128 ++++++++------------ 1 file changed, 49 insertions(+), 79 deletions(-) diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 0d83308c66..fc94e03c39 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -1,3 +1,20 @@ +#define CART_SECURITY (1<<0) +#define CART_ENGINE (1<<1) +#define CART_ATMOS (1<<2) +#define CART_MEDICAL (1<<3) +#define CART_MANIFEST (1<<4) +#define CART_CLOWN (1<<5) +#define CART_MIME (1<<6) +#define CART_JANITOR (1<<7) +#define CART_REAGENT_SCANNER (1<<8) +#define CART_NEWSCASTER (1<<9) +#define CART_REMOTE_DOOR (1<<10) +#define CART_STATUS_DISPLAY (1<<11) +#define CART_QUARTERMASTER (1<<12) +#define CART_HYDROPONICS (1<<13) +#define CART_DRONEPHONE (1<<14) + + /obj/item/weapon/cartridge name = "generic cartridge" desc = "A data cartridge for portable microcomputers." @@ -7,27 +24,16 @@ w_class = WEIGHT_CLASS_TINY var/obj/item/radio/integrated/radio = null - var/access_security = 0 - var/access_engine = 0 - var/access_atmos = 0 - var/access_medical = 0 - var/access_manifest = 0 - var/access_clown = 0 - var/access_mime = 0 - var/access_janitor = 0 + + var/access = 0 //Bit flags for cartridge access + // var/access_flora = 0 - var/access_reagent_scanner = 0 - var/access_newscaster = 0 - var/access_remote_door = 0 //Control some blast doors remotely!! var/remote_door_id = "" - var/access_status_display = 0 - var/access_quartermaster = 0 - var/access_hydroponics = 0 - var/access_dronephone = 0 - var/bot_access_flags = 0 //Bit flags. Selection: SEC_BOT|MULE_BOT|FLOOR_BOT|CLEAN_BOT|MED_BOT + + var/bot_access_flags = 0 //Bit flags. Selection: SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT var/spam_enabled = 0 //Enables "Send to All" Option - var/mode = null + var/obj/item/device/pda/host_pda = null var/menu var/datum/data/record/active1 = null //General var/datum/data/record/active2 = null //Medical @@ -50,61 +56,56 @@ /obj/item/weapon/cartridge/engineering name = "\improper Power-ON cartridge" icon_state = "cart-e" - access_engine = 1 - access_dronephone = 1 + access = CART_ENGINE | CART_DRONEPHONE bot_access_flags = FLOOR_BOT /obj/item/weapon/cartridge/atmos name = "\improper BreatheDeep cartridge" icon_state = "cart-a" - access_atmos = 1 - access_dronephone = 1 + access = CART_ATMOS | CART_DRONEPHONE bot_access_flags = FLOOR_BOT /obj/item/weapon/cartridge/medical name = "\improper Med-U cartridge" icon_state = "cart-m" - access_medical = 1 + access = CART_MEDICAL bot_access_flags = MED_BOT /obj/item/weapon/cartridge/chemistry name = "\improper ChemWhiz cartridge" icon_state = "cart-chem" - access_reagent_scanner = 1 + access = CART_REAGENT_SCANNER bot_access_flags = MED_BOT /obj/item/weapon/cartridge/security name = "\improper R.O.B.U.S.T. cartridge" icon_state = "cart-s" - access_security = 1 + access = CART_SECURITY bot_access_flags = SEC_BOT /obj/item/weapon/cartridge/detective name = "\improper D.E.T.E.C.T. cartridge" icon_state = "cart-s" - access_security = 1 - access_medical = 1 - access_manifest = 1 + access = CART_SECURITY | CART_MEDICAL | CART_MANIFEST bot_access_flags = SEC_BOT /obj/item/weapon/cartridge/janitor name = "\improper CustodiPRO cartridge" desc = "The ultimate in clean-room design." icon_state = "cart-j" - access_janitor = 1 - access_dronephone = 1 + access = CART_JANITOR | CART_DRONEPHONE bot_access_flags = CLEAN_BOT /obj/item/weapon/cartridge/lawyer name = "\improper P.R.O.V.E. cartridge" icon_state = "cart-s" - access_security = 1 + access = CART_SECURITY spam_enabled = 1 /obj/item/weapon/cartridge/curator name = "\improper Lib-Tweet cartridge" icon_state = "cart-s" - access_newscaster = 1 + access = CART_NEWSCASTER /* /obj/item/weapon/cartridge/botanist @@ -116,8 +117,8 @@ /obj/item/weapon/cartridge/roboticist name = "\improper B.O.O.P. Remote Control cartridge" desc = "Packed with heavy duty triple-bot interlink!" - bot_access_flags = FLOOR_BOT|CLEAN_BOT|MED_BOT - access_dronephone = 1 + bot_access_flags = FLOOR_BOT | CLEAN_BOT | MED_BOT + access = CART_DRONEPHONE /obj/item/weapon/cartridge/signal name = "generic signaler cartridge" @@ -127,10 +128,9 @@ name = "\improper Signal Ace 2 cartridge" desc = "Complete with integrated radio signaler!" icon_state = "cart-tox" - access_reagent_scanner = 1 - access_atmos = 1 + access = CART_REAGENT_SCANNER | CART_ATMOS -/obj/item/weapon/cartridge/signal/New() +/obj/item/weapon/cartridge/signal/Initialize() ..() radio = new /obj/item/radio/integrated/signal(src) @@ -140,66 +140,46 @@ name = "space parts & space vendors cartridge" desc = "Perfect for the Quartermaster on the go!" icon_state = "cart-q" - access_quartermaster = 1 + access = CART_QUARTERMASTER bot_access_flags = MULE_BOT /obj/item/weapon/cartridge/head name = "\improper Easy-Record DELUXE cartridge" icon_state = "cart-h" - access_manifest = 1 - access_status_display = 1 + access = CART_MANIFEST | CART_STATUS_DISPLAY /obj/item/weapon/cartridge/hop name = "\improper HumanResources9001 cartridge" icon_state = "cart-h" - access_manifest = 1 - access_status_display = 1 - bot_access_flags = MULE_BOT|CLEAN_BOT - access_janitor = 1 - access_security = 1 - access_newscaster = 1 - access_quartermaster = 1 - access_dronephone = 1 + access = CART_MANIFEST | CART_STATUS_DISPLAY | CART_JANITOR | CART_SECURITY | CART_NEWSCASTER | CART_QUARTERMASTER | CART_DRONEPHONE + bot_access_flags = MULE_BOT | CLEAN_BOT /obj/item/weapon/cartridge/hos name = "\improper R.O.B.U.S.T. DELUXE cartridge" icon_state = "cart-hos" - access_manifest = 1 - access_status_display = 1 - access_security = 1 + access = CART_MANIFEST | CART_STATUS_DISPLAY | CART_SECURITY bot_access_flags = SEC_BOT /obj/item/weapon/cartridge/ce name = "\improper Power-On DELUXE cartridge" icon_state = "cart-ce" - access_manifest = 1 - access_status_display = 1 - access_engine = 1 - access_atmos = 1 - access_dronephone = 1 + access = CART_MANIFEST | CART_STATUS_DISPLAY | CART_ENGINE | CART_ATMOS | CART_DRONEPHONE bot_access_flags = FLOOR_BOT /obj/item/weapon/cartridge/cmo name = "\improper Med-U DELUXE cartridge" icon_state = "cart-cmo" - access_manifest = 1 - access_status_display = 1 - access_reagent_scanner = 1 - access_medical = 1 + access = CART_MANIFEST | CART_STATUS_DISPLAY | CART_REAGENT_SCANNER | CART_MEDICAL bot_access_flags = MED_BOT /obj/item/weapon/cartridge/rd name = "\improper Signal Ace DELUXE cartridge" icon_state = "cart-rd" - access_manifest = 1 - access_status_display = 1 - access_reagent_scanner = 1 - access_atmos = 1 - access_dronephone = 1 - bot_access_flags = FLOOR_BOT|CLEAN_BOT|MED_BOT + access = CART_MANIFEST | CART_STATUS_DISPLAY | CART_REAGENT_SCANNER | CART_ATMOS | CART_DRONEPHONE + bot_access_flags = FLOOR_BOT | CLEAN_BOT | MED_BOT -/obj/item/weapon/cartridge/rd/New() +/obj/item/weapon/cartridge/rd/Initialize() ..() radio = new /obj/item/radio/integrated/signal(src) @@ -207,18 +187,8 @@ name = "\improper Value-PAK cartridge" desc = "Now with 350% more value!" //Give the Captain...EVERYTHING! (Except Mime and Clown) icon_state = "cart-c" - access_manifest = 1 - access_engine = 1 - access_security = 1 - access_medical = 1 - access_reagent_scanner = 1 - access_status_display = 1 - access_atmos = 1 - access_newscaster = 1 - access_quartermaster = 1 - access_janitor = 1 - access_dronephone = 1 - bot_access_flags = SEC_BOT|MULE_BOT|FLOOR_BOT|CLEAN_BOT|MED_BOT + access = ~(CART_CLOWN | CART_MIME) + bot_access_flags = SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT spam_enabled = 1 /obj/item/weapon/cartridge/captain/New() @@ -301,7 +271,7 @@ Code: for(var/obj/machinery/computer/monitor/pMon in GLOB.machines) - if(!(pMon.stat & (NOPOWER|BROKEN)) ) + if(!(pMon.stat & (NOPOWER | BROKEN)) ) powercount++ powermonitors += pMon