Merge remote-tracking branch 'upstream/master' into pr/3889

cmss13-devs · Jul 19, 2023 · 498ccaa · 498ccaa
2 parents 997cc22 + 2bd9e6e
commit 498ccaa
Show file tree

Hide file tree

Showing 155 changed files with 34,921 additions and 24,202 deletions.
diff --git a/code/__DEFINES/client_prefs.dm b/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

diff --git a/code/__DEFINES/conflict.dm b/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

diff --git a/code/__DEFINES/sounds.dm b/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'
 

diff --git a/code/__DEFINES/tgs.dm b/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.
 

diff --git a/code/__DEFINES/weather.dm b/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

diff --git a/code/__DEFINES/xeno.dm b/code/__DEFINES/xeno.dm
@@ -168,6 +168,8 @@
 #define XENO_LEAVE_TIMER_LARVA 80 //80 seconds
 /// The time against away_timer when an AFK xeno (not larva) can be replaced
 #define XENO_LEAVE_TIMER 300 //300 seconds
+/// The time against away_timer when an AFK facehugger converts to a npc
+#define XENO_FACEHUGGER_LEAVE_TIMER 420 //420 seconds
 /// The time against away_timer when an AFK xeno gets listed in the available list so ghosts can get ready
 #define XENO_AVAILABLE_TIMER 60 //60 seconds
 

diff --git a/code/__HELPERS/game.dm b/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

diff --git a/code/datums/weather/weather_events/new_varadero.dm b/code/datums/weather/weather_events/new_varadero.dm
@@ -0,0 +1,38 @@
+/datum/weather_event/light_rain
+	name = "Tropical Storm"
+	display_name = "Tropical Storm"
+	length = 4 MINUTES
+	fullscreen_type = /atom/movable/screen/fullscreen/weather/low
+
+	turf_overlay_icon_state = "strata_storm"
+	turf_overlay_alpha = 40
+
+	effect_message = null
+	damage_per_tick = 0
+
+	has_process = TRUE
+	lightning_chance = 1
+
+	ambience = 'sound/ambience/rainforest.ogg'
+
+	fire_smothering_strength = 1
+
+/datum/weather_event/monsoon
+	name = "Monsoon Warning"
+	display_name = "Monsoon Warning"
+	length = 6 MINUTES
+	fullscreen_type = /atom/movable/screen/fullscreen/weather/high
+
+	turf_overlay_icon_state = "strata_storm"
+	turf_overlay_alpha = 115
+
+	effect_message = null
+	damage_per_tick = 0
+
+
+	ambience = 'sound/ambience/varadero_storm.ogg'
+
+	has_process = TRUE
+	lightning_chance = 6
+
+	fire_smothering_strength = 4
diff --git a/code/datums/weather/weather_map_holders/new_varadero.dm b/code/datums/weather/weather_map_holders/new_varadero.dm
@@ -0,0 +1,20 @@
+/datum/weather_ss_map_holder/new_varadero
+	name = "New Varadero Map Holder"
+
+	min_time_between_events = 15 MINUTES
+	no_weather_turf_icon_state = "strata_clearsky"
+
+	potential_weather_events = list(
+		/datum/weather_event/light_rain,
+		/datum/weather_event/monsoon,
+	)
+
+/datum/weather_ss_map_holder/new_varadero/should_affect_area(area/A)
+	return !CEILING_IS_PROTECTED(A.ceiling, CEILING_GLASS)
+
+/datum/weather_ss_map_holder/new_varadero/should_start_event()
+	return prob(PROB_WEATHER_NEW_VARADERO)
+
+/datum/weather_ss_map_holder/new_varadero/weather_warning()
+	for (var/obj/structure/machinery/storm_siren/WS in weather_notify_objects)
+		WS.weather_warning()