Merge remote-tracking branch 'upstream/master' into old_lizards

_maps/RandomRuins/BeachRuins/beach_float_resort.dmm

@@ -237,14 +237,6 @@
 	light_range = 2
 	},
 /area/ruin/beach/float_resort/villa)
-"gr" = (
-/obj/structure/table/wood,
-/obj/structure/curtain/cloth,
-/obj/item/nullrod/tribal_knife,
-/turf/open/floor/wood{
-	light_range = 2
-	},
-/area/ruin/beach/float_resort/villa)
 "gQ" = (
 /obj/structure/flora/ausbushes/genericbush,
 /turf/open/floor/plating/grass/beach,
@@ -2502,7 +2494,7 @@ kp
 kp
 kp
 kp
-gr
+ar
 OH
 OH
 OH

_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm

@@ -35,7 +35,6 @@
 /area/ruin/wasteplanet)
 "bL" = (
 /obj/structure/fluff/divine/convertaltar,
-/obj/item/nullrod/tribal_knife,
 /obj/item/clothing/accessory/pandora_hope,
 /turf/open/indestructible/hierophant/two/waste,
 /area/ruin/wasteplanet)

code/__DEFINES/dcs/signals.dm

@@ -773,3 +773,6 @@
 
 ///called in /obj/item/gun/process_chamber (src)
 #define COMSIG_GUN_CHAMBER_PROCESSED "gun_chamber_processed"
+
+///called when an elzu should unroot
+#define COMSIG_DIGOUT "dig_out"

code/datums/components/storage/concrete/pockets.dm

@@ -83,10 +83,16 @@
 /datum/component/storage/concrete/pockets/helmet/Initialize()
 	. = ..()
 	set_holdable(list(
-		/obj/item/reagent_containers/food/drinks/bottle/vodka,
-		/obj/item/reagent_containers/food/drinks/bottle/molotov,
-		/obj/item/reagent_containers/food/drinks/drinkingglass,
-		/obj/item/ammo_box/magazine/illestren_a850r
+		/obj/item/clothing/glasses/cold,
+		/obj/item/clothing/glasses/heat,
+		/obj/item/clothing/glasses/welding,
+		/obj/item/clothing/glasses/thermal,
+		/obj/item/clothing/glasses/night,
+		/obj/item/clothing/glasses/hud/health/night,
+		/obj/item/clothing/glasses/hud/security/night,
+		/obj/item/clothing/glasses/hud/security/sunglasses/inteq,
+		/obj/item/ammo_casing,
+		/obj/item/ammo_box/magazine/illestren_a850r,
 	))
 
 /datum/component/storage/concrete/pockets/holster

code/datums/mood_events/generic_positive_events.dm

@@ -239,3 +239,8 @@
 	description = "Fishing is relaxing"
 	mood_change = 5
 	timeout = 3 MINUTES
+
+/datum/mood_event/root
+	description = span_nicegreen("I rooted recently, it feels good to charge naturally.\n")
+	mood_change = 5
+	timeout = 5 MINUTES

code/datums/status_effects/neutral.dm

@@ -275,3 +275,29 @@
 /atom/movable/screen/alert/status_effect/surrender/Click(location, control, params)
 	. = ..()
 	owner.emote("surrender")
+
+/datum/status_effect/rooted
+	id = "rooted"
+	alert_type = /atom/movable/screen/alert/status_effect/rooted
+
+/datum/status_effect/rooted/on_apply()
+	. = ..()
+	ADD_TRAIT(owner,TRAIT_IMMOBILIZED, TRAIT_STATUS_EFFECT(id))
+	ADD_TRAIT(owner,TRAIT_PUSHIMMUNE, TRAIT_STATUS_EFFECT(id))
+	SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "root", /datum/mood_event/root)
+
+/datum/status_effect/rooted/on_remove()
+	. = ..()
+	REMOVE_TRAIT(owner,TRAIT_IMMOBILIZED, TRAIT_STATUS_EFFECT(id))
+	REMOVE_TRAIT(owner,TRAIT_PUSHIMMUNE, TRAIT_STATUS_EFFECT(id))
+
+/atom/movable/screen/alert/status_effect/rooted
+	name = "Rooted"
+	desc = "You're currently rooted into the ground and can't move. Click here to start digging yourself out."
+	icon_state = "dig_out"
+
+/atom/movable/screen/alert/status_effect/rooted/Click(location, control, params)
+	. = ..()
+	to_chat(owner, span_notice("You begin digging yourself free."))
+	SEND_SIGNAL(owner,COMSIG_DIGOUT)
+

code/game/objects/effects/anomalies/anomalies_static.dm

