cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 16:19:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-11-01 20:21:11 -04:00
committed by GitHub
parent 0851b4f14c
commit 3f52b2ef92
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__defines/machinery.dm
+1 -7
View File
@@ -66,18 +66,12 @@ var/global/defer_powernet_rebuild = 0 // True if net rebuild will be called
#define NETWORK_PRISON "Prison"
#define NETWORK_SECURITY "Security"
#define NETWORK_INTERROGATION "Interrogation"
<<<<<<< HEAD
#define NETWORK_TELECOM "Tcomms"
#define NETWORK_TELECOM "Telecomms"
#define NETWORK_TCOMMS "Telecommunications" //YW ADD: needs to be defined here or it freaks out
#define NETWORK_OUTSIDE "Outside" //YW ADD: ditto
#define NETWORK_SUBSTATIONS "Substations" //YW ADD: and again
||||||| parent of 2bb3d46cf5... Merge pull request #11734 from Heroman3003/sd-with-modules
#define NETWORK_TELECOM "Tcomms"
=======
#define NETWORK_TELECOM "Telecomms"
#define NETWORK_EXPLORATION "Exploration"
#define NETWORK_XENOBIO "Xenobiology"
>>>>>>> 2bb3d46cf5... Merge pull request #11734 from Heroman3003/sd-with-modules
#define NETWORK_THUNDER "Entertainment" //VOREStation Edit: broader definition
#define NETWORK_COMMUNICATORS "Communicators"
#define NETWORK_ALARM_ATMOS "Atmosphere Alarms"