Drugs: Rabbit Edition

_maps/RandomRuins/IceRuins/icemoon_tesla_lab.dmm

@@ -5252,10 +5252,6 @@
 	pixel_x = 11;
 	pixel_y = -10
 	},
-/obj/item/reagent_containers/syringe/contraband/bath_salts{
-	pixel_y = 13;
-	pixel_x = 6
-	},
 /obj/item/reagent_containers/hypospray/medipen/survival{
 	pixel_y = -12;
 	pixel_x = -4
@@ -5264,6 +5260,10 @@
 	pixel_x = -7;
 	pixel_y = 9
 	},
+/obj/item/reagent_containers/syringe/contraband/mammoth{
+	pixel_y = 11;
+	pixel_x = 5
+	},
 /turf/open/floor/plasteel/white,
 /area/ruin/icemoon/tesla_lab/medbay)
 "vj" = (

_maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm

@@ -2844,16 +2844,16 @@
 	dir = 8
 	},
 /obj/structure/closet/wall/directional/west,
-/obj/item/reagent_containers/syringe/contraband/bath_salts{
-	pixel_y = 6;
-	pixel_x = -4
-	},
 /obj/item/restraints/handcuffs/cable/white,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/chem_pile,
 /obj/effect/decal/cleanable/blood/drip,
 /obj/effect/decal/cleanable/plastic,
 /obj/effect/decal/cleanable/glass,
+/obj/item/reagent_containers/syringe/contraband/mammoth{
+	pixel_y = 11;
+	pixel_x = 5
+	},
 /turf/open/floor/wood{
 	icon_state = "wood-broken2"
 	},

code/__DEFINES/is_helpers.dm

