Ports basically all the major bar changes for QoL

Yeah.  We went there.

_maps/map_files/coyote_bayou/Newboston.dmm

@@ -13103,6 +13103,10 @@
 	},
 /turf/open/floor/carpet/red,
 /area/f13/wasteland/city/newboston/chapel)
+"fzn" = (
+/obj/machinery/mineral/wasteland_vendor/ammo,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
+/area/f13/building/workshop/nash)
 "fzD" = (
 /turf/open/indestructible/ground/outside/desert,
 /area/f13/building)
@@ -24968,6 +24972,13 @@
 /obj/item/stack/crafting/electronicparts/three,
 /turf/open/floor/plasteel/f13/vault_floor/dark/darksolid,
 /area/f13/building)
+"knc" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/machinery/mineral/wasteland_vendor/ammo,
+/turf/open/floor/plasteel/f13/vault_floor/misc/vaultrust,
+/area/f13/building/workshop/nash)
 "knl" = (
 /obj/structure/closet/fridge,
 /obj/effect/spawner/lootdrop/f13/foodspawner,
@@ -115584,11 +115595,11 @@ aDk
 aDk
 oHa
 nJt
-cki
-wBU
-qpV
 nIN
-rni
+nIN
+nIN
+nIN
+nIN
 nIN
 nIN
 wgA
@@ -116041,12 +116052,12 @@ aDk
 aDk
 oHa
 nJt
-nJt
-nJt
-nJt
-nJt
-nJt
-vLv
+cki
+wBU
+qpV
+knc
+fzn
+nIN
 nIN
 nIN
 nIN
@@ -116498,13 +116509,13 @@ aDk
 aDk
 oHa
 oXC
-oXC
-oXC
-oXC
-oXC
 nJt
-oVf
-rni
+nJt
+nJt
+nJt
+vLv
+nIN
+nIN
 nIN
 nIN
 hOw
@@ -116958,10 +116969,10 @@ oXC
 oXC
 oXC
 oXC
-oXC
-nJt
-nJt
 nJt
+oVf
+rni
+nIN
 nIN
 nIN
 nJt
@@ -117415,10 +117426,10 @@ oXC
 oXC
 oXC
 oXC
-oXC
+nJt
 nJt
 klH
-rBe
+klH
 kvd
 kvd
 kvd

_maps/templates/splurt_templates/hilbertshotel.dmm

@@ -64,14 +64,9 @@
 	},
 /turf/open/indestructible/hoteltile,
 /area/hilbertshotel)
