Merge pull request #17284 from MMMiracles/spookyjookie

Lavaland Ruins

code/modules/awaymissions/corpse.dm

@@ -359,6 +359,11 @@
 	suit = /obj/item/clothing/suit/space/hardsuit/mining
 	mask = /obj/item/clothing/mask/breath
 
+/obj/effect/mob_spawn/human/miner/explorer
+	uniform = /obj/item/clothing/under/rank/miner/lavaland
+	gloves = /obj/item/clothing/gloves/color/black
+	back = /obj/item/weapon/storage/backpack/security
+	shoes = /obj/item/clothing/shoes/jackboots
 
 /obj/effect/mob_spawn/human/plasmaman
 	mob_species = /datum/species/plasmaman
@@ -453,6 +458,17 @@
 	icon_state = "sleeper"
 	flavour_text = "You are a Nanotrasen Commander!"
 
+/obj/effect/mob_spawn/human/wwii
+	name = "World War II Reenactor"
+	uniform = /obj/item/clothing/under/wwii
+	shoes = /obj/item/clothing/shoes/combat
+	gloves = /obj/item/clothing/gloves/combat
+	mask = /obj/item/clothing/mask/gas
+	helmet = /obj/item/clothing/head/helmet/stahlhelm
+	back = /obj/item/weapon/storage/backpack/security
+	has_id = 0
+
+
 /////////////////Spooky Undead//////////////////////
 
 /obj/effect/mob_spawn/human/skeleton

code/modules/clothing/head/misc.dm

@@ -261,3 +261,36 @@
 	desc = "A paper sack with crude holes cut out for eyes and a sketchy smile drawn on the front. Not creepy at all."
 	icon_state = "papersack_smile"
 	flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS
