Merge branch 'master' into reagentToDefines

code/__defines/diseases.dm

@@ -18,7 +18,6 @@
 #define CONTACT_GENERAL	(1<<5)
 #define AIRBORNE		(1<<6)
 
-
 //Severity Defines
 #define NONTHREAT	"No threat"
 #define MINOR		"Minor"

code/__defines/faction.dm

@@ -111,6 +111,7 @@
 #define FACTION_WOLFTAUR "wolftaur"
 #define FACTION_WORM "worm"
 #define FACTION_XENO "xeno"
+#define FACTION_CORGI "corgi"
 
 #define FACTION_PLANTS "plants"
 

code/__defines/gamemode.dm

@@ -40,11 +40,12 @@
 //VOREStation Add
 #define BE_LOSTDRONE	0x10000
 #define BE_MAINTPRED	0x20000
-#define BE_MORPH		0x40000
-#define BE_CORGI		0x80000
-#define BE_CURSEDSWORD	0x100000
-#define BE_SURVIVOR		0x200000
-#define BE_EVENT		0x400000
+#define BE_MAINTLURKER	0x40000
+#define BE_MORPH		0x80000
+#define BE_CORGI		0x100000
+#define BE_CURSEDSWORD	0x200000
+#define BE_SURVIVOR		0x400000
+#define BE_EVENT		0x800000
 //VOREStation Add End
 
 var/list/be_special_flags = list(
@@ -67,6 +68,7 @@ var/list/be_special_flags = list(
 	//VOREStation Add
 	"Lost Drone"       = BE_LOSTDRONE,
 	"Maint Pred"       = BE_MAINTPRED,
+	"Maint Lurker"     = BE_MAINTLURKER,
 	"Morph"            = BE_MORPH,
 	"Corgi"            = BE_CORGI,
 	"Cursed Sword"     = BE_CURSEDSWORD,

code/__defines/jobs.dm

@@ -420,3 +420,4 @@
 #define JOB_XENOMORPH "Xenomorph"
 #define JOB_BORER "Borer"
 #define JOB_EMERGENCY_RESPONSE_TEAM "Emergency Response Team"
+#define JOB_MAINT_LURKER "Maintenance Lurker"

code/__defines/misc.dm

@@ -48,10 +48,6 @@
 
 #define CLIENT_FROM_VAR(I) (ismob(I) ? I:client : (isclient(I) ? I : null))
 
-
-//Persistence
-#define AREA_FLAG_IS_NOT_PERSISTENT 8 // SSpersistence will not track values from this area.
-
 //	Shuttles.
 
 // These define the time taken for the shuttle to get to the space station, and the time before it leaves again.
@@ -99,7 +95,19 @@
 #define DEFAULT_JOB_TYPE /datum/job/assistant
 
 //Area flags, possibly more to come
-#define RAD_SHIELDED 1 //shielded from radiation, clearly
+#define RAD_SHIELDED 				0x1		//shielded from radiation, clearly
+#define BLUE_SHIELDED				0x2		// Shield from bluespace teleportation (telescience)
+#define AREA_SECRET_NAME			0x4		// This tells certain things that display areas' names that they shouldn't display this area's name.
+#define AREA_FLAG_IS_NOT_PERSISTENT 0x8		// SSpersistence will not track values from this area.
+#define AREA_FORBID_EVENTS			0x10	// random events will not start inside this area.
+#define AREA_FORBID_SINGULO			0x20	// singulo will not move in.
+#define AREA_NO_SPOILERS			0x40	// makes it much more difficult to see what is inside an area with things like mesons.
+#define AREA_SOUNDPROOF				0x80	// blocks sounds from other areas and prevents hearers on other areas from hearing the sounds within.
+#define AREA_BLOCK_PHASE_SHIFT		0x100	// Stops phase shifted mobs from entering
+#define AREA_BLOCK_GHOSTS			0x200	// Stops ghosts from entering
+#define AREA_ALLOW_LARGE_SIZE		0x400	// If mob size is limited in the area.
+#define AREA_BLOCK_SUIT_SENSORS		0x800	// If suit sensors are blocked in the area.
+#define AREA_BLOCK_TRACKING			0x1000	// If camera tracking is blocked in the area.
 
 // OnTopic return values
 #define TOPIC_NOACTION 0

code/__defines/misc_vr.dm

@@ -40,8 +40,6 @@
 //Shuttle madness!
 #define SHUTTLE_CRASHED 3 // Yup that can happen now
 
-#define BLUE_SHIELDED 2 // Shield from bluespace teleportation (telescience)
-
 //Herm Gender
 #define HERM "herm"
 

code/__defines/mobs.dm

@@ -328,6 +328,7 @@
 #define SPECIES_XENO_HUNTER		"Xenomorph Hunter"
 #define SPECIES_XENO_SENTINEL	"Xenomorph Sentinel"
 #define SPECIES_XENO_QUEEN		"Xenomorph Queen"
+#define SPECIES_XENOMORPH_HYBRID 	"Xenomorph Hybrid"
 
 // Misc species. Mostly unused but might as well be complete.
 #define SPECIES_SHADOW			"Shadow"
@@ -456,3 +457,6 @@
 #define VISIBLE_GENDER_FORCE_PLURAL 1		// Used by get_visible_gender to return PLURAL
 #define VISIBLE_GENDER_FORCE_IDENTIFYING 2	// Used by get_visible_gender to return the mob's identifying gender
 #define VISIBLE_GENDER_FORCE_BIOLOGICAL 3	// Used by get_visible_gender to return the mob's biological gender
+
+// Default name for accesories
+#define DEVELOPER_WARNING_NAME "you should not see this..."

code/__defines/species_languages_vr.dm

@@ -15,6 +15,7 @@
 #define LANGUAGE_ANIMAL "Animal"
 #define LANGUAGE_TEPPI "Teppi"
 #define LANGUAGE_MOUSE "Mouse"
+#define LANNGUAGE_DRAKE "Drake"
 
 #define LANGUAGE_SHADEKIN "Shadekin Empathy"
 #define LANGUAGE_LLEILL "Glamour Speak"

code/__defines/talksounds.dm

@@ -0,0 +1,63 @@
+
+
+var/list/talk_sound_map = rlist(
+								list(
+									"beep-boop",
+									"goon speak 1",
+									"goon speak 2",
+									"goon speak 3",
+									"goon speak 4",
+									"goon speak blub",
+									"goon speak bottalk",
+									"goon speak buwoo",
+									"goon speak cow",
+									"goon speak lizard",
+									"goon speak pug",
+									"goon speak pugg",
+									"goon speak roach",
+									"goon speak skelly",
+									// "xeno speak" // Does not exist on virgo
+								),
+								list(
+									talk_sound,
+									goon_speak_one_sound,
+									goon_speak_two_sound,
+									goon_speak_three_sound,
+									goon_speak_four_sound,
+									goon_speak_blub_sound,
+									goon_speak_bottalk_sound,
+									goon_speak_buwoo_sound,
+									goon_speak_cow_sound,
+									goon_speak_lizard_sound,
+									goon_speak_pug_sound,
+									goon_speak_pugg_sound,
+									goon_speak_roach_sound,
+									goon_speak_skelly_sound,
+									// xeno_speak_sound // Does not exist on virgo
+									)
+								)
+
+/proc/get_talk_sound(var/voice_sound)
+	if(!voice_sound)
+		return talk_sound_map[1]
+	return talk_sound_map[2][voice_sound]
+
+/proc/rlist(var/list/keys,var/list/values) //short for reversible list generator
+	var/list/rlist = list(list(),list(),FALSE,0)
+	var/i = 0
+	for(i = 1, i <= LAZYLEN(keys), i++)
+		to_chat(world,keys[i])
+		rlist[1] += keys[i]
+		rlist[2][keys[i]] = values[i]
+	rlist += TRUE
+	rlist += i
+	return rlist
+
+/proc/arlist(var/list/altlist)
+	var/list/rlist = list(list(),list(),FALSE,0)
+	var/i = 0
+	for(i = 1, i <= LAZYLEN(altlist), i++)
+		rlist[(i % 2) +1] += altlist[i]
+	rlist += TRUE
+	rlist += i/2
+	return rlist