-"ke" = (
-/obj/machinery/light_switch{
-	pixel_x = -32
-	},
-/turf/open/floor/wood_common/wood_common_dark,
-/area/hilbertshotel)
 "kU" = (
 /obj/machinery/telecomms/relay/preset/auto,
+/turf/open/indestructible/ground/outside/desert,
 /area/hilbertshotel)
 "kX" = (
 /obj/structure/table/reinforced,
@@ -422,7 +417,7 @@ GW
 "}
 (7,1,1) = {"
 GW
-GW
+kU
 Si
 zD
 Rt
@@ -440,7 +435,7 @@ GW
 "}
 (8,1,1) = {"
 GW
-kU
+GW
 Si
 Si
 Si
@@ -463,7 +458,7 @@ wC
 Uc
 yh
 MZ
-ke
+MZ
 MZ
 hz
 wf

code/__DEFINES/_flags/item_flags.dm

@@ -34,6 +34,8 @@
 #define BEEN_JUICED							(1<<16)
 /// This thing should be deleted when dropped, BUT and this is important, only deletes when it is no longer in your inventory
 #define PERSONAL_ITEM						(1<<17)
+/// Dont turn when you click this on someone
+#define NO_TURN 						   (1<<18)
 
 /// This thing was clicked on, and something said not to pick it up (cus its gonna do something cool)
 #define ITEM_CLICKED_NOPICKUP				(1<<1)

code/__DEFINES/traits.dm

@@ -328,6 +328,7 @@
 #define TRAIT_TACKLER            "tackler"
 #define TRAIT_TACKLERADV           "Advanced Tackler"
 #define TRAIT_TACKLERNONCONX           "Apex Tackler"
+#define TRAIT_TACKLERAPEX           "Apex Tackler"
 #define TRAIT_NO_TELEPORT		"no-teleport" //you just can't
 #define TRAIT_NO_INTERNALS		"no-internals"
 #define TRAIT_NO_ALCOHOL		"alcohol_intolerance"
@@ -353,12 +354,11 @@
 #define TRAIT_DISTANT "distant"
 #define TRAIT_HEADPAT_SLUT "headpat_sluuuuut"
 #define TRAIT_ORAL_FIXATION "oral fixation"
-#define TRAIT_RISKY_BUSINESS "creampie fixation"
 #define TRAIT_NOERP "no erp"
+#define TRAIT_SNUGGLER "snuggle rp"
 #define TRAIT_VANILLAERP "vanilla erp"
 #define TRAIT_ROUGHERP "rough erp"
 #define TRAIT_EXTREMEERP "extreme erp"
-#define TRAIT_SNUGGLER "snuggle rp"
 #define TRAIT_FERALERP "feral erp"
 #define TRAIT_ROBOTERP "robot erp"
 #define TRAIT_VOREERP "vore erp"
@@ -368,6 +368,7 @@
 #define TRAIT_BIGBOOBS "big boobs"
 #define TRAIT_BIGBALLS "big balls"
 #define TRAIT_BIGWEENIE "big dick"	
+#define TRAIT_RISKY_BUSINESS "creampie fixation"
 //#define TRAIT_PACKRAT "packrat"
 #define TRAIT_HYDRA_HEADS "hydra_heads"
 #define TRAIT_SHELTERED "sheltered"
@@ -389,9 +390,14 @@
 #define TRAIT_ENDLESS_RUNNER "endless_runner"
 #define TRAIT_PANICKED_ATTACKER "panicked_attacker"
 #define TRAIT_NOHIDEFACE "no hide face"
+#define TRAIT_SECURITYEXPERT "security-expert"
 #define TRAIT_CLAM_TONGUE "clam_tongue"
 #define TRAIT_CLAM_LOVER "clam_lover"
 #define TRAIT_CLAM_FISHER "clam_fisher"
+#define TRAIT_PILLOW_CRIMINAL "pillow_crimes"
+
+#define TRAIT_NO_PVP_EVER "no_pvp_ever"
+#define TRAIT_NOCRITPAIN "no_crit_pain"
 
 // mobility flag traits
 // IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it)
@@ -458,7 +464,6 @@
 /// You're hooked on punga!
 #define TRAIT_PUNGAPOWER "pungaful"
 #define TRAIT_NO_SECOND_WIND "no_second_wind"
-#define TRAIT_NOCRITPAIN "no_crit_pain"
 
 #define TRAIT_NO_MED_HVY_ARMOR "no_med_heavy_armor"
 

code/_globalvars/traits.dm

@@ -177,7 +177,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_TASED_RESISTANCE" = TRAIT_TASED_RESISTANCE,
 		"TRAIT_TESLA_SHOCKIMMUNE" = TRAIT_TESLA_SHOCKIMMUNE,
 		"TRAIT_THERMAL_VISION" = TRAIT_THERMAL_VISION,
-		"TRAIT_TACKLER" = TRAIT_TACKLER,
+		"TRAIT_TACKLER" = TRAIT_TACKLER,		
 		"TRAIT_TACKLERADV" = TRAIT_TACKLERADV,
 		"TRAIT_TACKLERNONCONX" = TRAIT_TACKLERNONCONX,
 		"TRAIT_TOXINIMMUNE" = TRAIT_TOXINIMMUNE,
@@ -201,6 +201,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_HEAL_TEND" = TRAIT_HEAL_TEND,
 		"TRAIT_IMPROVED_HEALING" = TRAIT_IMPROVED_HEALING,
 		"TRAIT_ARTIFACT_IDENTIFY" = TRAIT_ARTIFACT_IDENTIFY,
+
 	),
 	/obj/item/bodypart = list(
 		"TRAIT_PARALYSIS" = TRAIT_PARALYSIS