Grenade icon states + pearl random locs and description + more

Author: ProfessorPopoff

mojave/code/datums/diseases/pocklung.dm

@@ -1,3 +1,10 @@
+/// POCKLUNG DISEASE ///
+/* This is highly schizophrenic. The in-world reason this exists? Something about mutant bacteria that lives within the sulfur vents below. Cope about it... Wear a mask
+
+Has quirky effects with no cure. Wear a mask.
+
+Occasionally, a chosen one is born... They will adapt to it and "recover" Benefits? not really. Though they'll cough up a little 'pearl' occasionally (kind of often depending on the person tbh) */
+
 /datum/disease/pocklung
 	name = "Pocklung"
 	desc = "A bacterial/chemically induced condition in which the victim's lungs are degraded by a mixture of sulfur concentrate and the bacteria that has found a home within it."
@@ -8,7 +15,7 @@
 	spread_flags = NONE
 	cure_text = "Incurable"
 	form = "Condition"
-	agent = "decay nodes"
+	agent = "bacteria"
 	sicktext = "Your chest begins to ache and burn horribly."
 	viable_mobtypes = list(/mob/living/carbon/human)
 	required_organs = list(/obj/item/organ/lungs)
@@ -50,8 +57,10 @@
 					affected_mob.vomit(25, TRUE, TRUE, 1)
 					affected_mob.visible_message(span_alert("[affected_mob] vomits something up amidst their coughing!"),
 						span_userdanger("Through the coughs, you gag up a prize!"),
-						span_hear("You hear something drop to the floor quietly."), 4)
-					new /obj/item/ms13/component/sulfurpearl (affected_mob.loc, rand(1, (infection_purity)))
+						span_hear("You hear vomiting, followed by spitting- then, something dropping to the floor quietly."), 4)
+					var/obj/item/ms13/component/sulfurpearl/P = new /obj/item/ms13/component/sulfurpearl (affected_mob.loc, rand(1, (infection_purity)))
+					P.pixel_x = P.base_pixel_x + rand(-12, 12)
+					P.pixel_y = P.base_pixel_y + rand(-12, 12)
 				my_turf.VapourTurf(/datum/vapours/sulfur_concentrate, 10)
 			if(DT_PROB(1, delta_time))
 				affected_mob.adjustOrganLoss(ORGAN_SLOT_LUNGS, (0.25 / infection_purity), 100)
@@ -64,8 +73,10 @@
 					affected_mob.vomit(25, TRUE, TRUE, 1)
 					affected_mob.visible_message(span_alert("[affected_mob] vomits something up amidst their coughing!"),
 						span_userdanger("Through the coughs, you puke up a prize!"),
-						span_hear("You hear something drop to the floor quietly."), 4)
-					new /obj/item/ms13/component/sulfurpearl (affected_mob.loc, rand(1, (infection_purity)))
+						span_hear("You hear vomiting, followed by spitting- then, something dropping to the floor quietly."), 4)
+					var/obj/item/ms13/component/sulfurpearl/P = new /obj/item/ms13/component/sulfurpearl (affected_mob.loc, rand(1, (infection_purity)))
+					P.pixel_x = P.base_pixel_x + rand(-12, 12)
+					P.pixel_y = P.base_pixel_y + rand(-12, 12)
 				my_turf.VapourTurf(/datum/vapours/sulfur_concentrate, 15)
 
 /datum/disease/pocklung/update_stage(new_stage)

mojave/code/modules/vapour/ms_vapours.dm

@@ -49,14 +49,6 @@
 /datum/vapours/sulfur_concentrate/TouchAct(mob/living/carbon/victim, amount) // Disabled for now. Keep it to yo lungs.
 	. = ..()
 
- //if(iscarbon(burn_living))
- //       var/mob/living/carbon/burn_carbon = burn_living
- //       var/obj/item/clothing/burn_suit = burn_carbon.get_item_by_slot(ITEM_SLOT_OCLOTHING)
- //       var/obj/item/clothing/burn_helmet = burn_carbon.get_item_by_slot(ITEM_SLOT_HEAD)
- //       var/obj/item/clothing/burn_helmet = burn_carbon.get_item_by_slot(ITEM_SLOT_HEAD)
- //       if(burn_suit?.clothing_flags & LAVAPROTECT && burn_helmet?.clothing_flags & LAVAPROTECT)
- //           return LAVA_BE_PROCESSING
-
 	for(var/obj/item/clothing/C in victim.get_equipped_items())
 		if(((C.body_parts_covered & HANDS) && (C.body_parts_covered & ARMS) && (C.body_parts_covered & LEGS) && (C.body_parts_covered & LEGS) && (C.body_parts_covered & HEAD))) //Cover up head to toe!
 			return

mojave/code/modules/vapour/vapour_types_datum.dm

@@ -19,6 +19,8 @@
 	var/scent
 	/// Use this to avoid spamming screens with messages!
 	COOLDOWN_DECLARE(agony_announcement)
+	/// Used to ensure that deliberately harmful stuff outside sticks around a little longer
+	var/dissipation_resistance
 
 ///When a vapour touches an unprotected carbon mob
 /datum/vapours/proc/TouchAct(mob/living/carbon/victim, amount)

mojave/icons/objects/ammo/ammo_inventory.dmi

@@ -7,7 +7,7 @@
 
 /obj/item/ammo_casing/ms13/a40mm/scrap
 	name = "40mm scrap shell"
-	desc = "A makeshift high-caliber shotgun shell, designed to go in... grenade launchers! Quality control is obviosuly dubious. Good luck."
+	desc = "A makeshift high-caliber shotgun shell, designed to go in... grenade launchers! Quality control is obviously dubious. Good luck."
 	icon_state = "40mm_scrap"
 	projectile_type = /obj/projectile/bullet/ms13/a40mm/scrap
 

mojave/icons/objects/ammo/ammo_world.dmi

@@ -6,7 +6,7 @@
 	internal_magazine = TRUE
 	w_class = WEIGHT_CLASS_HUGE
 	weapon_weight = WEAPON_HEAVY
-	slot_flags = ITEM_SLOT_BACK
+	slot_flags = null
 	mag_type = /obj/item/ammo_box/magazine/internal/ms13/m79
 	bolt_wording = "chamber"
 	rack_sound = 'mojave/sound/ms13weapons/breakaction_open2.ogg'