Merge pull request #1149 from Sharkmare/master

Adds Sharkpile prototype + 939

code/game/objects/structures/trash_pile_vr_ch.dm

@@ -0,0 +1,59 @@
+//Snowflake customizable trashpules, these can be map eddited to be unique TM or you can just make new sub objects that change the vars -shark
+//They are called sharkpiles because i cant think of another name, but do feel free to make them actually spawn sharks.
+/obj/structure/trash_pile/sharkpile
+	var/destroychance = 0 //People too used to static pilespawns? Add randomness to it.
+
+	//Lists use better weights that add together so in the below example the sum of weight sis 6 so a 3 is 50% and a 1 is 16%
+	var/overridechancealpha = 90 //how likely the piles is to give its unique objects for alpha spawns
+	var/list/alphapicks = list(
+		/obj/item/weapon/storage/pill_bottle/happy = 1,
+		/obj/item/weapon/storage/pill_bottle/zoom = 2,
+		/obj/item/weapon/storage/pill_bottle/paracetamol = 3,
+	) //override pick list alpha
+
+	var/overridechancebeta = 90 //how likely the piles is to give its unique objects for beta spawns
+	var/list/betapicks = list(
+		/obj/item/weapon/storage/pill_bottle/happy = 3,
+		/obj/item/weapon/storage/pill_bottle/zoom = 2,
+		/obj/item/weapon/storage/pill_bottle/paracetamol = 1,
+	) //override pick list beta
+
+	var/overridechancegamma = 90 //how likely the piles is to give its unique objects for gamma spawns
+	var/list/gammapicks = list(
+		/obj/item/weapon/storage/pill_bottle/happy = 3,
+		/obj/item/weapon/storage/pill_bottle/zoom = 2,
+		/obj/item/weapon/storage/pill_bottle/paracetamol = 1,
+	) //override pick list gamma
+	
+	var/gammaunique = 1
+	
+
+	Initialize()
+		..()
+		if(prob(destroychance))
+			qdel(src)
+
+//^X% chance to use our own list, otherwise default pool.
+//Here we could also add a % chance to spawn a mob for trash pandas or such,
+	produce_alpha_item()
+		if(prob(overridechancealpha))
+			var/path = pick(alphapicks)
+			var/obj/item/I = new path()
+			return I
+		return ..()
+
+	produce_beta_item()
+		if(prob(overridechancebeta))
+			var/path = pick(betapicks)
+			var/obj/item/I = new path()
+			return I
+		return ..()
+
+	produce_gamma_item()
+		if(prob(overridechancegamma)&& gammaunique!=2)
+			var/path = pick(gammapicks)
+			var/obj/item/I = new path()
+			if(gammaunique!=0)
+				gammaunique++
+			return I
+		return ..()

code/modules/mob/living/simple_animal/aliens/synx.dm

@@ -796,12 +796,12 @@
 		prob(50);/mob/living/simple_mob/animal/synx/ai,) //normal eel boyo.
 
 ////////////////////////////////////////////////////////////////////////////
-//////////////////////////NOT A SYNX///////but looks kinda like one/////////
+//////////////////////////NOT A SYNX///////but acts kinda like one/////////
 ////////////////////////////////////////////////////////////////////////////
 /*
 Content relating to the SCP Foundation, including the SCP Foundation logo, is licensed under
 Creative Commons Sharealike 3.0 and all concepts originate from http://www.scp-wiki.net and its authors.
-This includes the sprites of the below Mob which are based upon SCP 939 and sprited by Riviera (not added yet)
+This includes the sprites of the below Mob which are based upon SCP 939.
 */
 //SCP-939
 //sprites to be made.
@@ -828,12 +828,15 @@ This includes the sprites of the below Mob which are based upon SCP 939 and spri
 	name = "Unknown"
 	desc = "It's a red canine looking creature."
 	tt_desc = "Unknown Alien Lifeform"
+	
+	poison_chance = 0 //no poison, 
 	ai_holder_type = /datum/ai_holder/simple_mob/scp
 	say_list_type = /datum/say_list/malf_drone
 
-	//icon_state = "scp_living"
+	icon = 'icons/mob/synxmanyvoices.dmi'
-	//icon_living = "scp_living"
+	icon_state = "939_living"
-	//icon_dead = "scp_dead"
+	icon_living = "939_living"
+	icon_dead = "939_dead"
 
 #undef SYNX_LOWER_DAMAGE
-#undef SYNX_UPPER_DAMAGE
+#undef SYNX_UPPER_DAMAGE

vorestation.dme

@@ -1517,6 +1517,7 @@
 #include "code\game\objects\structures\target_stake.dm"
 #include "code\game\objects\structures\transit_tubes.dm"
 #include "code\game\objects\structures\trash_pile_vr.dm"
+#include "code\game\objects\structures\trash_pile_vr_ch.dm"
 #include "code\game\objects\structures\under_wardrobe.dm"
 #include "code\game\objects\structures\watercloset.dm"
 #include "code\game\objects\structures\windoor_assembly.dm"