Coffee machine take two

code/__DEFINES/__game.dm

@@ -32,6 +32,7 @@
 #define MAP_ICE_COLONY_V3 "Shivas Snowball" //Ice Rework, low pop enabled.
 #define MAP_RUNTIME "USS Runtime"
 #define MAP_LV522_CHANCES_CLAIM "LV-522 Chance's Claim"
+#define MAP_LV759_HYBRISA_PROSPERA "LV-759 Hybrisa Prospera" // Highpop Only
 #define MAP_NEW_VARADERO "New Varadero"//ice colony underground but as its own map
 #define MAP_CHINOOK "Chinook 91 GSO" //admin level
 

code/__DEFINES/conflict.dm

@@ -242,6 +242,7 @@
 //Health of various items
 #define HEALTH_WALL 3000
 #define HEALTH_WALL_REINFORCED 9000
+#define HEALTH_WALL_ULTRA_REINFORCED 12000
 #define HEALTH_WALL_XENO 900
 #define HEALTH_WALL_XENO_WEAK 100
 #define HEALTH_WALL_XENO_THICK 1350

code/__DEFINES/dcs/signals/atom/mob/living/signals_living.dm

@@ -45,3 +45,8 @@
 
 /// from base of /mob/living/apply_status_effect(): (datum/status_effect/new_effect)
 #define COMSIG_LIVING_APPLY_EFFECT "living_apply_effect"
+
+/// from /datum/component/shimmy_around/proc/on_mob_move to determine if layer should be reset
+#define COMSIG_LIVING_SHIMMY_LAYER "structure_shimmy_layer"
+	/// Sent when a shimmy component is currently overriding the layer
+	#define COMSIG_LIVING_SHIMMY_LAYER_CANCEL (1<<0)

code/__DEFINES/dcs/signals/atom/signals_obj.dm

@@ -31,6 +31,9 @@
 
 #define COMSIG_STRUCTURE_WRENCHED "structure_wrenched"
 #define COMSIG_STRUCTURE_UNWRENCHED "structure_unwrenched"
+/// from /obj/structure/Collided() if not overriden for /datum/component/shimmy_around
+#define COMSIG_STRUCTURE_COLLIDED "structure_collided"
+
 #define COMSIG_TENT_COLLAPSING "tent_collapsing"
 
 /// from /obj/proc/afterbuckle()

code/__DEFINES/job.dm

@@ -249,6 +249,18 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 
 #define CMB_GRUNT_LIST list(JOB_CMB, JOB_CMB_TL)
 
+//-------- NSPA --------//
+#define JOB_NSPA_CST "NSPA Constable"
+#define JOB_NSPA_SC "NSPA Senior Constable"
+#define JOB_NSPA_SGT "NSPA Sergeant"
+#define JOB_NSPA_INSP "NSPA Inspector"
+#define JOB_NSPA_CINSP "NSPA Chief Inspector"
+#define JOB_NSPA_CMD "NSPA Commander"
+#define JOB_NSPA_DCO "NSPA Deputy Commissioner"
+#define JOB_NSPA_COM "NSPA Commissioner"
+
+#define NSPA_GRUNT_LIST list(JOB_NSPA_CST, JOB_NSPA_SC, JOB_NSPA_SGT)
+
 //-------- FORECON --------//
 
 #define JOB_FORECON_CO "Reconnaissance Commander"
@@ -378,6 +390,12 @@ GLOBAL_LIST_INIT(job_command_roles, JOB_COMMAND_ROLES_LIST)
 #define JOB_PLAYTIME_TIER_2  (25 HOURS)
 #define JOB_PLAYTIME_TIER_3  (70 HOURS)
 #define JOB_PLAYTIME_TIER_4  (175 HOURS)
+#define JOB_PLAYTIME_TIER_5  (350 HOURS)
+#define JOB_PLAYTIME_TIER_6  (600 HOURS)
+#define JOB_PLAYTIME_TIER_7  (1000 HOURS)
+#define JOB_PLAYTIME_TIER_8  (1500 HOURS)
+#define JOB_PLAYTIME_TIER_9  (2100 HOURS)
+#define JOB_PLAYTIME_TIER_10 (2800 HOURS)
 
 #define XENO_NO_AGE  -1
 #define XENO_YOUNG 0

