Merge remote-tracking branch 'cmss13-devs/master' into forest/pred/lo…

…cktoggle

code/__DEFINES/admin.dm

@@ -71,3 +71,6 @@ var/global/list/note_categories = list("Admin", "Merit", "Commanding Officer", "
 #define ANTIGRIEF_NEW_PLAYERS 1
 /// Enables antigrief entirely: Nobody can activate explosives on the Almayer, unless the ship crashed.
 #define ANTIGRIEF_ENABLED 2
+
+/// Proc has been blocked by IsAdminAdvancedProcCall()
+#define PROC_BLOCKED "PROCCALL BLOCKED"

code/__DEFINES/client_prefs.dm

@@ -22,6 +22,7 @@
 #define TOGGLE_VEND_ITEM_TO_HAND (1<<15) // This toggles whether items from vendors will be automatically put into your hand.
 #define TOGGLE_START_JOIN_CURRENT_SLOT (1<<16) // Whether joining at roundstart ignores assigned character slot for the job and uses currently selected slot.
 #define TOGGLE_LATE_JOIN_CURRENT_SLOT (1<<17) //Whether joining during the round ignores assigned character slot for the job and uses currently selected slot.
+#define TOGGLE_ABILITY_DEACTIVATION_OFF (1<<18) // This toggles whether selecting the same ability again can toggle it off
 
 #define JOB_SLOT_RANDOMISED_SLOT -1
 #define JOB_SLOT_CURRENT_SLOT 0

code/__DEFINES/conflict.dm

@@ -200,6 +200,7 @@
 
 // human armor
 #define CLOTHING_ARMOR_NONE 0
+#define CLOTHING_ARMOR_VERYLOW 5
 #define CLOTHING_ARMOR_LOW 10
 #define CLOTHING_ARMOR_MEDIUMLOW 15
 #define CLOTHING_ARMOR_MEDIUM 20

code/__DEFINES/sounds.dm

@@ -71,6 +71,7 @@
 #define AMBIENCE_ALMAYER 'sound/ambience/almayerambience.ogg'
 #define AMBIENCE_LV624 'sound/ambience/ambienceLV624.ogg'
 #define AMBIENCE_BIGRED 'sound/ambience/desert.ogg'
+#define AMBIENCE_NV 'sound/ambience/ambienceNV.ogg'
 #define AMBIENCE_PRISON 'sound/ambience/shipambience.ogg'
 #define AMBIENCE_TRIJENT 'sound/ambience/desert.ogg'
 

code/__DEFINES/tgs.dm

@@ -1,6 +1,6 @@
 // tgstation-server DMAPI
 
-#define TGS_DMAPI_VERSION "6.5.0"
+#define TGS_DMAPI_VERSION "6.5.2"
 
 // All functions and datums outside this document are subject to change with any version and should not be relied on.
 

code/__DEFINES/weather.dm

@@ -5,6 +5,7 @@
 #define PROB_WEATHER_SOROKYNE 100 //Map specific defines go here.
 #define PROB_WEATHER_BIG_RED 30
 #define PROB_WEATHER_LV624 30
+#define PROB_WEATHER_NEW_VARADERO 100
 
 #define WEATHER_TYPE_NO_WEATHER 0
 #define WEATHER_TYPE_SNOW 1

code/__HELPERS/game.dm

@@ -241,8 +241,14 @@
 		else
 			return get_step(start, EAST)
 
-/// Get a list of observers that can be alien candidates, optionally sorted by larva_queue_time
-/proc/get_alien_candidates(sorted = TRUE)
+/**
+ * Get a list of observers that can be alien candidates.
+ *
+ * Arguments:
+ * * hive - The hive we're filling a slot for to check if the player is banished
+ * * sorted - Whether to sort by larva_queue_time (default TRUE) or leave unsorted
+ */
+/proc/get_alien_candidates(datum/hive_status/hive = null, sorted = TRUE)
 	var/list/candidates = list()
 
 	for(var/mob/dead/observer/cur_obs as anything in GLOB.observer_list)
@@ -273,6 +279,15 @@
 		if((cur_obs.client.admin_holder && (cur_obs.client.admin_holder.rights & R_MOD)) && !cur_obs.adminlarva)
 			continue
 
+		if(hive)
+			var/banished = FALSE
+			for(var/mob_name in hive.banished_ckeys)
+				if(hive.banished_ckeys[mob_name] == cur_obs.ckey)
+					banished = TRUE
+					break
+			if(banished)
+				continue
+
 		candidates += cur_obs
 
 	// Optionally sort by larva_queue_time

code/__HELPERS/type2type.dm

@@ -226,7 +226,6 @@
 	if(rights & R_POSSESS) . += "[seperator]+POSSESS"
 	if(rights & R_PERMISSIONS) . += "[seperator]+PERMISSIONS"
 	if(rights & R_STEALTH) . += "[seperator]+STEALTH"
-	if(rights & R_REJUVINATE) . += "[seperator]+REJUVINATE"
 	if(rights & R_COLOR) . += "[seperator]+COLOR"
 	if(rights & R_VAREDIT) . += "[seperator]+VAREDIT"
 	if(rights & R_SOUNDS) . += "[seperator]+SOUND"

code/__HELPERS/verb_helpers.dm

@@ -10,7 +10,7 @@
 	if(!target)
 		CRASH("add_verb called without a target")
 	if(IsAdminAdvancedProcCall())
-		return
+		return PROC_BLOCKED
 	var/mob/mob_target = null
 
 	if(ismob(target))
@@ -56,7 +56,7 @@
  */
 /proc/remove_verb(client/target, verb_or_list_to_remove)
 	if(IsAdminAdvancedProcCall())
-		return
+		return PROC_BLOCKED
 
 	var/mob/mob_target = null
 	if(ismob(target))

code/_globalvars/bitfields.dm

@@ -25,7 +25,6 @@ DEFINE_BITFIELD(rights, list(
 	"POSSESS" = R_POSSESS,
 	"PERMISSIONS" = R_PERMISSIONS,
 	"STEALTH" = R_STEALTH,
-	"REJUVENATE" = R_REJUVINATE,
 	"COLOR" = R_COLOR,
 	"VAREDIT" = R_VAREDIT,
 	"SOUNDS" = R_SOUNDS,

code/controllers/configuration/configuration.dm

@@ -24,7 +24,8 @@
 
 /datum/controller/configuration/proc/admin_reload()
 	if(IsAdminAdvancedProcCall())
-		return
+		alert_proccall("configuration admin_reload")
+		return PROC_BLOCKED
 	log_admin("[key_name(usr)] has forcefully reloaded the configuration from disk.")
 	message_admins("[key_name_admin(usr)] has forcefully reloaded the configuration from disk.")
 	full_wipe()
@@ -33,7 +34,8 @@
 
 /datum/controller/configuration/proc/Load(_directory)
 	if(IsAdminAdvancedProcCall()) //If admin proccall is detected down the line it will horribly break everything.
-		return
+		alert_proccall("configuration Load")
+		return PROC_BLOCKED
 	if(_directory)
 		directory = _directory
 	if(entries)
@@ -117,7 +119,8 @@
 
 /datum/controller/configuration/proc/full_wipe()
 	if(IsAdminAdvancedProcCall())
-		return
+		alert_proccall("configuration full_wipe")
+		return PROC_BLOCKED
 	entries_by_type.Cut()
 	QDEL_LIST_ASSOC_VAL(entries)
 	entries = null
@@ -163,7 +166,8 @@
 
 /datum/controller/configuration/proc/LoadEntries(filename, list/stack = list())
 	if(IsAdminAdvancedProcCall())
-		return
+		alert_proccall("configuration LoadEntries")
+		return PROC_BLOCKED
 
 	var/filename_to_test = world.system_type == MS_WINDOWS ? lowertext(filename) : filename
 	if(filename_to_test in stack)
@@ -264,7 +268,7 @@
 		CRASH("Missing config entry for [entry_type]!")
 	if((E.protection & CONFIG_ENTRY_HIDDEN) && IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Get" && GLOB.LastAdminCalledTargetRef == "[REF(src)]")
 		log_admin_private("Config access of [entry_type] attempted by [key_name(usr)]")
-		return
+		return PROC_BLOCKED
 	return E.config_entry_value
 
 
@@ -278,7 +282,7 @@
 		CRASH("Missing config entry for [entry_type]!")
 	if((E.protection & CONFIG_ENTRY_LOCKED) && IsAdminAdvancedProcCall() && GLOB.LastAdminCalledProc == "Set" && GLOB.LastAdminCalledTargetRef == "[REF(src)]")
 		log_admin_private("Config rewrite of [entry_type] to [new_val] attempted by [key_name(usr)]")
-		return
+		return PROC_BLOCKED
 	return E.ValidateAndSet("[new_val]")
 
 

code/controllers/configuration/entries/game_options.dm

@@ -122,3 +122,8 @@
 /datum/config_entry/number/extra_larva_per_burst
 	config_entry_value = 1
 	integer = FALSE
+
+/datum/config_entry/number/embryo_burst_timer
+	min_val = 1
+	config_entry_value = 450
+	integer = TRUE