More teargas stuff

cmss13-devs · Jan 11, 2025 · 04b326c · 04b326c
1 parent 30a18aa
commit 04b326c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/code/game/objects/effects/effect_system/smoke.dm b/code/game/objects/effects/effect_system/smoke.dm
@@ -511,7 +511,7 @@
 	color = "#a82620" // rgb: 179, 16, 8
 	alpha = 75
 	opacity = FALSE
-	time_to_live = 60
+	time_to_live = 180
 
 /obj/effect/particle_effect/smoke/tear/Move()
 	. = ..()
@@ -534,11 +534,10 @@
 	else
 		to_chat(creature, SPAN_WARNING("You're feel the sting of the tear gas!"))
 		creature.AdjustEyeBlur(25)
+		creature.AdjustEyeBlind(10)
 
 	creature.emote("scream")
-	creature.AdjustEyeBlind(10)
-	creature.apply_effect(3, STUN)
-	creature.apply_effect(3, WEAKEN)
+	creature.apply_effect(3, SLOW)
 
 //////////////////////////////////////
 // FLASHBANG SMOKE

diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm
@@ -949,8 +949,9 @@
 
 /obj/item/explosive/grenade/tear/prime()
 	playsound(src.loc, 'sound/effects/smoke.ogg', 25, 1, 4)
-	tear_gas.set_up(tear_gas_radius, 0, get_turf(src), null, 6)
+	tear_gas.set_up(tear_gas_radius, 0, get_turf(src), null, 90)
 	tear_gas.start()
+	new /obj/item/trash/teargasgrenade(get_turf(src))
 	qdel(src)
 
 /*

diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
@@ -205,3 +205,9 @@
 	w_class = SIZE_SMALL
 	throw_speed = SPEED_VERY_FAST
 	throw_range = 5
+
+/obj/item/trash/teargasgrenade
+	name = "spent Tear Gas grenade"
+	desc = "A used canister grenade of nonlethal Tear gas. This is trash."
+	icon = 'icons/obj/items/weapons/grenade.dmi'
+	icon_state = "flashbang2_spent"
diff --git a/icons/obj/items/weapons/grenade.dmi b/icons/obj/items/weapons/grenade.dmi