[MIRROR] Replaces unused xeno "weed extract" item in abandoned crates…

… with, well, weed [MDB IGNORE] (#25478) * Replaces unused xeno "weed extract" item in abandoned crates with, well, weed (#80157) Rather than granting you an otherwise-entirely unused "weed extract" item on a rare 1% roll, an abandoned crate will now give you a random assortment of cannabis seeds and samples. Getting an unusable do-nothing item as a reward is kinda lame, this is at least smokable. :cl: Melbert qol: Replaces unused xeno weed extract item in abandoned crates with a random assortment of cannabis. /:cl: * Replaces unused xeno "weed extract" item in abandoned crates with, well, weed * Merge --------- Co-authored-by: MrMelbert <[email protected]> Co-authored-by: Giz <[email protected]>
Fluffy-Frontier · Dec 7, 2023 · 169eefe · 169eefe
1 parent a7b5732
commit 169eefe
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
@@ -180,12 +180,6 @@ GLOBAL_LIST_INIT(carp_recipes, list ( \
 	icon = 'icons/mob/nonhuman-player/alien.dmi'
 	icon_state = "claw"
 
-/obj/item/weed_extract
-	name = "weed extract"
-	desc = "A piece of slimy, purplish weed."
-	icon = 'icons/mob/nonhuman-player/alien.dmi'
-	icon_state = "weed_extract"
-
 /*
  * Leather SHeet
  */

diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
@@ -210,7 +210,14 @@
 		if(85 to 86)
 			new /obj/item/defibrillator/compact(src)
 		if(87) //1% chance
-			new /obj/item/weed_extract(src)
+			var/list/cannabis_seeds = typesof(/obj/item/seeds/cannabis)
+			var/list/cannabis_plants = typesof(/obj/item/food/grown/cannabis)
+			for(var/i in 1 to rand(2, 4))
+				var/seed_type = pick(cannabis_seeds)
+				new seed_type(src)
+			for(var/i in 1 to rand(2, 4))
+				var/cannabis_type = pick(cannabis_plants)
+				new cannabis_type(src)
 		if(88)
 			new /obj/item/reagent_containers/cup/glass/bottle/lizardwine(src)
 		if(89)

diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
@@ -205,7 +205,11 @@
 	if(!ishuman(user))
 		return
 	var/mob/living/carbon/human/human_user = user
+<<<<<<< HEAD
 	if(human_user.dna.species.id == SPECIES_HUMAN && !HAS_MIND_TRAIT(human_user, TRAIT_MIMING))
+=======
+	if(!HAS_MIND_TRAIT(human_user, TRAIT_MIMING)) // SKYRAT EDIT CHANGE - Let other species gasp - ORIGINAL: if(human_user.dna.species.id == SPECIES_HUMAN && !HAS_MIND_TRAIT(human_user, TRAIT_MIMING))
+>>>>>>> 958f44f0 ([MIRROR] Replaces unused xeno "weed extract" item in abandoned crates with, well, weed [MDB IGNORE] (#25478))
 		if(human_user.physique == FEMALE)
 			return pick('sound/voice/human/gasp_female1.ogg', 'sound/voice/human/gasp_female2.ogg', 'sound/voice/human/gasp_female3.ogg')
 		else

diff --git a/icons/mob/nonhuman-player/alien.dmi b/icons/mob/nonhuman-player/alien.dmi