From 0b433eb90c339ccd05c7fadb4d0f4cb6b7571fbc Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Fri, 11 Sep 2015 08:39:46 +0200 Subject: [PATCH] Code relocation. --- code/__defines/machinery.dm | 13 +++++++------ code/game/machinery/computer/camera.dm | 2 +- code/game/objects/items/devices/spy_bug.dm | 2 +- code/modules/clothing/spacesuits/rig/suits/merc.dm | 2 +- code/modules/clothing/spacesuits/void/merc.dm | 2 +- code/modules/mob/living/silicon/ai/malf.dm | 3 +-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm index 3f9ad5e574..de6bae21ce 100644 --- a/code/__defines/machinery.dm +++ b/code/__defines/machinery.dm @@ -5,7 +5,7 @@ var/CELLRATE = 0.002 // Multiplier for watts per tick <> cell storage (e.g., 0.0 var/CHARGELEVEL = 0.0005 // Cap for how fast cells charge, as a percentage-per-tick (0.01 means cellcharge is capped to 1% per second) // Doors! -#define DOOR_CRUSH_DAMAGE 10 +#define DOOR_CRUSH_DAMAGE 20 #define ALIEN_SELECT_AFK_BUFFER 1 // How many minutes that a person can be AFK before not being allowed to be an alien. // Channel numbers for power. @@ -30,9 +30,6 @@ var/CHARGELEVEL = 0.0005 // Cap for how fast cells charge, as a percentage-per-t #define AI_CAMERA_LUMINOSITY 6 -// Those networks can only be accessed by pre-existing terminals. AIs and new terminals can't use them. -var/list/restricted_camera_networks = list("thunder","ERT","NUKE","Secret") - // Camera networks #define NETWORK_CRESCENT "Crescent" #define NETWORK_CIVILIAN_EAST "Civilian East" @@ -41,9 +38,10 @@ var/list/restricted_camera_networks = list("thunder","ERT","NUKE","Secret") #define NETWORK_ENGINE "Engine" #define NETWORK_ENGINEERING "Engineering" #define NETWORK_ENGINEERING_OUTPOST "Engineering Outpost" -#define NETWORK_ERT "ERT" +#define NETWORK_ERT "ZeEmergencyResponseTeam" #define NETWORK_EXODUS "Exodus" #define NETWORK_MEDICAL "Medical" +#define NETWORK_MERCENARY "MercurialNet" #define NETWORK_MINE "MINE" #define NETWORK_RESEARCH "Research" #define NETWORK_RESEARCH_OUTPOST "Research Outpost" @@ -51,7 +49,10 @@ var/list/restricted_camera_networks = list("thunder","ERT","NUKE","Secret") #define NETWORK_ROBOTS "Robots" #define NETWORK_SECURITY "Security" #define NETWORK_TELECOM "Tcomsat" -#define NETWORK_THUNDER "thunder" +#define NETWORK_THUNDER "Thunderdome" + +// Those networks can only be accessed by pre-existing terminals. AIs and new terminals can't use them. +var/list/restricted_camera_networks = list(NETWORK_ERT,NETWORK_MERCENARY,"Secret") //singularity defines diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 9c90b5407b..90f1a344c5 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -254,5 +254,5 @@ name = "head mounted camera monitor" desc = "Used to access the built-in cameras in helmets." icon_state = "syndicam" - network = list("NUKE") + network = list(NETWORK_MERCENARY) circuit = null diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm index 6166048ccc..ccd5464dc4 100644 --- a/code/game/objects/items/devices/spy_bug.dm +++ b/code/game/objects/items/devices/spy_bug.dm @@ -135,7 +135,7 @@ /obj/machinery/camera/spy // These cheap toys are accessible from the mercenary camera console as well - network = list("NUKE") + network = list(NETWORK_MERCENARY) /obj/machinery/camera/spy/New() ..() diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm index 22add92014..1c69920300 100644 --- a/code/modules/clothing/spacesuits/rig/suits/merc.dm +++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm @@ -1,6 +1,6 @@ /obj/item/clothing/head/helmet/space/rig/merc light_overlay = "helmet_light_dual_green" - camera_networks = list("NUKE") + camera_networks = list(NETWORK_MERCENARY) /obj/item/weapon/rig/merc name = "crimson hardsuit control module" diff --git a/code/modules/clothing/spacesuits/void/merc.dm b/code/modules/clothing/spacesuits/void/merc.dm index 8362c78c5c..3a957b3b2e 100644 --- a/code/modules/clothing/spacesuits/void/merc.dm +++ b/code/modules/clothing/spacesuits/void/merc.dm @@ -7,7 +7,7 @@ armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60) siemens_coefficient = 0.6 species_restricted = list("exclude","Unathi","Tajara","Skrell","Vox", "Xenomorph") - camera_networks = list("NUKE") + camera_networks = list(NETWORK_MERCENARY) light_overlay = "helmet_light_green" //todo: species-specific light overlays /obj/item/clothing/suit/space/void/merc diff --git a/code/modules/mob/living/silicon/ai/malf.dm b/code/modules/mob/living/silicon/ai/malf.dm index d86faeb3ea..adafb233fb 100644 --- a/code/modules/mob/living/silicon/ai/malf.dm +++ b/code/modules/mob/living/silicon/ai/malf.dm @@ -136,6 +136,5 @@ // Cleaner proc for creating powersupply for an AI. /mob/living/silicon/ai/proc/create_powersupply() if(psupply) - del(psupply) + qdel(psupply) psupply = new/obj/machinery/ai_powersupply(src) -