Merge branch 'campaign' into rts-control

code/__DEFINES/__game.dm

@@ -37,9 +37,17 @@
 #define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim" // Highpop Only
 #define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
 #define MAP_NEW_VARADERO_REPAIRED "New Varadero Repaired"
+#define MAP_LV759_HYBRISA_PROSPERA "LV-759 Hybrisa Prospera" // Highpop Only
 #define MAP_CHINOOK "Chinook 91 GSO" //admin level
 #define MAP_DERELICT_ALMAYER "Derelict Almayer"
 
+#define MAP_LV671_ARK "LV-671 Ark Borealis"
+#define MAP_DESERT_DAM_RU "Trijent Dam RU"
+#define MAP_WHISKEY_OUTPOST_RU "Outpost Tango"
+#define MAP_DERELICT_ALMAYER_RU "Derelict Almayer RU"
+#define MAP_KUTJEVO_RU "Kutjevo Refinery RU"
+#define MAP_OIL_DEPOT "Oil Depot 276"
+
 #define GAMEMODE_WHISKEY_OUTPOST "Whiskey Outpost"
 #define GAMEMODE_HIVE_WARS "Hive Wars"
 

code/__DEFINES/access.dm

@@ -208,3 +208,19 @@ most of them are tied into map-placed objects. This should be reworked in the fu
 #define ACCESS_LIST_CLF_BASE "CLF (Basic)"
 ///All access levels associated with CLF
 #define ACCESS_LIST_CLF_ALL "CLF (ALL)"
+
+//RU-PVE ADDITION STARTS
+#define ACCESS_ILLEGAL_PIRATE_PREP 121
+#define ACCESS_ILLEGAL_PIRATE_SMARTGUNNER 122
+#define ACCESS_ILLEGAL_PIRATE_TEAMLEAD 123
+#define ACCESS_ILLEGAL_PIRATE_SENIOR_LEAD 124
+#define ACCESS_ILLEGAL_PIRATE_MEDICAL 125
+#define ACCESS_ILLEGAL_PIRATE_CO 126
+
+#define ACCESS_PMC_SQUAD_ONE 208
+#define ACCESS_PMC_SQUAD_TWO 209
+
+#define ACCESS_PMC_GUNNER 217
+
+#define ACCESS_LIST_FL_PLATOON "FL (platoon)"
+//RU-PVE ADDITION STOPS

code/__DEFINES/camera.dm

@@ -7,6 +7,7 @@
 #define CAMERA_NET_ALAMO "Alamo"
 #define CAMERA_NET_NORMANDY "Normandy"
 #define CAMERA_NET_MIDWAY "Midway"
+#define CAMERA_NET_RASPUTIN "Rasputin"
 #define CAMERA_NET_COLONY "Colony"
 #define CAMERA_NET_ARES "ARES"
 

code/__DEFINES/dcs/signals/atom/mob/signals_mind.dm

@@ -0,0 +1,2 @@
+///from mind/transfer_to. Sent after the mind has been transferred to a different body: (mob/previous_body)
+#define COMSIG_MIND_TRANSFERRED "mind_transferred"

code/__DEFINES/dcs/signals/atom/mob/signals_mob.dm

@@ -72,9 +72,13 @@
 #define COMSIG_MOB_PRE_CLICK "mob_pre_click"
 	#define COMPONENT_INTERRUPT_CLICK (1<<0)
 
-///from base of /mob/Login(): ()
+/// From base of /mob/Login(), called when a client logs into this mob: ()
+/// Not to be confused with [COMSIG_MOB_LOGGED_IN]
 #define COMSIG_MOB_LOGIN "mob_login"
-///from base of /mob/Logout(): ()
+/// From base of /mob/Login(), called after a client logs into this mob: ()
+/// Not to be confused with [COMSIG_MOB_LOGIN]
+#define COMSIG_MOB_LOGGED_IN "mob_logged_in"
+/// From base of /mob/Logout(): ()
 #define COMSIG_MOB_LOGOUT "mob_logout"
 
 //from /mob/proc/on_deafness_gain()

code/__DEFINES/dcs/signals/signals_client.dm

@@ -19,8 +19,8 @@
 /// Called after one or more verbs are added: (list of verbs added)
 #define COMSIG_CLIENT_VERB_REMOVED "client_verb_removed"
 
-/// Called after a client logs into a mob: (mob)
-#define COMSIG_CLIENT_MOB_LOGIN "client_mob_changed"
+/// Called from /mob/Login() after a client logs into a mob: (mob)
+#define COMSIG_CLIENT_MOB_LOGGED_IN "client_mob_logged_in"
 
 /// Called when something is added to a client's screen : /client/proc/add_to_screen(screen_add)
 #define COMSIG_CLIENT_SCREEN_ADD "client_screen_add"

code/__DEFINES/dcs/signals/signals_global.dm

@@ -34,9 +34,11 @@
 
 #define COMSIG_GLOB_REMOVE_VOTE_BUTTON "!remove_vote_button"
 
-#define COMSIG_GLOB_CLIENT_LOGIN "!client_login"
+/// Called from /client/New() when a client logs in to the game: (client)
+#define COMSIG_GLOB_CLIENT_LOGGED_IN "!client_logged_in"
 
-#define COMSIG_GLOB_MOB_LOGIN "!mob_login"
+/// Called from /mob/Login() when a client logs into a mob: (mob)
+#define COMSIG_GLOB_MOB_LOGGED_IN "!mob_logged_in"
 
 ///from /datum/controller/subsystem/ticker/PostSetup
 #define COMSIG_GLOB_POST_SETUP "!post_setup"