Merge remote-tracking branch 'upstream/master'

code/__defines/gamemode.dm

@@ -44,6 +44,7 @@
 #define BE_CORGI		0x80000
 #define BE_CURSEDSWORD	0x100000
 #define BE_SURVIVOR		0x200000
+#define BE_EVENT		0x400000
 //VOREStation Add End
 
 var/list/be_special_flags = list(
@@ -114,6 +115,7 @@ var/list/be_special_flags = list(
 #define MODE_THUG "thug"
 #define MODE_STOWAWAY "stowaway"
 #define MODE_SURVIVOR "Shipwreck Survivor"
+#define MODE_EVENT "Event Character"
 
 #define DEFAULT_TELECRYSTAL_AMOUNT 120
 

code/_onclick/hud/robot.dm

@@ -289,11 +289,11 @@ var/obj/screen/robot_inventory
 		if(r.emagged || r.emag_items)
 			for(var/obj/O in r.module.emag)
 				if(!(O in r.module.modules))
-					r.module.modules.Add(r.module.emag)
+					r.module.modules.Add(O)
 		else
 			for(var/obj/O in r.module.emag)
 				if(O in r.module.modules)
-					r.module.modules.Remove(r.module.emag)
+					r.module.modules.Remove(O)
 
 		for(var/atom/movable/A in r.module.modules)
 			if(r.client && (A != r.module_state_1) && (A != r.module_state_2) && (A != r.module_state_3) )

code/game/antagonist/station/event.dm

@@ -0,0 +1,15 @@
+var/datum/antagonist/event/event
+
+// Inherits most of its vars from the base datum.
+/datum/antagonist/event
+	id = MODE_EVENT
+	role_type = BE_EVENT
+	role_text = "Event Character"
+	role_text_plural = "Event Characters"
+	can_hear_aooc = TRUE		// If FALSE, the antag can neither speak nor hear AOOC. If TRUE, they can at least hear it.
+	can_speak_aooc = TRUE		// If TRUE, the antag can freely spean in AOOC.
+
+	welcome_text = "You are an event character."
+	antag_text = "You are have been selected as an event character, this gives you \
+		access to the AOOC chat channel to organise with other event characters. <b>Please remember all \
+		rules aside from those with explicit exceptions apply to event characters.</b>"

code/game/jobs/access_datum.dm

@@ -262,8 +262,18 @@
 	desc = "Station Network"
 	region = ACCESS_REGION_RESEARCH
 
-// /var/const/free_access_id = 43 // taken in VR
-// /var/const/free_access_id = 44 // taken in VR
+var/const/access_explorer = 43
+/datum/access/explorer
+	id = access_explorer
+	desc = "Away Team"
+	region = ACCESS_REGION_GENERAL
+/*
+/var/const/access_pathfinder = 44
+/datum/access/pathfinder
+	id = access_pathfinder
+	desc = "Pathfinder"
+	region = ACCESS_REGION_GENERAL
+*/
 
 /var/const/access_surgery = 45
 /datum/access/surgery
@@ -384,6 +394,24 @@
 	desc = "Medical Equipment"
 	region = ACCESS_REGION_MEDBAY
 
+var/const/access_pilot = 67
+/datum/access/pilot
+	id = access_pilot
+	desc = "Pilot"
+	region = ACCESS_REGION_GENERAL
+
+/var/const/access_entertainment = 72
+/datum/access/entertainment
+	id = access_entertainment
+	desc = "Entertainment Backstage"
+	region = ACCESS_REGION_GENERAL
+
+/var/const/access_xenobotany = 77
+/datum/access/xenobotany
+	id = access_xenobotany
+	desc = "Xenobotany Garden"
+	region = ACCESS_REGION_RESEARCH
+
 /******************
 * Central Command *
 ******************/
@@ -441,6 +469,24 @@
 	desc = "Central Command Administration"
 	access_type = ACCESS_TYPE_CENTCOM
 
+/var/const/access_clown = 136
+/datum/access/clown
+	id = access_clown
+	desc = "Clown Office"
+	region = ACCESS_REGION_GENERAL
+
+/var/const/access_tomfoolery = 137
+/datum/access/tomfoolery
+	id = access_tomfoolery
+	desc = "Tomfoolery Closet"
+	region = ACCESS_REGION_GENERAL
+
+/var/const/access_mime = 138
+/datum/access/mime
+	id = access_mime
+	desc = "Mime Office"
+	region = ACCESS_REGION_GENERAL
+
 /***************
 * Antag access *
 ***************/
@@ -473,3 +519,15 @@
 	id = access_alien
 	desc = "#%_^&*@!"
 	access_type = ACCESS_TYPE_PRIVATE
+
+/var/const/access_talon = 301
+/datum/access/talon
+	id = access_talon
+	desc = "Talon"
+	access_type = ACCESS_TYPE_PRIVATE
+
+/var/const/access_lost = 511 // For outsider borgs
+/datum/access/lost
+	id = access_lost
+	desc = "Lost"
+	access_type = ACCESS_TYPE_NONE