@@ -39,19 +39,19 @@
 		playsound(src, 'sound/effects/walkietalkie.ogg', 75)
 		if(stored_mob && looking.stat != DEAD && prob(25))
 			say_fucky_things()
-		if (!HAS_TRAIT(looking, TRAIT_MINDSHIELD) && looking.stat != DEAD || !looking.research_scanner && looking.stat != DEAD || !HAS_TRAIT(looking, TRAIT_DEAF))
-			looking.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 200)
-			playsound(src, 'sound/effects/stall.ogg', 50)
-			if(looking.getOrganLoss(ORGAN_SLOT_BRAIN) >= 150 && looking.stat != DEAD)
-				if(prob(20))
-					var/mob/living/carbon/victim = looking
-					var/obj/effect/anomaly/tvstatic/planetary/expansion
-					expansion = new(get_turf(victim))
-					visible_message(span_warning("The static overtakes [victim], taking their place!"))
-					victim.death()
-					expansion.stored_mob = victim
-					victim.forceMove(expansion)
-	return
+		if(HAS_TRAIT(looking, TRAIT_MINDSHIELD) || looking.stat == DEAD || looking.research_scanner || HAS_TRAIT(looking, TRAIT_DEAF))
+			continue
+		looking.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 200)
+		playsound(src, 'sound/effects/stall.ogg', 50)
+		if(looking.getOrganLoss(ORGAN_SLOT_BRAIN) >= 150 && looking.stat != DEAD)
+			if(prob(20))
+				var/mob/living/carbon/victim = looking
+				var/obj/effect/anomaly/tvstatic/planetary/expansion
+				expansion = new(get_turf(victim))
+				visible_message(span_warning("The static overtakes [victim], [expansion] taking their place!"))
+				victim.death()
+				expansion.stored_mob = victim
+				victim.forceMove(expansion)
 
 
 /obj/effect/anomaly/tvstatic/Bumped(atom/movable/AM)

code/game/objects/items.dm

@@ -699,6 +699,9 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 /obj/item/proc/get_belt_overlay() //Returns the icon used for overlaying the object on a belt
 	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', icon_state)
 
+/obj/item/proc/get_helmet_overlay() // returns the icon for overlaying on a helmet
+	return mutable_appearance('icons/mob/clothing/helmet_overlays.dmi', icon_state)
+
 /obj/item/proc/update_slot_icon()
 	if(!ismob(loc))
 		return

code/game/objects/items/holy_weapons.dm

@@ -671,33 +671,6 @@
 	lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi'
 
-/obj/item/nullrod/tribal_knife
-	icon_state = "crysknife"
-	item_state = "crysknife"
-	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
-	name = "arrhythmic knife"
-	w_class = WEIGHT_CLASS_HUGE
-	desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn."
-	sharpness = IS_SHARP
-	slot_flags = null
-	hitsound = 'sound/weapons/bladeslice.ogg'
-	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
-	item_flags = SLOWS_WHILE_IN_HAND
-
-/obj/item/nullrod/tribal_knife/Initialize(mapload)
-	. = ..()
-	START_PROCESSING(SSobj, src)
-	AddComponent(/datum/component/butchering, 50, 100)
-
-/obj/item/nullrod/tribal_knife/Destroy()
-	STOP_PROCESSING(SSobj, src)
-	. = ..()
-
-/obj/item/nullrod/tribal_knife/process()
-	slowdown = rand(-2, 2)
-
-
 /obj/item/nullrod/pitchfork
 	icon_state = "pitchfork0"
 	lefthand_file = 'icons/mob/inhands/weapons/polearms_lefthand.dmi'

code/modules/cargo/packs/ammo.dm

@@ -143,6 +143,12 @@
 	contains = list(/obj/item/ammo_box/amagpellet_claris)
 	cost = 1000
 
+/datum/supply_pack/ammo/a300
+	name = ".300 Magnum Stripper Clip Crate"
+	desc = "Contains a five round .300 Magnum stripper clip for sniper rifles such as the HP Scout."
+	contains = list(/obj/item/ammo_box/a300)
+	cost = 750
+
 /datum/supply_pack/ammo/ebr_ammo
 	name = "M514 EBR .308 Magazine Crate"
 	desc = "Contains a .308 magazine for the M514 EBR rifle, containing ten rounds."
@@ -173,6 +179,12 @@
 	contains = list(/obj/item/ammo_box/a762_40)
 	cost = 500
 
