Merge branch 'master' into I-got-bored-as-shit

_maps/map_files/Pahrump-Sunset/RedRiver.dmm

@@ -452,12 +452,6 @@
 	name = "the watering hole"
 	},
 /area/f13/wasteland)
-"aiX" = (
-/mob/living/carbon/human/species,
-/turf/open/indestructible/ground/outside/road{
-	icon_state = "horizontalbottombordertop0"
-	},
-/area/f13/wasteland/city)
 "aja" = (
 /obj/effect/decal/marking{
 	icon_state = "doublehorizontal"
@@ -7637,7 +7631,6 @@
 /area/f13/building/abandoned)
 "dvA" = (
 /mob/living/simple_animal/hostile/poison/giant_spider/nurse,
-/mob/living/carbon/human/species,
 /turf/open/floor/f13{
 	icon_state = "floorrusty"
 	},
@@ -24641,11 +24634,6 @@
 	icon_state = "horizontalbottomborderbottom0"
 	},
 /area/f13/wasteland/city)
-"kPi" = (
-/obj/structure/spider/stickyweb,
-/mob/living/carbon/human/species,
-/turf/open/indestructible/ground/outside/sidewalk,
-/area/f13/wasteland/city)
 "kPp" = (
 /obj/structure/flora/grass/jungle/b,
 /turf/open/indestructible/ground/outside/dirt,
@@ -40234,7 +40222,9 @@
 /area/f13/wasteland)
 "rVZ" = (
 /obj/effect/decal/cleanable/dirt/dust,
-/obj/structure/simple_door/metal/fence,
+/obj/structure/simple_door/metal/fence{
+	dir = 2
+	},
 /turf/open/floor/plasteel{
 	icon_state = "asteroidfloor"
 	},
@@ -49607,12 +49597,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/indestructible/ground/outside/dirt,
 /area/f13/wasteland)
