cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 13:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code relocation.

Browse Source
This commit is contained in:
PsiOmegaDelta
2015-09-11 08:39:46 +02:00
parent f81ac77884
commit 0b433eb90c
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
code/__defines/machinery.dm
View File

@@ -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) 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! // 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. #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. // 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 #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 // Camera networks
#define NETWORK_CRESCENT "Crescent" #define NETWORK_CRESCENT "Crescent"
#define NETWORK_CIVILIAN_EAST "Civilian East" #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_ENGINE "Engine"
#define NETWORK_ENGINEERING "Engineering" #define NETWORK_ENGINEERING "Engineering"
#define NETWORK_ENGINEERING_OUTPOST "Engineering Outpost" #define NETWORK_ENGINEERING_OUTPOST "Engineering Outpost"
#define NETWORK_ERT "ERT" #define NETWORK_ERT "ZeEmergencyResponseTeam"
#define NETWORK_EXODUS "Exodus" #define NETWORK_EXODUS "Exodus"
#define NETWORK_MEDICAL "Medical" #define NETWORK_MEDICAL "Medical"
#define NETWORK_MERCENARY "MercurialNet"
#define NETWORK_MINE "MINE" #define NETWORK_MINE "MINE"
#define NETWORK_RESEARCH "Research" #define NETWORK_RESEARCH "Research"
#define NETWORK_RESEARCH_OUTPOST "Research Outpost" #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_ROBOTS "Robots"
#define NETWORK_SECURITY "Security" #define NETWORK_SECURITY "Security"
#define NETWORK_TELECOM "Tcomsat" #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 //singularity defines

2
code/game/machinery/computer/camera.dm
View File

@@ -254,5 +254,5 @@
name = "head mounted camera monitor" name = "head mounted camera monitor"
desc = "Used to access the built-in cameras in helmets." desc = "Used to access the built-in cameras in helmets."
icon_state = "syndicam" icon_state = "syndicam"
network = list("NUKE") network = list(NETWORK_MERCENARY)
circuit = null circuit = null

2
code/game/objects/items/devices/spy_bug.dm
View File

@@ -135,7 +135,7 @@
/obj/machinery/camera/spy /obj/machinery/camera/spy
// These cheap toys are accessible from the mercenary camera console as well // These cheap toys are accessible from the mercenary camera console as well
network = list("NUKE") network = list(NETWORK_MERCENARY)
/obj/machinery/camera/spy/New() /obj/machinery/camera/spy/New()
..() ..()

2
code/modules/clothing/spacesuits/rig/suits/merc.dm
View File

@@ -1,6 +1,6 @@
/obj/item/clothing/head/helmet/space/rig/merc /obj/item/clothing/head/helmet/space/rig/merc
light_overlay = "helmet_light_dual_green" light_overlay = "helmet_light_dual_green"
camera_networks = list("NUKE") camera_networks = list(NETWORK_MERCENARY)
/obj/item/weapon/rig/merc /obj/item/weapon/rig/merc
name = "crimson hardsuit control module" name = "crimson hardsuit control module"

2
code/modules/clothing/spacesuits/void/merc.dm
View File

@@ -7,7 +7,7 @@
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60) armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 35, bio = 100, rad = 60)
siemens_coefficient = 0.6 siemens_coefficient = 0.6
species_restricted = list("exclude","Unathi","Tajara","Skrell","Vox", "Xenomorph") 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 light_overlay = "helmet_light_green" //todo: species-specific light overlays
/obj/item/clothing/suit/space/void/merc /obj/item/clothing/suit/space/void/merc

3
code/modules/mob/living/silicon/ai/malf.dm
View File

@@ -136,6 +136,5 @@
// Cleaner proc for creating powersupply for an AI. // Cleaner proc for creating powersupply for an AI.
/mob/living/silicon/ai/proc/create_powersupply() /mob/living/silicon/ai/proc/create_powersupply()
if(psupply) if(psupply)
del(psupply) qdel(psupply)
psupply = new/obj/machinery/ai_powersupply(src) psupply = new/obj/machinery/ai_powersupply(src)