Merge pull request #12954 from MMMiracles/spookycaves

New Away Mission: Caves

code/modules/awaymissions/corpse.dm

@@ -309,3 +309,32 @@
 	if(ghost_role == "No")
 		return
 	createCorpse(death = src.death, ckey = user.ckey)
+
+/////////////////Spooky Undead//////////////////////
+
+/obj/effect/landmark/corpse/skeleton
+	name = "skeletal remains"
+	mobname = "skeleton"
+	mob_species = "skeleton"
+	mobgender = NEUTER
+
+
+/obj/effect/landmark/corpse/skeleton/alive
+	death = FALSE
+	roundstart = FALSE
+	icon = 'icons/effects/blood.dmi'
+	icon_state = "remains"
+	flavour_text = "By unknown powers, your skeletal remains have been reanimated! Walk this mortal plain and terrorize all living adventurers who dare cross your path."
+
+
+/obj/effect/landmark/corpse/zombie
+	name = "rotting corpse"
+	mobname = "zombie"
+	mob_species = "zombie"
+
+/obj/effect/landmark/corpse/zombie/alive
+	death = FALSE
+	roundstart = FALSE
+	icon = 'icons/effects/blood.dmi'
+	icon_state = "remains"
+	flavour_text = "By unknown powers, your rotting remains have been resurrected! Walk this mortal plain and terrorize all living adventurers who dare cross your path."

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

@@ -0,0 +1,38 @@
+/mob/living/simple_animal/hostile/skeleton
+	name = "reanimated skeleton"
+	desc = "A real bonefied skeleton, doesn't seem like it wants to socialize."
+	icon = 'icons/mob/human.dmi'
+	icon_state = "skeleton_s"
+	icon_living = "skeleton_s"
+	icon_dead = "skeleton_dead"
+	turns_per_move = 5
+	speak_emote = list("rattles")
+	emote_see = list("rattles")
+	a_intent = "harm"
+	maxHealth = 40
+	health = 40
+	speed = 1
+	harm_intent_damage = 5
+	melee_damage_lower = 15
+	melee_damage_upper = 15
+	attacktext = "slashes"
+	attack_sound = 'sound/hallucinations/growl1.ogg'
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	unsuitable_atmos_damage = 10
+	environment_smash = 1
+	robust_searching = 1
+	stat_attack = 1
+	gold_core_spawnable = 1
+	faction = list("skeleton")
+	see_invisible = SEE_INVISIBLE_MINIMUM
+	see_in_dark = 8
+	layer = MOB_LAYER - 0.1
+	var/remains = /obj/effect/decal/remains/human
+
+/mob/living/simple_animal/hostile/skeleton/death(gibbed)
+	..(gibbed)
+	if(remains)
+		new remains (src.loc)
+	visible_message("<span class='danger'>The skeleton falls apart!</span>")
+	qdel(src)
+	return

code/modules/mob/living/simple_animal/spawner.dm

@@ -44,8 +44,6 @@
 	L.faction = src.faction
 	visible_message("<span class='danger'>[L] [spawn_text] [src].</span>")
 
-
-
 /mob/living/simple_animal/hostile/spawner/syndicate
 	name = "warp beacon"
 	icon = 'icons/obj/device.dmi'
@@ -54,4 +52,51 @@
 	mob_type = /mob/living/simple_animal/hostile/syndicate/ranged
 	faction = list("syndicate")
 
+/mob/living/simple_animal/hostile/spawner/skeleton
+	name = "bone pit"
+	desc = "A pit full of bones, some still seem to be moving.."
+	icon_state = "hole"
+	icon_living = "hole"
+	icon = 'icons/mob/nest.dmi'
+	health = 150
+	maxHealth = 150
+	max_mobs = 15
+	spawn_time = 150
+	mob_type = /mob/living/simple_animal/hostile/skeleton
+	spawn_text = "climbs out of"
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	faction = list("skeleton")
 
+/mob/living/simple_animal/hostile/spawner/mining
+	name = "monster den"
+	desc = "A hole dug into the ground, harboring all kinds of monsters found within most caves or mining asteroids."
+	icon_state = "hole"
+	icon_living = "hole"
+	health = 200
+	maxHealth = 200
+	max_mobs = 3
+	icon = 'icons/mob/nest.dmi'
+	spawn_text = "crawls out of"
+	mob_type = /mob/living/simple_animal/hostile/asteroid/goldgrub
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	faction = list("mining")
+
+/mob/living/simple_animal/hostile/spawner/mining/goliath
+	name = "goliath den"
+	desc = "A den housing a nest of goliaths, oh god why?"
+	mob_type = /mob/living/simple_animal/hostile/asteroid/goliath
+
+/mob/living/simple_animal/hostile/spawner/mining/hivelord
+	name = "hivelord den"
+	desc = "A den housing a nest of hivelords."
+	mob_type = /mob/living/simple_animal/hostile/asteroid/hivelord
+
+/mob/living/simple_animal/hostile/spawner/mining/basilisk
+	name = "basilisk den"
+	desc = "A den housing a nest of basilisks, bring a coat."
+	mob_type = /mob/living/simple_animal/hostile/asteroid/basilisk
+
+/mob/living/simple_animal/hostile/spawner/mining/wumborian
+	name = "wumborian fugu den"
+	desc = "A den housing a nest of wumborian fugus, how do they all even fit in there?"
+	mob_type = /mob/living/simple_animal/hostile/asteroid/fugu

code/modules/projectiles/guns/energy/laser.dm

@@ -34,6 +34,18 @@
 	var/charge_tick = 0
 	ammo_x_offset = 3
 
+/obj/item/weapon/gun/energy/laser/captain/scattershot
+	name = "scatter shot laser rifle"
+	icon_state = "lasercannon"
+	item_state = "laser"
+	desc = "An industrial-grade heavy-duty laser rifle with a modified laser lense to scatter its shot into multiple smaller lasers. The inner-core can self-charge for theorically infinite use."
+	origin_tech = "combat=5;materials=4;powerstorage=4"
+	ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/laser/scatter)
+
+/obj/item/weapon/gun/energy/laser/captain/scattershot/attack_self(mob/living/user as mob)
+	select_fire(user)
+	update_icon()
+
 /obj/item/weapon/gun/energy/laser/captain/New()
 	..()
 	SSobj.processing |= src