code/__DEFINES/layers.dm

@@ -130,6 +130,8 @@
 #define ABOVE_XENO_LAYER 4.12
 /// For facehuggers
 #define FACEHUGGER_LAYER 4.13
+/// For Signs above everything but below weather
+#define BILLBOARD_LAYER 4.13
 /// For WEATHER
 #define WEATHER_LAYER 4.14
 

code/__DEFINES/minimap.dm

@@ -79,3 +79,16 @@ GLOBAL_LIST_INIT(all_minimap_flags, bitfield2list(MINIMAP_FLAG_ALL))
 
 #define TACMAP_BASE_OCCLUDED "Occluded"
 #define TACMAP_BASE_OPEN "Open"
+
+// Hybrisa
+#define MINIMAP_AREA_COLONY_STREETS "#4e6d67ae"
+#define MINIMAP_AREA_COLONY_SPACE_PORT "#a54b01ee"
+#define MINIMAP_AREA_COLONY_HOSPITAL "#029982e7"
+#define MINIMAP_AREA_COLONY_ENGINEERING "#888404e7"
+#define MINIMAP_AREA_COLONY_MARSHALLS "#880404e7"
+#define MINIMAP_AREA_COLONY_RESANDCOM "#91bdcfe7"
+#define MINIMAP_AREA_HYBRISACAVES "#390192ee"
+#define MINIMAP_AREA_HYBRISARESEARCH "#856600ee"
+#define MINIMAP_AREA_DERELICT "#920190ee"
+#define MINIMAP_AREA_OOB "#3a3a3a"
+#define MINIMAP_AREA_COMMS "#00b3ffe7"

code/__DEFINES/mob_hud.dm

@@ -49,6 +49,7 @@
 #define MOB_HUD_HUNTER_CLAN 17
 #define MOB_HUD_EXECUTE 18
 #define MOB_HUD_NEW_PLAYER 19
+#define MOB_HUD_FACTION_NSPA 20
 
 //for SL/FTL/LZ targeting on locator huds
 #define TRACKER_SL "track_sl"

code/__DEFINES/mode.dm

@@ -267,6 +267,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_PMC "PMC"
 #define FACTION_CONTRACTOR "VAI"
 #define FACTION_MARSHAL "Colonial Marshal"
+#define FACTION_NSPA "NSPA"
 #define FACTION_WY_DEATHSQUAD "WY Death Squad"
 #define FACTION_MERCENARY "Mercenary"
 #define FACTION_FREELANCER "Freelancer"