+/datum/supply_pack/ammo/a357_ammo_box
+	name = ".357 Ammo Box Crate"
+	desc = "Contains a fifty-round .357 box for revolvers such as the Scarborough Revolver and the HP Firebrand."
+	contains = list(/obj/item/ammo_box/a357_box)
+	cost = 250
+
 /datum/supply_pack/ammo/c556mmHITP_ammo_box
 	name = "5.56 Caseless Ammo Box Crate"
 	desc = "Contains a fifty-round 5.56mm caseless box for SolGov sidearms like the Pistole C."
@@ -209,6 +221,12 @@
 	contains = list(/obj/item/ammo_box/c9mm/ap)
 	cost = 500
 
+/datum/supply_pack/ammo/a357match_ammo_box
+	name = ".357 Match Ammo Box Crate"
+	desc = "Contains a fifty-round .357 match box for better performance against armor."
+	contains = list(/obj/item/ammo_box/a357_box/match)
+	cost = 500
+
 /datum/supply_pack/ammo/c556mmHITPap_ammo_box
 	name = "5.56 caseless AP Ammo Box Crate"
 	desc = "Contains a fifty-round 5.56mm caseless boxloaded with armor piercing ammo."
@@ -233,6 +251,12 @@
 	contains = list(/obj/item/ammo_box/c9mm/hp)
 	cost = 500
 
+/datum/supply_pack/ammo/a357hp_ammo_box
+	name = ".357 HP Ammo Box Crate"
+	desc = "Contains a fifty-round .357 box loaded with hollow point ammo, great against unarmored targets."
+	contains = list(/obj/item/ammo_box/a357_box/hp)
+	cost = 500
+
 /datum/supply_pack/ammo/c10mmhp_ammo_box
 	name = "10mm HP Ammo Box Crate"
 	desc = "Contains a fifty-round 10mm box loaded with hollow point ammo, great against unarmored targets."
@@ -305,6 +329,18 @@
 	contains = list(/obj/item/ammo_box/c8x50mmhp_box)
 	cost = 500
 
+/datum/supply_pack/ammo/a300_box
+	name = ".300 Ammo Box Crate"
+	desc = "Contains a twenty-round .300 Magnum ammo box for sniper rifles such as the HP Scout."
+	contains = list(/obj/item/ammo_box/a300_box)
+	cost = 500
+
+/datum/supply_pack/ammo/a4570_box
+	name = ".45-70 Ammo Box Crate"
+	desc = "Contains a twelve-round box containing devastatingly powerful .45-70 caliber ammunition."
+	contains = list(/obj/item/ammo_box/a4570)
+	cost = 500
+
 /datum/supply_pack/ammo/ferropelletboxcrate
 	name = "Ferromagnetic Pellet Box Crate"
 	desc = "Contains a fifty-round ferromagnetic pellet ammo box for gauss guns such as the Claris."

code/modules/cargo/packs/gun.dm

@@ -7,16 +7,19 @@
 */
 
 /datum/supply_pack/gun/disposable
-	name = "Disposable Guns Crate"
-	desc = "In some sectors, these disposable pistols are the only firearms that can be legally sold for less than 400cr. That price is still far too high; this pack contains five."
-	cost = 750
-	contains = list(/obj/item/gun/ballistic/automatic/pistol/disposable,
-					/obj/item/gun/ballistic/automatic/pistol/disposable,
-					/obj/item/gun/ballistic/automatic/pistol/disposable,
-					/obj/item/gun/ballistic/automatic/pistol/disposable,
-					/obj/item/gun/ballistic/automatic/pistol/disposable)
+	name = "Disposable Gun Crate"
+	desc = "In some sectors, these disposable pistols are the only firearms that can be legally sold for less than 200cr. That price is still far too high."
+	cost = 150
+	contains = list(/obj/item/gun/ballistic/automatic/pistol/disposable)
 	crate_name = "disposable gun crate"
 
+/datum/supply_pack/gun/derringer
+	name = ".38 Derringer Crate"
+	desc = "A cheap, concealable pistol manufactured by the reputable Hunter's Pride. At least it's better than a disposable pistol. Chambered in .38 rounds."
+	cost = 350
+	contains = list(/obj/item/gun/ballistic/derringer)
+	crate_name = "derringer crate"
+
 /datum/supply_pack/gun/commanders
 	name = "Commander Pistol Crate"
 	desc = "Contains a modified Candor 'Commander' pistol, produced by Nanotrasen and chambered in 9mm."
@@ -36,15 +39,15 @@
 	cost = 1000
 	contains = list(/obj/item/gun/ballistic/automatic/pistol/candor)
 
-/datum/supply_pack/gun/revolver
-	name = "Scarborough Revolver Crate"
-	desc = "Contains a concealable Scarborough revolver, chambered in .357."
+/datum/supply_pack/gun/pepperbox
+	name = "HP Firebrand Pepperbox Revolver Crate"
+	desc = "Contains a concealable pepperbox revolver manufactured by the Saint Roumain Militia, chambered in .357."
 	cost = 1250