+
+/*
+-!WARNING!-
+-POTENTIAL TRIGGER-INDUCING ITEMS AHEAD-
+-TREAD WITH CAUTION-
+*/
+
+/obj/item/clothing/head/helmet/stahlhelm
+	name = "stahlhelm"
+	desc = "A hard military helmet, seems dusty."
+	icon_state = "stalhelm"
+	item_state = "stalhelm"
+	armor = list(melee = 15, bullet = 10, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	strip_delay = 30
+
+/obj/item/clothing/head/helmet/panzer
+	name = "Panzer Cap"
+	desc = "A fancy-looking military cap."
+	icon_state = "panzercap"
+	item_state = "panzercap"
+
+/obj/item/clothing/head/helmet/naziofficer
+	name = "Officer Cap"
+	desc = "A cap fit for a commanding officer."
+	icon_state = "officercap"
+	item_state = "officercap"
+	armor = list(melee = 20, bullet = 15, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	strip_delay = 60
+
+/*
+-YOU HAVE SAFETLY PASSED THE POTENTIALLY-TRIGGERING CONTENT-
+-PLEASE RESUME NORMAL, POLITICALLY CORRECT ACTIVITY-
+*/

code/modules/clothing/under/miscellaneous.dm

@@ -574,3 +574,32 @@
 	item_state = "hostanclothes"
 	item_color = "hostanclothes"
 
+/*
+-!WARNING!-
+-POTENTIAL TRIGGER-INDUCING ITEMS AHEAD-
+-TREAD WITH CAUTION-
+*/
+
+/obj/item/clothing/under/wwii
+	name = "dusty uniform"
+	desc = "A dusty old uniform, a relic from a time before."
+	icon_state = "soldieruniform"
+	item_state = "soldieruniform"
+	item_color = "soldieruniform"
+	armor = list(melee = 10, bullet = 5, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	strip_delay = 50
+
+
+/obj/item/clothing/under/wwii/officer
+	name = "dusty uniform"
+	desc = "A dusty old uniform, a relic from a time before. This one looks more official."
+	icon_state = "officeruniform"
+	item_state = "officeruniform"
+	item_color = "officeruniform"
+	armor = list(melee = 15, bullet = 10, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
+	strip_delay = 60
+
+/*
+-YOU HAVE SAFETLY PASSED THE POTENTIALLY-TRIGGERING CONTENT-
+-PLEASE RESUME NORMAL, POLITICALLY CORRECT ACTIVITY-
+*/

code/modules/mining/mine_items.dm

@@ -458,6 +458,13 @@
 	max_n_of_items = 10
 	pixel_y = -4
 
+/obj/machinery/smartfridge/survival_pod/empty
+	name = "dusty survival pod storage"
+	desc = "A heated storage unit. This ones seen better days."
+
+/obj/machinery/smartfridge/survival_pod/empty/New()
+	return()
+
 /obj/machinery/smartfridge/survival_pod/accept_check(obj/item/O)
 	if(istype(O, /obj/item))
 		return 1

code/modules/mob/living/simple_animal/hostile/reenactors.dm

@@ -0,0 +1,103 @@
+/*
+-!WARNING!-
+-POTENTIAL TRIGGER-INDUCING ITEMS AHEAD-
+-TREAD WITH CAUTION-
+*/
+
+/mob/living/simple_animal/hostile/wwii
+	name = "World War II Reenactor"
+	desc = "A VERY enthusiastic WWII reenactor."
+	icon_state = "nsoldier"
+	icon_living = "nsoldier"
+	speak_chance = 0
+	turns_per_move = 5
+	response_help = "pokes"
+	response_disarm = "shoves"
+	response_harm = "hits"
+	speed = 0
+	stat_attack = 1
+	robust_searching = 1
+	maxHealth = 100
+	health = 100
+	harm_intent_damage = 10
+	melee_damage_lower = 10
+	melee_damage_upper = 15
+	attacktext = "punches"
+	attack_sound = 'sound/weapons/punch1.ogg'
+	a_intent = "harm"
+	loot = list(/obj/effect/mob_spawn/human/wwii)
+	atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
+	unsuitable_atmos_damage = 15
+	faction = list("german")
+	check_friendly_fire = 1
+	status_flags = CANPUSH
+	del_on_death = 1
+
+/mob/living/simple_animal/hostile/wwii/ranged
+	ranged = 1
+	rapid = 1
+	retreat_distance = 5
+	minimum_distance = 5
+	icon_state = "nsoldierranged"
+	icon_living = "nsoldierranged"
+	casingtype = /obj/item/ammo_casing/c45nostamina
+	projectilesound = 'sound/weapons/Gunshot_smg.ogg'
+
+/mob/living/simple_animal/hostile/wwii/melee
+	name = "Hulking World War II Reenactor"
+	icon_state = "nsoldierbuff"
+	icon_living = "nsoldierbuff"
+	stat_attack = 0
+	speed = 4
+	maxHealth = 200
+	health = 200
+	force_threshold = 10
+	harm_intent_damage = 25
+	melee_damage_lower = 25
+	melee_damage_upper = 30
+	environment_smash = 2
+	attacktext = "slams"
+	deathmessage = "The Reenactor's body collapses in on itself from the strain!"
+	loot = list(/obj/effect/gibspawner/human)
+
+/mob/living/simple_animal/hostile/wwii/melee/AttackingTarget()
+	..()
+	if(iscarbon(target))
+		var/mob/living/carbon/C = target
+		if(prob(40))
+			C.Weaken(3)
+			C.adjustBruteLoss(10)
+			C.visible_message("<span class='danger'>\The [src] smashes \the [C] into the ground!</span>", \
+					"<span class='userdanger'>\The [src] smashes you into the ground!</span>")
+			src.say(pick("RAAAAAGGHHHH!!!","AAAARRRGGHHHH!!!","RRRAAUUUGGHH!!!"))
+
+
+/mob/living/simple_animal/hostile/wwii/bomber
+	name = "Mini-Führer"
+	desc = "A small, robotic recreation of the Führer himself; it seems like he wants to tell you something."
+	icon_state = "miniheil"
+	icon_living = "miniheil"
+	speed = 1
+	maxHealth = 25
+	health = 25
+	harm_intent_damage = 5
+	melee_damage_lower = 5
+	melee_damage_upper = 7
+	attacktext = "heils"
+	deathmessage = "The Mini-Führer explodes!"
+	loot = list(/obj/effect/gibspawner/robot)
+
+/mob/living/simple_animal/hostile/wwii/bomber/AttackingTarget()
+	..()
+	if(iscarbon(target))
+		var/mob/living/carbon/C = target
+		if(prob(90))
+			C.Weaken(2)
+			src.say("HEIL HITLER!")
+			explosion(src, 0, 0, 2, 3, 2)
+			src.gib()
+
+/*
+-YOU HAVE SAFETLY PASSED THE POTENTIALLY-TRIGGERING CONTENT-
+-PLEASE RESUME NORMAL, POLITICALLY CORRECT ACTIVITY-
+*/