@@ -74,7 +74,7 @@ GLOBAL_LIST_INIT(turfs_without_ground, typecacheof(list(
 #define iszombie(A) (is_species(A, /datum/species/zombie))
 #define isskeleton(A) (is_species(A, /datum/species/skeleton))
 #define ismoth(A) (is_species(A, /datum/species/moth))
-#define ishumanbasic(A) (is_species(A, /datum/species/human) && !is_species(A, /datum/species/human/krokodil_addict))
+#define ishumanbasic(A) (is_species(A, /datum/species/human))
 #define iselzuose(A) (is_species(A, /datum/species/elzuose))
 #define isvampire(A) (is_species(A,/datum/species/vampire))
 #define isdullahan(A) (is_species(A, /datum/species/dullahan))

code/__DEFINES/lighting.dm

@@ -48,6 +48,7 @@
 
 #define LIGHTING_PLANE_ALPHA_VISIBLE 255
 #define LIGHTING_PLANE_ALPHA_NV_TRAIT 245
+#define LIGHTING_PLANE_ALPHA_NV_DRUG 225
 #define LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE 192
 /// For lighting alpha, small amounts lead to big changes. even at 128 its hard to figure out what is dark and what is light, at 64 you almost can't even tell.
 #define LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE 128

code/__DEFINES/mobs.dm

@@ -105,7 +105,6 @@
 #define SPECIES_VAMPIRE "vampire"
 #define SPECIES_VOX "vox"
 #define SPECIES_ZOMBIE "zombie"
-#define SPECIES_GOOFZOMBIE "krokodil_zombie"
 #define SPECIES_XENOMORPH "xenomorph"
 
 #define DIGITIGRADE_NEVER 0

code/__DEFINES/status_effects.dm

@@ -138,6 +138,7 @@
 // Grouped effect sources, see also code/__DEFINES/traits.dm
 
 #define STASIS_MACHINE_EFFECT "stasis_machine"
+#define STASIS_DRUG_EFFECT "stasis_drug"
 
 // Stasis helpers
 

code/__DEFINES/traits.dm

@@ -341,6 +341,10 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
 #define TRAIT_BADTOUCH "bad_touch"
 #define TRAIT_ANXIOUS "anxious"
 #define TRAIT_ANALGESIA "congenital_analgesia"
+#define TRAIT_CLOUDED "clouded_eyes"
+#define TRAIT_PINPOINT_EYES "pinpoint_eyes"
+#define TRAIT_CHEMICAL_NIGHTVISION "chemical_nightvision"
+#define TRAIT_GOOD_CHEMICAL_NIGHTVISION "good_chemical_nightvision"
 
 /// Trait granted by lipstick
 #define LIPSTICK_TRAIT "lipstick_trait"

code/_globalvars/traits.dm

@@ -149,7 +149,11 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_ANXIOUS" = TRAIT_ANXIOUS,
 		"TRAIT_KISS_OF_DEATH" = TRAIT_KISS_OF_DEATH,
 		"TRAIT_PLANT_SAFE" = TRAIT_PLANT_SAFE,
-		"TRAIT_AIMING" = TRAIT_AIMING
+		"TRAIT_AIMING" = TRAIT_AIMING,
+		"TRAIT_CLOUDED" = TRAIT_CLOUDED,
+		"TRAIT_PINPOINT_EYES" = TRAIT_PINPOINT_EYES,
+		"TRAIT_CHEMICAL_NIGHT_VISION" = TRAIT_CHEMICAL_NIGHTVISION,
+		"TRAIT_GOOD_CHEMICAL_NIGHT_VISION" = TRAIT_GOOD_CHEMICAL_NIGHTVISION,
 	),
 	/obj/item/bodypart = list(
 		"TRAIT_PARALYSIS" = TRAIT_PARALYSIS

code/datums/brain_damage/special.dm

@@ -203,7 +203,7 @@
 
 /datum/brain_trauma/special/psychotic_brawling
 	name = "Violent Psychosis"
-	desc = "Patient fights in unpredictable ways, ranging from helping his target to hitting them with brutal strength."
+	desc = "Patient fights in unpredictable ways due to re-arranged neural pathways."
 	scan_desc = "violent psychosis"
 	gain_text = "<span class='warning'>You feel unhinged...</span>"
 	lose_text = "<span class='notice'>You feel more balanced.</span>"
@@ -221,7 +221,7 @@
 	psychotic_brawling.remove(owner)
 	QDEL_NULL(psychotic_brawling)
 
-/datum/brain_trauma/special/psychotic_brawling/bath_salts
+/datum/brain_trauma/special/psychotic_brawling/mammoth
 	name = "Chemical Violent Psychosis"
 
 /datum/brain_trauma/special/tenacity

code/datums/martial/psychotic_brawl.dm

@@ -15,13 +15,6 @@
 	var/atk_verb
 	switch(rand(1,8))
 		if(1)
-			D.help_shake_act(A)
-			atk_verb = "helped"
-		if(2)
-			A.emote("cry")
-			A.Stun(20)
-			atk_verb = "cried looking at"
-		if(3)
 			if(A.grab_state >= GRAB_AGGRESSIVE)
 				D.grabbedby(A, 1)
 			else
@@ -38,7 +31,7 @@
 					else
 						log_combat(A, D, "grabbed", addition="passively")
 						A.setGrabState(GRAB_PASSIVE)
-		if(4)
+		if(2)
 			A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 			atk_verb = "headbutt"
 			D.visible_message("<span class='danger'>[A] [atk_verb]s [D]!</span>", \
@@ -51,7 +44,7 @@
 				D.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5)
 			A.Stun(rand(10,45))
 			D.Stun(rand(5,30))
-		if(5,6)
+		if(3,4)
 			A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 			atk_verb = pick("kick", "hit", "slam")
 			D.visible_message("<span class='danger'>[A] [atk_verb]s [D] with such inhuman strength that it sends [D.p_them()] flying backwards!</span>", \
@@ -62,7 +55,7 @@
 			var/throwtarget = get_edge_target_turf(A, get_dir(A, get_step_away(D, A)))
 			D.throw_at(throwtarget, 4, 2, A)//So stuff gets tossed around at the same time.
 			D.Paralyze(60)
-		if(7,8)
+		else
 			return FALSE //Resume default behaviour
 
 	if(atk_verb)

code/datums/traits/negative.dm

@@ -515,7 +515,7 @@
 	gain_text = "<span class='danger'>You suddenly feel the craving for drugs.</span>"
 	lose_text = "<span class='notice'>You feel like you should kick your drug habit.</span>"
 	medical_record_text = "Patient has a history of hard drugs."
-	var/drug_list = list(/datum/reagent/drug/crank, /datum/reagent/drug/krokodil, /datum/reagent/medicine/morphine, /datum/reagent/drug/happiness, /datum/reagent/drug/methamphetamine) //List of possible IDs
+	var/drug_list = list(/datum/reagent/drug/crank, /datum/reagent/medicine/morphine, /datum/reagent/drug/happiness, /datum/reagent/drug/methamphetamine) //List of possible IDs
 	var/datum/reagent/reagent_type //!If this is defined, reagent_id will be unused and the defined reagent type will be instead.
 	var/datum/reagent/reagent_instance //! actual instanced version of the reagent
 	var/where_drug //! Where the drug spawned

code/game/objects/effects/spawners/random/exotic.dm

@@ -33,10 +33,9 @@
 		/obj/item/lighter = 3,
 		/obj/item/storage/box/matches = 3,
 		/obj/item/reagent_containers/syringe/contraband/space_drugs = 1,
-		/obj/item/reagent_containers/syringe/contraband/krokodil = 1,
 		/obj/item/reagent_containers/syringe/contraband/crank = 1,
 		/obj/item/reagent_containers/syringe/contraband/methamphetamine = 1,
-		/obj/item/reagent_containers/syringe/contraband/bath_salts = 1,
+		/obj/item/reagent_containers/syringe/contraband/mammoth = 1,
 		/obj/item/reagent_containers/syringe/contraband/fentanyl = 1,
 		/obj/item/reagent_containers/syringe/contraband/morphine = 1,
 		/obj/item/storage/pill_bottle/happy = 1,

code/game/objects/items/cigs_lighters.dm

@@ -341,7 +341,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 
 /obj/item/clothing/mask/cigarette/xeno
 	desc = "A Xeno Filtered brand cigarette."
-	list_reagents = list (/datum/reagent/drug/nicotine = 20, /datum/reagent/medicine/regen_jelly = 15, /datum/reagent/drug/krokodil = 4)
+	list_reagents = list (/datum/reagent/drug/nicotine = 20, /datum/reagent/medicine/regen_jelly = 15)
 
 // Rollies.
 

code/game/objects/items/clown_items.dm

@@ -84,7 +84,7 @@
 /obj/item/paper/fluff/stations/soap
 	name = "ancient janitorial poem"
 	desc = "An old paper that has passed many hands."
-	default_raw_text = "The legend of the omega soap</B><BR><BR> Essence of <B>potato</B>. Juice, not grind.<BR><BR> A <B>cactus</B> brew, fermented into <B>wine</B>.<BR><BR> <B>powder of monkey</B>, to help the workload.<BR><BR> Some <B>Krokodil</B>, because meth would explode.<BR><BR> <B>Nitric acid</B> and <B>Baldium</B>, for organic dissolving.<BR><BR> A cup filled with <B>Hooch</B>, for sinful absolving<BR><BR> Some <B>Bluespace Dust</B>, for removal of stains.<BR><BR> A syringe full of <B>Pump-up</B>, it's security's bane.<BR><BR> Add a can of <B>Space Cola</B>, because we've been paid.<BR><BR> <B>Heat</B> as hot as you can, let the soap be your blade.<BR><BR> <B>Ten units of each regent create a soap that could topple all others.</B>"
+	default_raw_text = "The legend of the omega soap</B><BR><BR> Essence of <B>potato</B>. Juice, not grind.<BR><BR> A <B>cactus</B> brew, fermented into <B>wine</B>.<BR><BR> <B>powder of monkey</B>, to help the workload.<BR><BR> <B>Nitric acid</B> and <B>Baldium</B>, for organic dissolving.<BR><BR> A cup filled with <B>Hooch</B>, for sinful absolving<BR><BR> Some <B>Bluespace Dust</B>, for removal of stains.<BR><BR> A syringe full of <B>Pump-up</B>, it's security's bane.<BR><BR> Add a can of <B>Space Cola</B>, because we've been paid.<BR><BR> <B>Heat</B> as hot as you can, let the soap be your blade.<BR><BR> <B>Ten units of each regent create a soap that could topple all others.</B>"
 
 /obj/item/soap/proc/decreaseUses(mob/user)
 	var/skillcheck = user.mind.get_skill_modifier(/datum/skill/cleaning, SKILL_SPEED_MODIFIER)

code/game/objects/items/melee/sword.dm

@@ -289,7 +289,7 @@
 		/datum/reagent/drug/space_drugs = 10,
 		/datum/reagent/drug/crank = 5,
 		/datum/reagent/drug/methamphetamine = 5,
-		/datum/reagent/drug/bath_salts = 5,
+		/datum/reagent/drug/mammoth = 5,
 		/datum/reagent/drug/aranesp = 5,
 		/datum/reagent/drug/pumpup = 10,
 		/datum/reagent/medicine/omnizine = 10,

code/game/objects/items/storage/firstaid.dm

@@ -485,8 +485,16 @@
 /obj/item/storage/pill_bottle/finobranc
 	name = "bottle of finobranc tablets"
 	desc = "Party in the Solar Cantons, tonight."
-	custom_price = 50
 
 /obj/item/storage/pill_bottle/finobranc/PopulateContents()
 	for(var/i in 1 to 7)
 		new /obj/item/reagent_containers/pill/finobranc(src)
+
+/obj/item/storage/pill_bottle/stardrop
+	name = "bottle of stardrop capsules"
+	desc = "Contains vision-enhancing pills."
+	custom_price = 300
+
+/obj/item/storage/pill_bottle/stardrop/PopulateContents()
+	for(var/i in 1 to 7)
+		new /obj/item/reagent_containers/pill/stardrop(src)

code/modules/cargo/blackmarket/blackmarket_items/consumables.dm

@@ -293,6 +293,26 @@
 	availability_prob = 25
 	spawn_weighting = FALSE
 
+/datum/blackmarket_item/consumable/mammoth
+	name = "Mammoth Injector"
+	desc = "Found a bunch of kickass injectors hiding under the corpse of a Cliquer. Don't ask bout how they became a corpse Iunno. Doesn't matter. These things boost your strength and keep you going way too damn long..."
+	item = /obj/item/reagent_containers/hypospray/medipen/mammoth
+	price_min = 500
+	price_max = 1000
+	stock_max = 6
+	availability_prob = 40
+	spawn_weighting = FALSE
+
+/datum/blackmarket_item/consumable/rabbit
+	name = "Rabbit Injector"
+	desc = "We were bummin around towards CLIP space the other day, and saw this. Ahem. Business opportunity with a bun. Words came to words and after some serious business planning, I'm the distributer for this line for this line of designer injectors. Supposed to make you like a rabbit or somethin."
+	item = /obj/item/reagent_containers/hypospray/medipen/rabbit
+	price_min = 600
+	price_max = 800
+	stock_max = 6
+	availability_prob = 30
+	spawn_weighting = FALSE
+
 /datum/blackmarket_item/consumable/finobranc
 	name = "Finobranc Tablets"
 	desc = "So get this, I know a Solarian Tgirl over the intranet, and we're chatting, and she sends me these things to try. I figure, hell yeah, try them, and got 5 days work done in one day. Now I'm sellin them. Miracle product I tell ya"

code/modules/cargo/bounties/reagent.dm

@@ -143,7 +143,6 @@
 		/datum/reagent/medicine/pen_acid,\
 		/datum/reagent/medicine/atropine,\
 		/datum/reagent/drug/aranesp,\
-		/datum/reagent/drug/krokodil,\
 		/datum/reagent/drug/methamphetamine,\
 		/datum/reagent/teslium,\
 		/datum/reagent/toxin/anacea,\
@@ -166,7 +165,7 @@
 		/datum/reagent/medicine/pyroxadone,\
 		/datum/reagent/medicine/rezadone,\
 		/datum/reagent/medicine/regen_jelly,\
-		/datum/reagent/drug/bath_salts,\
+		/datum/reagent/drug/mammoth,\
 		/datum/reagent/hair_dye,\
 		/datum/reagent/consumable/honey,\
 		/datum/reagent/consumable/frostoil,\

code/modules/cargo/packs/medical.dm

@@ -277,6 +277,15 @@
 	)
 	crate_name = "atropine vial crate"
 
+/datum/supply_pack/medical/vials/stas_vial
+	name = "Stasis Vial Crate"
+	desc = "Contains a spare stasis vial, for usage in a Hypospray."
+	cost = 800
+	contains = list(
+		/obj/item/reagent_containers/glass/bottle/vial/small/preloaded/stasis,
+	)
+	crate_name = "stasis vial crate"
+
 /datum/supply_pack/medical/vials/erp_vial
 	name = "Radiation Purgant Vial Crate"
 	desc = "Contains 2 spare radiation purgant vials, for usage in a Hypospray."

code/modules/food_and_drinks/food/snacks_pastry.dm

@@ -68,7 +68,7 @@
 
 /obj/item/reagent_containers/food/snacks/donut/chaos/Initialize()
 	. = ..()
-	extra_reagent = pick(/datum/reagent/consumable/nutriment, /datum/reagent/consumable/capsaicin, /datum/reagent/consumable/frostoil, /datum/reagent/drug/krokodil, /datum/reagent/toxin/plasma, /datum/reagent/consumable/coco, /datum/reagent/toxin/slimejelly, /datum/reagent/consumable/banana, /datum/reagent/consumable/berryjuice, /datum/reagent/medicine/omnizine)
+	extra_reagent = pick(/datum/reagent/consumable/nutriment, /datum/reagent/consumable/capsaicin, /datum/reagent/consumable/frostoil, /datum/reagent/toxin/plasma, /datum/reagent/consumable/coco, /datum/reagent/toxin/slimejelly, /datum/reagent/consumable/banana, /datum/reagent/consumable/berryjuice, /datum/reagent/medicine/omnizine)
 	reagents.add_reagent(extra_reagent, 3)
 
 /obj/item/reagent_containers/food/snacks/donut/meat

code/modules/hydroponics/grown/cannabis.dm

@@ -70,9 +70,8 @@
 						/datum/reagent/lithium = 0.15,
 						/datum/reagent/medicine/atropine = 0.15,
 						/datum/reagent/drug/methamphetamine = 0.15,
-						/datum/reagent/drug/bath_salts = 0.15,
+						/datum/reagent/drug/mammoth = 0.15,
 						/datum/reagent/drug/crank = 0.15,
-						/datum/reagent/drug/krokodil = 0.15,
 						/datum/reagent/toxin/lipolicide = 0.15,
 						/datum/reagent/drug/nicotine = 0.1)
 	rarity = 69

code/modules/mob/living/carbon/carbon.dm

@@ -582,10 +582,21 @@
 		if(!isnull(G.lighting_alpha))
 			lighting_alpha = min(lighting_alpha, G.lighting_alpha)
 
+	if(HAS_TRAIT(src, TRAIT_NIGHT_VISION))
+		lighting_alpha = min(lighting_alpha, LIGHTING_PLANE_ALPHA_NV_TRAIT)
+
+	if(HAS_TRAIT(src, TRAIT_CHEMICAL_NIGHTVISION))
+		lighting_alpha = min(lighting_alpha, LIGHTING_PLANE_ALPHA_NV_DRUG)
+		see_in_dark = max(see_in_dark, 4)
+
 	if(HAS_TRAIT(src, TRAIT_THERMAL_VISION))
 		sight |= (SEE_MOBS)
 		lighting_alpha = min(lighting_alpha, LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE)
 
+	if(HAS_TRAIT(src, TRAIT_GOOD_CHEMICAL_NIGHTVISION))
+		lighting_alpha = min(lighting_alpha, LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE)
+		see_in_dark = max(see_in_dark, 6)
+
 	if(HAS_TRAIT(src, TRAIT_XRAY_VISION))
 		sight |= (SEE_TURFS|SEE_MOBS|SEE_OBJS)
 		see_in_dark = max(see_in_dark, 8)

code/modules/mob/living/carbon/human/examine.dm

@@ -100,6 +100,10 @@
 	if(!(ITEM_SLOT_EYES in obscured))
 		if(glasses)
 			. += "[t_He] [t_has] [glasses.get_examine_string(user)] covering [t_his] eyes."
+		else if(HAS_TRAIT(src, TRAIT_CLOUDED))
+			. += span_notice("[t_His] eyes are clouded in silver.")
+		else if(HAS_TRAIT(src, TRAIT_PINPOINT_EYES))
+			. += span_warning("[t_His] pupils have diliated to pinpricks.")
 
 	//ears
 	if(ears && !(ITEM_SLOT_EARS in obscured))

code/modules/mob/living/carbon/human/human.dm

@@ -1368,9 +1368,6 @@
 /mob/living/carbon/human/species/zombie/infectious
 	race = /datum/species/zombie/infectious
 
-/mob/living/carbon/human/species/zombie/krokodil_addict
-	race = /datum/species/human/krokodil_addict
-
 /mob/living/carbon/human/species/ipc
 	race = /datum/species/ipc
 

code/modules/mob/living/carbon/human/species_types/zombies.dm

@@ -86,21 +86,4 @@
 		infection = new()
 		infection.Insert(C)
 
-// Your skin falls off
-/datum/species/human/krokodil_addict
-	name = "\improper Human"
-	id = SPECIES_GOOFZOMBIE
-	examine_limb_id = SPECIES_HUMAN
-	sexes = 0
-	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie
-	mutanttongue = /obj/item/organ/tongue/zombie
-	changesource_flags = MIRROR_BADMIN | WABBAJACK | ERT_SPAWN
-
-	species_chest = /obj/item/bodypart/chest/zombie
-	species_head = /obj/item/bodypart/head/zombie
-	species_l_arm = /obj/item/bodypart/l_arm/zombie
-	species_r_arm = /obj/item/bodypart/r_arm/zombie
-	species_l_leg = /obj/item/bodypart/leg/left/zombie
-	species_r_leg = /obj/item/bodypart/leg/right/zombie
-
 #undef REGENERATION_DELAY