-	contains = list(/obj/item/gun/ballistic/revolver)
+	contains = list(/obj/item/gun/ballistic/revolver/firebrand)
 
 /datum/supply_pack/gun/detrevolver
 	name = "Hunter's Pride Detective Revolver Crate"
-	desc = "Contains a concealable Solarian revolver, chambered in .38."
+	desc = "Contains a concealable revolver favored by police departments around the sector, chambered in .38."
 	cost = 600
 	contains = list(/obj/item/gun/ballistic/revolver/detective)
 
@@ -107,6 +110,13 @@
 		Shotguns
 */
 
+/datum/supply_pack/gun/doublebarrel_shotgun
+	name = "Double Barrel Shotgun Crate"
+	desc = "For when you need to deal with 2 drunkards the old-fashioned way. Contains a double-barreled shotgun, favored by Bartenders. Warranty voided if sawed off."
+	cost = 1000
+	contains = list(/obj/item/gun/ballistic/shotgun/doublebarrel)
+	crate_name = "shotguns crate"
+
 /datum/supply_pack/gun/hellfire_shotgun
 	name = "Hellfire Shotgun Crate"
 	desc = "For when you need to deal with 7 hooligans. Contains a pump shotgun, with a 8-round capacity."
@@ -132,20 +142,34 @@
 	contains = list(/obj/item/gun/ballistic/shotgun/flamingarrow)
 	crate_name = "rifle crate"
 
-/datum/supply_pack/gun/cobra20
-	name = "Cobra-20 SMG Crate"
-	desc = "Contains a .45 submachine gun, manufactured by Scarborough Arms and chambered in .45"
-	cost = 3000
-	contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra)
-	crate_name = "SMG crate"
-
 /datum/supply_pack/gun/illestren
 	name = "Illestren Rifle Crate"
 	desc = "Contains a expertly made bolt action rifle intended for hunting wildlife. Chambered in 8x50mmR rounds."
 	cost = 1250
 	contains = list(/obj/item/gun/ballistic/rifle/illestren)
 	crate_name = "rifle crate"
 
+/datum/supply_pack/gun/beacon
+	name = "Contender Break Action Rifle Crate"
+	desc = "Contains a single shot break action rifle to hunt wildlife that annoys you in particular. Chambered in devastating .45-70 rounds. Warranty voided if sawed off."
+	cost = 2250
+	contains = list(/obj/item/gun/ballistic/shotgun/doublebarrel/beacon)
+	crate_name = "rifle crate"
+
+/datum/supply_pack/gun/scout
+	name = "Scout Sniper Rifle Crate"
+	desc = "Contains a traditional scoped rifle to hunt wildlife and big game from a respectful distance. Chambered in powerful .300 Magnum."
+	cost = 5500
+	contains = list(/obj/item/gun/ballistic/rifle/scout)
+	crate_name = "rifle crate"
+
+/datum/supply_pack/gun/cobra20
+	name = "Cobra-20 SMG Crate"
+	desc = "Contains a .45 submachine gun, manufactured by Scarborough Arms and chambered in .45"
+	cost = 3000
+	contains = list(/obj/item/gun/ballistic/automatic/smg/c20r/cobra)
+	crate_name = "SMG crate"
+
 /datum/supply_pack/gun/wt550
 	name = "WT-550 Auto Rifle Crate"
 	desc = "Contains a high-powered, automatic personal defense weapon chambered in 4.6x30mm."

code/modules/cargo/packs/sec_supply.dm

@@ -56,11 +56,9 @@
 
 /datum/supply_pack/sec_supply/riotshields
 	name = "Riot Shields Crate"
-	desc = "For when the greytide gets really uppity. Contains three riot shields."
-	cost = 2000
-	contains = list(/obj/item/shield/riot,
-					/obj/item/shield/riot,
-					/obj/item/shield/riot)
+	desc = "Contains a riot shield, effective at holding back hostile fauna, xenofauna, or large crowds."
+	cost = 600
+	contains = list(/obj/item/shield/riot)
 	crate_name = "riot shields crate"
 
 /datum/supply_pack/sec_supply/survknives

code/modules/client/loadout/loadout_suit.dm

@@ -111,3 +111,7 @@
 	display_name = "worn shirt"
 	path = /obj/item/clothing/suit/ianshirt
 
+/datum/gear/suit/hawaiian
+	display_name = "floral shirt"
+	description = "From grills to guns, this shirt's seen it all."
+	path = /obj/item/clothing/suit/hawaiian