-"wgw" = (
-/mob/living/carbon/human/species,
-/turf/open/floor/f13{
-	icon_state = "bluerustysolid"
-	},
-/area/f13/building/abandoned)
 "wgz" = (
 /obj/structure/bed/old,
 /obj/effect/spawner/lootdrop/bedsheet,
@@ -58784,7 +58768,7 @@ mvE
 ipV
 iPM
 prM
-wgw
+eQM
 pXJ
 qyn
 nUC
@@ -62377,7 +62361,7 @@ tpA
 jif
 xDc
 fmm
-aiX
+kiu
 mvE
 cjz
 dUR
@@ -63413,7 +63397,7 @@ dhm
 dNe
 dNe
 wIw
-kPi
+wIw
 wIw
 kkA
 ioX

code/__DEFINES/mobs.dm

@@ -621,3 +621,16 @@
 #define TATTOO_VISIBILITY_RANGE 3
 
 #define SIMPLEMOB_IGNORE 1
+
+#define PHUD_NONE  "GENITAL_HUD_NONE"
+#define PHUD_BUTT  "GENITAL_HUD_BUTT"
+#define PHUD_BOOB  "GENITAL_HUD_BREASTS"
+#define PHUD_PENIS "GENITAL_HUD_PEEN"
+#define PHUD_BALLS "GENITAL_HUD_BALLS"
+#define PHUD_VAG   "GENITAL_HUD_VAG"
+#define PHUD_BELLY "GENITAL_HUD_BELLY"
+#define PHUD_TAIL  "GENITAL_HUD_TAIL"
+#define PHUD_WINGS "GENITAL_HUD_WINGS"
+#define PHUD_SHIRT "GENITAL_HUD_SHIRT"
+#define PHUD_PANTS "GENITAL_HUD_PANTS"
+#define PHUD_SOCKS "GENITAL_HUD_SOCKS"

code/__DEFINES/preferences.dm

@@ -108,6 +108,20 @@
 #define CHAOS_HIGH "High"
 #define CHAOS_MAX "Maximum"
 
+#define TBS_TOP "I am a top!"
+#define TBS_BOTTOM "I am a bottom!"
+#define TBS_SHOES "I am a switch!"
+#define TBS_NONE "I am none of these!"
+#define TBS_DEFAULT TBS_NONE
+#define TBS_LIST list(TBS_TOP, TBS_BOTTOM, TBS_SHOES, TBS_NONE)
+
+#define KISS_BOYS "I am a boykisser!"
+#define KISS_GIRLS "I am a girlkisser!"
+#define KISS_ANY "I'll kiss anybody!"
+#define KISS_NONE "I don't kiss!"
+#define KISS_DEFAULT KISS_NONE
+#define KISS_LIST list(KISS_BOYS,KISS_GIRLS,KISS_ANY,KISS_NONE)
+
 //CB Toggles
 #define AIM_CURSOR_ON (1<<0)
 

code/__DEFINES/traits.dm

@@ -131,6 +131,7 @@
 #define TRAIT_NODISMEMBER		"dismember_immunity"
 #define TRAIT_NOFIRE			"nonflammable"
 #define TRAIT_NOGUNS			"no_guns"
+#define TRAIT_MARTIAL_A			"no_guns"
 #define TRAIT_NOHUNGER			"no_hunger"
 #define TRAIT_EASYDISMEMBER		"easy_dismember"
 #define TRAIT_LIMBATTACHMENT 	"limb_attach"

code/__HELPERS/_cit_helpers.dm

@@ -130,7 +130,7 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 		L = get_equipped_items()
 	for(var/A in L)
 		var/obj/item/I = A
-		if(I.body_parts_hidden & GROIN)
+		if(I.body_parts_covered & GROIN)
 			return FALSE
 	return TRUE
 
@@ -139,7 +139,7 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 		L = get_equipped_items()
 	for(var/A in L)
 		var/obj/item/I = A
-		if(I.body_parts_hidden & CHEST)
+		if(I.body_parts_covered & CHEST)
 			return FALSE
 	return TRUE
 

code/__HELPERS/text.dm

@@ -124,7 +124,7 @@
 	var/name = input(user, message, title, default) as message|null
 	if(isnull(name)) // Return null if canceled.
 		return null
-	if(!check_rights_for(user?.client, R_ADMIN) || i_will_sanitize_dont_worry)
+	if(!check_rights(R_ADMIN, FALSE) || i_will_sanitize_dont_worry)
 		name = strip_html_simple(name, max_length) // I'd prefer not to stab myself with a url
 	if(length(name) > max_length)
 		to_chat(user, name)

code/__HELPERS/unsorted.dm

@@ -501,6 +501,8 @@ Turf and target are separate in case you want to teleport some distance from a t
 	var/steps = 1
 	if(current != target_turf)
 		current = get_step_towards(current, target_turf)
+		if (!current)
+			return 0 // How did you get from somewhere to nowhere????
 		while(current != target_turf)
 			if(steps > length)
 				return 0
@@ -1632,13 +1634,15 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 
 /// REcursively searches through the atom's loc, looking for a type path, aborting if it hits a turf
 /proc/recursive_loc_path_search(atom/haystack, pathtype, max_depth = 5)
+	if(!haystack)
+		return // There is no haystack, or needle for that matter
 	if(max_depth <= 0)
 		return // we've gone too deep
 	if(istype(haystack, pathtype))
 		return haystack
 	if(isturf(haystack))
 		return
-	if(haystack.loc)
+	if(haystack && haystack.loc)
 		return recursive_loc_path_search(haystack.loc, pathtype, max_depth - 1)
 
 /// Recursively searches through everything in a turf for atoms. Will recursively search through all those atoms for atoms, and so on.

code/_globalvars/traits.dm

@@ -109,6 +109,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_NODISMEMBER" = TRAIT_NODISMEMBER,
 		"TRAIT_NOFIRE" = TRAIT_NOFIRE,
 		"TRAIT_NOGUNS" = TRAIT_NOGUNS,
+		"TRAIT_MARTIAL_A" = TRAIT_MARTIAL_A,
 		"TRAIT_NOHARDCRIT" = TRAIT_NOHARDCRIT,
 		"TRAIT_NOHIDEFACE" = TRAIT_NOHIDEFACE,
 		"TRAIT_NOHUNGER" = TRAIT_NOHUNGER,

code/_onclick/hud/hud.dm

@@ -13,7 +13,8 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	"Plasmafire" = 'icons/mob/screen_plasmafire.dmi',
 	"Slimecore" = 'icons/mob/screen_slimecore.dmi',
 	"Operative" = 'icons/mob/screen_operative.dmi',
-	"Clockwork" = 'icons/mob/screen_clockwork.dmi'
+	"Clockwork" = 'icons/mob/screen_clockwork.dmi',
+	"Minimal" = 'icons/mob/screen_minimal.dmi'
 ))
 
 /proc/ui_style2icon(ui_style)

code/controllers/subsystem/parallax.dm

@@ -1,7 +1,7 @@
 SUBSYSTEM_DEF(parallax)
 	name = "Parallax"
 	wait = 2
-	flags = SS_POST_FIRE_TIMING | SS_BACKGROUND
+	flags = SS_POST_FIRE_TIMING | SS_BACKGROUND | SS_NO_FIRE
 	priority = FIRE_PRIORITY_PARALLAX
 	runlevels = RUNLEVEL_LOBBY | RUNLEVELS_DEFAULT
 	var/list/currentrun