@@ -299,6 +300,7 @@ DEFINE_BITFIELD(whitelist_status, list(
 #define FACTION_LIST_MARINE_UPP list(FACTION_MARINE, FACTION_UPP)
 #define FACTION_LIST_MARINE_TWE list(FACTION_MARINE, FACTION_TWE)
 #define FACTION_LIST_YAUTJA list(FACTION_YAUTJA)
+#define FACTION_LIST_NSPA list(FACTION_NSPA, FACTION_TWE)
 
 // Xenomorphs
 #define FACTION_PREDALIEN "Predalien"

code/__DEFINES/paygrade_defs/civilian.dm

@@ -7,6 +7,9 @@
 /// CNUR, Nurse
 #define PAY_SHORT_CNUR "CNUR"
 
+///CPARA, Paramedic
+#define PAY_SHORT_CPARA "CPARA"
+
 /// CDOC, Doctor
 #define PAY_SHORT_CDOC "CDOC"
 

code/__DEFINES/paygrade_defs/nspa.dm

@@ -0,0 +1,27 @@
+// Paygrade shorthand defines, to allow clearer designation.
+
+// NSPA - (Neroid Sector Policing Authority) - TWE style Police, like the CMB but for heavy TWE focused colonies.
+
+/// CST, Constable
+#define PAY_SHORT_CST "CST"
+
+/// SC, Senior Constable
+#define PAY_SHORT_SC "SC"
+
+/// SGT, Sergeant
+#define PAY_SHORT_SGT "SGT"
+
+/// INSP, Inspector
+#define PAY_SHORT_INSP "INSP"
+
+/// CINSP, Chief Inspector
+#define PAY_SHORT_CINSP "CINSP"
+
+/// CMD, Commander
+#define PAY_SHORT_CMD "CMD"
+
+/// DCO, Deputy Commissioner
+#define PAY_SHORT_DCO "DCO"
+
+/// COM, Commissioner
+#define PAY_SHORT_COM "COM"

code/__DEFINES/paygrade_defs/weyland.dm

@@ -7,6 +7,9 @@
 /// WYC2, Junior Executive
 #define PAY_SHORT_WYC2 "WYC2"
 
+/// WYC2, Pilot - Captain
+#define PAY_SHORT_WYPO2 "WYPO2"
+
 /// WYC3, Executive
 #define PAY_SHORT_WYC3 "WYC3"
 

code/__DEFINES/sounds.dm

@@ -112,3 +112,22 @@
 #define SCAPE_PL_ENG list('sound/soundscape/engamb1.ogg', 'sound/soundscape/engamb2.ogg', 'sound/soundscape/engamb3.ogg', 'sound/soundscape/engamb4.ogg', 'sound/soundscape/engamb5.ogg', 'sound/soundscape/engamb6.ogg', 'sound/soundscape/engamb7.ogg', )
 #define SCAPE_PL_HANGAR list('sound/soundscape/hangaramb1.ogg', 'sound/soundscape/hangaramb2.ogg', 'sound/soundscape/hangaramb3.ogg', 'sound/soundscape/hangaramb4.ogg', 'sound/soundscape/hangaramb5.ogg', 'sound/soundscape/hangaramb6.ogg', 'sound/soundscape/hangaramb7.ogg', 'sound/soundscape/hangaramb8.ogg', 'sound/soundscape/hangaramb9.ogg', 'sound/soundscape/hangaramb10.ogg', )
 #define SCAPE_PL_ARES list('sound/soundscape/mother.ogg')
+
+// Hybrisa Soundscapes
+
+#define AMBIENCE_CITY 'sound/ambience/city_on_fire.ogg'
+#define AMBIENCE_DERELICT 'sound/ambience/derelict_ambience.ogg'
+#define AMBIENCE_LAB 'sound/ambience/lab_ambience.ogg'
+#define AMBIENCE_LAB_2 'sound/ambience/lab_ambience_2.ogg'
+#define AMBIENCE_LAB_HALLWAY 'sound/ambience/lab_ambience_hallway.ogg'
+#define AMBIENCE_WEYMART 'sound/ambience/weymart.ogg'
+#define AMBIENCE_HYBRISA_INTERIOR 'sound/ambience/hybrisa_interior.ogg'
+#define AMBIENCE_HYBRISA_CAVES 'sound/ambience/caves_ambience.ogg'
+#define AMBIENCE_HYBRISA_CAVES_ALARM 'sound/ambience/caves_ambience_alarm.ogg'
+
+#define SCAPE_PL_LV759_OUTDOORS list('sound/soundscape/lv759/outdoors/wind4.ogg','sound/soundscape/lv759/outdoors/wind5.ogg','sound/soundscape/lv759/outdoors/wind6.ogg','sound/soundscape/lv759/outdoors/wind7.ogg','sound/soundscape/lv759/outdoors/wind8.ogg','sound/soundscape/lv759/outdoors/wind9.ogg','sound/soundscape/lv759/outdoors/wind10.ogg','sound/soundscape/lv759/outdoors/wind11.ogg','sound/soundscape/lv759/outdoors/wind12.ogg','sound/soundscape/lv759/outdoors/wind13.ogg','sound/soundscape/lv759/outdoors/wind14.ogg','sound/soundscape/lv759/outdoors/wind15.ogg','sound/soundscape/lv759/outdoors/wind16.ogg','sound/soundscape/lv759/outdoors/wind17.ogg','sound/soundscape/lv759/outdoors/wind18.ogg','sound/soundscape/lv759/outdoors/wind19.ogg','sound/soundscape/lv759/outdoors/wind20.ogg','sound/soundscape/lv759/outdoors/wind21.ogg','sound/soundscape/lv759/outdoors/wind22.ogg','sound/soundscape/lv759/outdoors/wind23.ogg','sound/soundscape/lv759/outdoors/wind24.ogg','sound/soundscape/lv759/outdoors/wind25.ogg','sound/soundscape/lv759/outdoors/wind26.ogg','sound/soundscape/lv759/outdoors/wind27.ogg','sound/soundscape/lv759/outdoors/wind28.ogg',)
+#define SCAPE_PL_LV759_INDOORS list('sound/soundscape/lv522/indoors/indoor_wind.ogg','sound/soundscape/lv522/indoors/indoor_wind2.ogg','sound/soundscape/lv759/indoors/vent_1.ogg','sound/soundscape/lv759/indoors/vent_2.ogg','sound/soundscape/lv759/indoors/vent_3.ogg','sound/soundscape/lv759/indoors/vent_4.ogg','sound/soundscape/lv759/indoors/vent_5.ogg','sound/soundscape/lv759/indoors/vent_6.ogg','sound/soundscape/lv759/indoors/vent_7.ogg','sound/soundscape/lv759/indoors/vent_6.ogg','sound/soundscape/lv759/indoors/distant_sounds_1.ogg','sound/soundscape/lv759/indoors/distant_sounds_2.ogg','sound/soundscape/lv759/indoors/distant_sounds_3.ogg','sound/soundscape/lv759/indoors/distant_sounds_4.ogg','sound/soundscape/lv759/indoors/distant_sounds_5.ogg','sound/soundscape/lv759/indoors/distant_sounds_6.ogg','sound/soundscape/lv759/indoors/distant_sounds_7.ogg','sound/soundscape/lv759/indoors/distant_sounds_8.ogg','sound/soundscape/lv759/indoors/distant_sounds_9.ogg','sound/soundscape/lv759/indoors/distant_sounds_10.ogg','sound/soundscape/engamb1.ogg','sound/soundscape/engamb2.ogg','sound/soundscape/engamb3.ogg','sound/soundscape/engamb4.ogg','sound/soundscape/engamb5.ogg','sound/soundscape/engamb6.ogg','sound/soundscape/engamb7.ogg',)
+#define SCAPE_PL_LV759_DERELICTSHIP list('sound/soundscape/lv759/indoors/derelict1.ogg','sound/soundscape/lv759/indoors/derelict2.ogg','sound/soundscape/lv759/indoors/derelict3.ogg','sound/soundscape/lv759/indoors/derelict4.ogg','sound/soundscape/lv759/indoors/derelict5.ogg','sound/soundscape/lv759/indoors/derelict6.ogg','sound/soundscape/lv759/indoors/derelict7.ogg','sound/soundscape/lv759/indoors/derelict8.ogg')
+#define SCAPE_PL_LV759_DEEPCAVES list('sound/soundscape/lv759/outdoors/deepcave1.ogg','sound/soundscape/lv759/outdoors/deepcave2.ogg')
+#define SCAPE_PL_LV759_CAVES list('sound/soundscape/lv759/outdoors/windy_caverns_1.ogg','sound/soundscape/lv759/outdoors/windy_caverns_2.ogg','sound/soundscape/lv759/outdoors/windy_caverns_3.ogg',)
+#define SCAPE_PL_LV759_PLATEAU_OUTDOORS list('sound/soundscape/lv759/outdoors/derelict_plateau_1.ogg','sound/soundscape/lv759/outdoors/derelict_plateau_2.ogg',)

code/__DEFINES/weather.dm

@@ -6,6 +6,7 @@
 #define PROB_WEATHER_BIG_RED 30
 #define PROB_WEATHER_LV624 30
 #define PROB_WEATHER_NEW_VARADERO 100
+#define PROB_WEATHER_LV759 100
 
 #define WEATHER_TYPE_NO_WEATHER 0
 #define WEATHER_TYPE_SNOW 1

code/__HELPERS/lists.dm

@@ -41,12 +41,19 @@
 			return list[index]
 	return
 
-//Checks for specific types in a list
-/proc/is_type_in_list(atom/A, list/L)
-	for(var/type in L)
-		if(istype(A, type))
-			return 1
-	return 0
+///Checks if the needle atom is any type in the type_list
+/proc/is_type_in_list(atom/needle, list/type_list)
+	for(var/type in type_list)
+		if(istype(needle, type))
+			return TRUE
+	return FALSE
+
+///Checks if the needle path derives from any in the path_list
+/proc/is_path_in_list(needle, list/path_list)
+	for(var/path in path_list)
+		if(ispath(needle, path))
+			return TRUE
+	return FALSE
 
 //Removes any null entries from the list
 /proc/listclearnulls(list/list)

code/_onclick/hud/fullscreen.dm

@@ -8,11 +8,14 @@
 	if (!screen || screen.type != type)
 		// needs to be recreated
 		clear_fullscreen(category, FALSE)
-		fullscreens[category] = screen = new type()
+		fullscreens[category] = screen = type ? new type() : null
 	else if ((!severity || severity == screen.severity) && (!client || screen.screen_loc != "CENTER-7,CENTER-7" || screen.fs_view == client.view))
 		// doesn't need to be updated
 		return screen
 
+	if(!screen)
+		return
+
 	screen.icon_state = "[initial(screen.icon_state)][severity]"
 	screen.severity = severity
 	if (client && screen.should_show_to(src))
@@ -55,7 +58,7 @@
 		var/atom/movable/screen/fullscreen/screen
 		for(var/category in fullscreens)
 			screen = fullscreens[category]
-			if(screen.should_show_to(src))
+			if(screen?.should_show_to(src))
 				screen.update_for_view(client.view)
 				client.add_to_screen(screen)
 			else

code/controllers/subsystem/weather.dm

@@ -202,3 +202,6 @@ SUBSYSTEM_DEF(weather)
 /obj/effect/weather_vfx_holder/rain
 	icon_state = "strata_storm"
 	alpha = 50
+/obj/effect/weather_vfx_holder/hybrisa_rain
+	icon_state = "hybrisa_rain"
+	alpha = 50

code/datums/_atmos_setup.dm

@@ -13,8 +13,9 @@
 #define PIPE_COLOR_GREEN "#00ff00"
 #define PIPE_COLOR_YELLOW "#ffcc00"
 #define PIPE_COLOR_PURPLE "#5c1ec0"
+#define PIPE_COLOR_DARKGREY "#a6aeab"
 
-GLOBAL_LIST_INIT(pipe_colors, list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE))
+GLOBAL_LIST_INIT(pipe_colors, list("grey" = PIPE_COLOR_GREY, "red" = PIPE_COLOR_RED, "blue" = PIPE_COLOR_BLUE, "cyan" = PIPE_COLOR_CYAN, "green" = PIPE_COLOR_GREEN, "yellow" = PIPE_COLOR_YELLOW, "purple" = PIPE_COLOR_PURPLE, "darkgrey" = PIPE_COLOR_DARKGREY))
 
 /proc/pipe_color_lookup(color)
 	for(var/C in GLOB.pipe_colors)

code/datums/ammo/bullet/smg.dm

@@ -145,3 +145,23 @@
 	penetration = ARMOR_PENETRATION_TIER_4
 	damage_falloff = DAMAGE_FALLOFF_TIER_6
 	scatter = SCATTER_AMOUNT_TIER_6
+
+/datum/ammo/bullet/smg/p90
+	name = "submachinegun bullet"
+
+	damage = 22
+	accurate_range = 5
+	effective_range_max = 8
+	penetration = ARMOR_PENETRATION_TIER_2
+	damage_falloff = DAMAGE_FALLOFF_TIER_6
+	scatter = SCATTER_AMOUNT_TIER_6
+
+/datum/ammo/bullet/smg/p90/twe_ap
+	name = "armor-piercing submachinegun bullet"
+
+	damage = 26
+	accurate_range = 5
+	effective_range_max = 8
+	penetration = ARMOR_PENETRATION_TIER_4
+	damage_falloff = DAMAGE_FALLOFF_TIER_6
+	scatter = SCATTER_AMOUNT_TIER_6