Merge branch 'master' into tinytweaks-2-9-20

code/__DEFINES/citadel_defines.dm

@@ -34,6 +34,7 @@
 #define CAN_MASTURBATE_WITH		(1<<5)
 #define MASTURBATE_LINKED_ORGAN	(1<<6) //used to pass our mission to the linked organ
 #define CAN_CLIMAX_WITH			(1<<7)
+#define GENITAL_CAN_AROUSE		(1<<8)
 
 #define COCK_SIZE_MIN		1
 #define COCK_SIZE_MAX		20

code/__DEFINES/maths.dm

@@ -199,4 +199,6 @@
 #define LORENTZ_CUMULATIVE_DISTRIBUTION(x, y, s) ( (1/PI)*TORADIANS(arctan((x-y)/s)) + 1/2 )
 
 #define RULE_OF_THREE(a, b, x) ((a*x)/b)
-// )
+// )
+
+#define MANHATTAN_DISTANCE(a, b) (abs(a.x - b.x) + abs(a.y - b.y))

code/__HELPERS/_cit_helpers.dm

@@ -57,14 +57,11 @@ GLOBAL_LIST_EMPTY(ipc_antennas_list)
 
 	//Genitals and Arousal Lists
 GLOBAL_LIST_EMPTY(genitals_list)
-GLOBAL_LIST_EMPTY(cock_shapes_list)//global_lists.dm for the list initializations //Now also _DATASTRUCTURES globals.dm
-GLOBAL_LIST_EMPTY(cock_shapes_icons) //Associated list for names->icon_states for cockshapes.
+GLOBAL_LIST_EMPTY(cock_shapes_list)
 GLOBAL_LIST_EMPTY(gentlemans_organ_names)
 GLOBAL_LIST_EMPTY(balls_shapes_list)
-GLOBAL_LIST_EMPTY(balls_shapes_icons)
 GLOBAL_LIST_EMPTY(breasts_size_list)
 GLOBAL_LIST_EMPTY(breasts_shapes_list)
-GLOBAL_LIST_EMPTY(breasts_shapes_icons)
 GLOBAL_LIST_EMPTY(vagina_shapes_list)
 GLOBAL_LIST_INIT(cum_into_containers_list, list(/obj/item/reagent_containers/food/snacks/pie)) //Yer fuggin snowflake name list jfc
 GLOBAL_LIST_INIT(dick_nouns, list("dick","cock","member","shaft"))

code/__HELPERS/global_lists.dm

@@ -51,26 +51,15 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/antenna, GLOB.ipc_antennas_list, roundstart = TRUE)
 	//genitals
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/penis, GLOB.cock_shapes_list)
-	for(var/K in GLOB.cock_shapes_list)
-		var/datum/sprite_accessory/penis/value = GLOB.cock_shapes_list[K]
-		GLOB.cock_shapes_icons[K] = value.icon_state
-
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/testicles, GLOB.balls_shapes_list)
 	GLOB.breasts_size_list = list ("a", "b", "c", "d", "e") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing.
 	GLOB.gentlemans_organ_names = list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ",
 	"cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret",
 	"baloney pony", "schlanger", "Mutton dagger", "old blind bob","Hanging Johnny", "fishing rod", "Tally whacker", "polly rocket",
 	"One eyed trouser trout", "Ding dong", "ankle spanker", "Pork sword", "engine cranker", "Harry hot dog", "Davy Crockett",
 	"Kidney cracker", "Heat seeking moisture missile", "Giggle stick", "love whistle", "Tube steak", "Uncle Dick", "Purple helmet warrior")
-	for(var/K in GLOB.breasts_shapes_list)
-		var/datum/sprite_accessory/breasts/value = GLOB.breasts_shapes_list[K]
-		GLOB.breasts_shapes_icons[K] = value.icon_state
-
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/testicles, GLOB.balls_shapes_list)
-	for(var/K in GLOB.balls_shapes_list)
-		var/datum/sprite_accessory/testicles/value = GLOB.balls_shapes_list[K]
-		GLOB.balls_shapes_icons[K] = value.icon_state
 
 	for(var/gpath in subtypesof(/obj/item/organ/genital))
 		var/obj/item/organ/genital/G = gpath

code/__HELPERS/vector.dm

@@ -0,0 +1,57 @@
+// Basic geometry things.
+
+/datum/vector/
+	var/x = 0
+	var/y = 0
+
+/datum/vector/New(var/x, var/y)
+	src.x = x
+	src.y = y
+
+/datum/vector/proc/duplicate()
+	return new /datum/vector(x, y)
+
+/datum/vector/proc/euclidian_norm()
+	return sqrt(x*x + y*y)
+
+/datum/vector/proc/squared_norm()
+	return x*x + y*y
+
+/datum/vector/proc/normalize()
+	var/norm = euclidian_norm()
+	x = x/norm
+	y = y/norm
+	return src
+
+/datum/vector/proc/chebyshev_norm()
+	return max(abs(x), abs(y))
+
+/datum/vector/proc/chebyshev_normalize()
+	var/norm = chebyshev_norm()
+	x = x/norm
+	y = y/norm
+	return src
+
+/datum/vector/proc/is_integer()
+	return ISINTEGER(x) && ISINTEGER(y)
+
+/atom/movable/proc/vector_translate(var/datum/vector/V, var/delay)
+	var/turf/T = get_turf(src)
+	var/turf/destination = locate(T.x + V.x, T.y + V.y, z)
+	var/datum/vector/V_norm = V.duplicate()
+	V_norm.chebyshev_normalize()
+	if (!V_norm.is_integer())
+		return
+	var/turf/destination_temp
+	while (destination_temp != destination)
+		destination_temp = locate(T.x + V_norm.x, T.y + V_norm.y, z)
+		forceMove(destination_temp)
+		T = get_turf(src)
+		sleep(delay + world.tick_lag) // Shortest possible time to sleep
+
+/atom/proc/get_translated_turf(var/datum/vector/V)
+	var/turf/T = get_turf(src)
+	return locate(T.x + V.x, T.y + V.y, z)
+
+/proc/atoms2vector(var/atom/A, var/atom/B)
+	return new /datum/vector((B.x - A.x), (B.y - A.y)) // Vector from A -> B

code/controllers/subsystem/ticker.dm

@@ -488,7 +488,7 @@ SUBSYSTEM_DEF(ticker)
 			if("SCORE")
 				SSvote.initiate_vote("map","server",hideresults=TRUE,votesystem = MAJORITY_JUDGEMENT_VOTING)
 		// fallback
-		SSvote.initiate_vote("map","server",hideresults=TRUE,votesystem = MAJORITY_JUDGEMENT_VOTING)
+		SSvote.initiate_vote("map","server",hideresults=TRUE)
 
 /datum/controller/subsystem/ticker/proc/HasRoundStarted()
 	return current_state >= GAME_STATE_PLAYING

code/datums/action.dm

@@ -820,3 +820,11 @@
 	target.layer = old_layer
 	target.plane = old_plane
 	current_button.appearance_cache = target.appearance
+
+/proc/get_action_of_type(mob/M, var/action_type)
+	if(!M.actions || !ispath(action_type, /datum/action))
+		return
+	for(var/datum/action/A in M.actions)
+		if(istype(A, action_type))
+			return A
+	return 

code/game/objects/items/devices/geiger_counter.dm

@@ -38,6 +38,7 @@
 
 /obj/item/geiger_counter/Destroy()
 	STOP_PROCESSING(SSobj, src)
+	QDEL_NULL(soundloop)
 	return ..()
 
 /obj/item/geiger_counter/process()

code/modules/antagonists/cult/ritual.dm

@@ -116,7 +116,7 @@ This file contains the cult dagger and rune list code
 	if(user.blood_volume)
 		user.apply_damage(initial(rune_to_scribe.scribe_damage), BRUTE, pick(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM))
 	var/scribe_mod = initial(rune_to_scribe.scribe_delay)
-	if(istype(get_turf(user), /turf/open/floor/engine/cult))
+	if(istype(get_turf(user), /turf/open/floor/engine/cult) && !(ispath(rune_to_scribe, /obj/effect/rune/narsie)))
 		scribe_mod *= 0.5
 	if(!do_after(user, scribe_mod, target = get_turf(user)))
 		for(var/V in shields)

code/modules/atmospherics/machinery/components/unary_devices/cryo.dm

@@ -251,6 +251,7 @@
 /obj/machinery/atmospherics/components/unary/cryo_cell/close_machine(mob/living/carbon/user)
 	if((isnull(user) || istype(user)) && state_open && !panel_open)
 		..(user)
+		reagent_transfer = 0
 		return occupant
 
 /obj/machinery/atmospherics/components/unary/cryo_cell/container_resist(mob/living/user)

code/modules/cargo/bounties/reagent.dm

@@ -105,6 +105,7 @@ datum/bounty/reagent/complex_drink/New()
 		/datum/reagent/consumable/ethanol/hearty_punch,\
 		/datum/reagent/consumable/ethanol/manhattan_proj,\
 		/datum/reagent/consumable/ethanol/narsour,\
+		/datum/reagent/consumable/ethanol/cogchamp,\
 		/datum/reagent/consumable/ethanol/neurotoxin,\
 		/datum/reagent/consumable/ethanol/patron,\
 		/datum/reagent/consumable/ethanol/quadruple_sec,\

code/modules/food_and_drinks/drinks/drinks.dm

@@ -107,9 +107,9 @@
 		smash(hit_atom, throwingdatum?.thrower, TRUE)
 
 /obj/item/reagent_containers/food/drinks/proc/smash(atom/target, mob/thrower, ranged = FALSE)
-	if(!isGlass)
+	if(!isGlass && !istype(src, /obj/item/reagent_containers/food/drinks/bottle)) //I don't like this but I also don't want to rework drink container hierarchy
 		return
-	if(QDELING(src) || !target)		//Invalid loc
+	if(QDELING(src) || (ranged && !target))
 		return
 	if(bartender_check(target) && ranged)
 		return
@@ -126,12 +126,69 @@
 		B.transform = M
 		B.pixel_x = rand(-12, 12)
 		B.pixel_y = rand(-12, 12)
-	if(prob(33))
-		new/obj/item/shard(drop_location())
-	playsound(src, "shatter", 70, 1)
+	if(isGlass)
+		playsound(src, "shatter", 70, 1)
+		if(prob(33))
+			new/obj/item/shard(drop_location())
+	else
+		B.force = 0
+		B.throwforce = 0
+		B.desc = "A carton with the bottom half burst open. Might give you a papercut."
 	transfer_fingerprints_to(B)
 	qdel(src)
 
+/obj/item/reagent_containers/food/drinks/MouseDrop(atom/over, atom/src_location, atom/over_location, src_control, over_control, params)
+	var/mob/user = usr
+	. = ..()
+	if (!istype(src_location) || !istype(over_location))
+		return
+	if (!user || user.incapacitated() || !user.Adjacent(src))
+		return
+	if (!(locate(/obj/structure/table) in src_location) || !(locate(/obj/structure/table) in over_location))
+		return
+		
+	//Are we an expert slider?
+	var/datum/action/innate/D = get_action_of_type(user, /datum/action/innate/drink_fling)
+	if(!D?.active)
+		if (!src_location.Adjacent(over_location)) // Regular users can only do short slides.
+			return
+		if (prob(10))
+			user.visible_message("<span class='warning'>\The [user] tries to slide \the [src] down the table, but fails miserably.</span>", "<span class='warning'>You <b>fail</b> to slide \the [src] down the table!</span>")
+			smash(over_location, user, FALSE)
+			return
+		user.visible_message("<span class='notice'>\The [user] slides \the [src] down the table.</span>", "<span class='notice'>You slide \the [src] down the table!</span>")
+		forceMove(over_location)
+		return
+	var/distance = MANHATTAN_DISTANCE(over_location, src)
+	if (distance >= 8 || distance == 0) // More than a full screen to go, or trying to slide to the same tile
+		return
+
+	// Geometrically checking if we're on a straight line.
+	var/datum/vector/V = atoms2vector(src, over_location)
+	var/datum/vector/V_norm = V.duplicate()
+	V_norm.normalize()
+	if (!V_norm.is_integer())
+		return // Only a cardinal vector (north, south, east, west) can pass this test
+
+	// Checks if there's tables on the path.
+	var/turf/dest = get_translated_turf(V)
+	var/turf/temp_turf = src_location
+
+	do
+		temp_turf = temp_turf.get_translated_turf(V_norm)
+		if (!locate(/obj/structure/table) in temp_turf)
+			var/datum/vector/V2 = atoms2vector(src, temp_turf)
+			vector_translate(V2, 0.1 SECONDS)
+			user.visible_message("<span class='warning'>\The [user] slides \the [src] down the table... and straight into the ground!</span>", "<span class='warning'>You slide \the [src] down the table, and straight into the ground!</span>")
+			smash(over_location, user, FALSE)
+			return
+	while (temp_turf != dest)
+
+	vector_translate(V, 0.1 SECONDS)
+	user.visible_message("<span class='notice'>\The [user] expertly slides \the [src] down the table.</span>", "<span class='notice'>You slide \the [src] down the table. What a pro.</span>")
+	return
+
+
 ////////////////////////////////////////////////////////////////////////////////
 /// Drinks. END
 ////////////////////////////////////////////////////////////////////////////////
@@ -294,28 +351,6 @@
 	icon_state = "juicebox"
 	volume = 15 //I figure if you have to craft these it should at least be slightly better than something you can get for free from a watercooler
 
-/obj/item/reagent_containers/food/drinks/sillycup/smallcarton/smash(atom/target, mob/thrower, ranged = FALSE)
-	if(bartender_check(target) && ranged)
-		return
-	var/obj/item/broken_bottle/B = new (loc)
-	B.icon_state = icon_state
-	var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)
-	I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1)
-	I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
-	B.icon = I
-	B.name = "broken [name]"
-	B.force = 0
-	B.throwforce = 0
-	B.desc = "A carton with the bottom half burst open. Might give you a papercut."
-	if(ranged)
-		var/matrix/M = matrix(B.transform)
-		M.Turn(rand(-170, 170))
-		B.transform = M
-		B.pixel_x = rand(-12, 12)
-		B.pixel_y = rand(-12, 12)
-	transfer_fingerprints_to(B)
-	qdel(src)
-
 /obj/item/reagent_containers/food/drinks/sillycup/smallcarton/on_reagent_change(changetype)
 	if (reagents.reagent_list.len)
 		switch(reagents.get_master_reagent_id())

code/modules/food_and_drinks/drinks/drinks/bottle.dm

@@ -16,40 +16,6 @@
 	isGlass = TRUE
 	foodtype = ALCOHOL
 
-
-/obj/item/reagent_containers/food/drinks/bottle/smash(mob/living/target, mob/thrower, ranged = FALSE)
-	//Creates a shattering noise and replaces the bottle with a broken_bottle
-	if(bartender_check(target) && ranged)
-		return
-	var/obj/item/broken_bottle/B = new (loc)
-	if(!ranged)
-		thrower.put_in_hands(B)
-	else
-		var/matrix/M = matrix(B.transform)
-		M.Turn(rand(-170, 170))
-		B.transform = M
-		B.pixel_x = rand(-12, 12)
-		B.pixel_y = rand(-12, 12)
-	B.icon_state = icon_state
-
-	var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)
-	I.Blend(B.broken_outline, ICON_OVERLAY, rand(5), 1)
-	I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
-	B.icon = I
-
-	if(isGlass)
-		if(prob(33))
-			new/obj/item/shard(drop_location())
-		playsound(src, "shatter", 70, 1)
-	else
-		B.force = 0
-		B.throwforce = 0
-		B.desc = "A carton with the bottom half burst open. Might give you a papercut."
-	B.name = "broken [name]"
-	transfer_fingerprints_to(B)
-
-	qdel(src)
-
 /obj/item/reagent_containers/food/drinks/bottle/attack(mob/living/target, mob/living/user)
 
 	if(!target)
@@ -109,7 +75,7 @@
 //Keeping this here for now, I'll ask if I should keep it here.
 /obj/item/broken_bottle
 	name = "broken bottle"
-	desc = "A bottle with a sharp broken bottom."
+	desc = "A shattered glass container with sharp edges."
 	icon = 'icons/obj/drinks.dmi'
 	icon_state = "broken_bottle"
 	force = 9

code/modules/food_and_drinks/recipes/drinks_recipes.dm

@@ -585,6 +585,14 @@
 	mix_message = "The mixture develops a sinister glow."
 	mix_sound = 'sound/effects/singlebeat.ogg'
 
+/datum/chemical_reaction/cogchamp
+	name = "CogChamp"
+	id = /datum/reagent/consumable/ethanol/cogchamp
+	results = list(/datum/reagent/consumable/ethanol/cogchamp = 3)
+	required_reagents = list(/datum/reagent/consumable/ethanol/cognac = 1, /datum/reagent/fuel = 1, /datum/reagent/consumable/ethanol/screwdrivercocktail = 1)
+	mix_message = "You hear faint sounds of gears turning as it mixes."
+	mix_sound = 'sound/effects/clockcult_gateway_closing.ogg'
+
 /datum/chemical_reaction/quadruplesec
 	name = "Quadruple Sec"
 	id = /datum/reagent/consumable/ethanol/quadruple_sec

code/modules/jobs/job_types/bartender.dm

@@ -28,3 +28,7 @@
 	backpack_contents = list(/obj/item/storage/box/beanbag=1,/obj/item/book/granter/action/drink_fling=1)
 	shoes = /obj/item/clothing/shoes/laceup
 
+/datum/job/bartender/after_spawn(mob/living/H, mob/M, latejoin = FALSE)
+	. = ..()
+	var/datum/action/innate/drink_fling/D = new
+	D.Grant(H)

code/modules/mining/mine_items.dm

@@ -93,7 +93,7 @@
 	req_access = list()
 	circuit = /obj/item/circuitboard/computer/mining_shuttle/common
 	shuttleId = "mining_common"
-	possible_destinations = "whiteship_home;lavaland_common_away;landing_zone_dock;mining_public"
+	possible_destinations = "lavaland_common_away;commonmining_home"
 
 /**********************Mining car (Crate like thing, not the rail car)**************************/
 

code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm

@@ -16,7 +16,7 @@
 	from doing this unless you absolutely know what you are doing, and have defined a
 	conversion in savefile.dm
 */
-/proc/init_sprite_accessory_subtypes(prototype, list/L, list/male, list/female,var/roundstart = FALSE)//Roundstart argument builds a specific list for roundstart parts where some parts may be locked
+/proc/init_sprite_accessory_subtypes(prototype, list/L, list/male, list/female, roundstart = FALSE, skip_prototype = TRUE)//Roundstart argument builds a specific list for roundstart parts where some parts may be locked
 	if(!istype(L))
 		L = list()
 	if(!istype(male))
@@ -25,7 +25,7 @@
 		female = list()
 
 	for(var/path in typesof(prototype))
-		if(path == prototype)
+		if(path == prototype && skip_prototype)
 			continue
 		if(roundstart)
 			var/datum/sprite_accessory/P = path

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

@@ -581,6 +581,9 @@ GLOBAL_LIST_INIT(ballmer_windows_me_msg, list("Yo man, what if, we like, uh, put
 	if(cultslurring)
 		cultslurring = max(cultslurring-1, 0)
 
+	if(clockcultslurring)
+		clockcultslurring = max(clockcultslurring-1, 0)
+
 	if(silent)
 		silent = max(silent-1, 0)
 

code/modules/mob/living/living_defines.dm

@@ -89,6 +89,7 @@
 	var/stuttering = 0
 	var/slurring = 0
 	var/cultslurring = 0
+	var/clockcultslurring = 0
 	var/derpspeech = 0
 
 	var/list/implants = null

code/modules/mob/living/say.dm

@@ -354,6 +354,9 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 
 	if(cultslurring)
 		message = cultslur(message)
+	
+	if(clockcultslurring)
+		message = CLOCK_CULT_SLUR(message)
 
 	message = capitalize(message)
 

code/modules/mob/living/silicon/pai/pai_defense.dm

@@ -1,3 +1,4 @@
+#define PAI_EMP_SILENCE_DURATION 3 MINUTES
 
 /mob/living/silicon/pai/blob_act(obj/structure/blob/B)
 	return FALSE
@@ -8,7 +9,7 @@
 		return
 	take_holo_damage(50/severity)
 	Knockdown(400/severity)
-	silent = max((3 MINUTES)/severity, silent)
+	silent = max(silent, (PAI_EMP_SILENCE_DURATION) / SSmobs.wait / severity)
 	if(holoform)
 		fold_in(force = TRUE)
 	emitter_next_use = world.time + emitter_emp_cd

code/modules/mob/mob_helpers.dm

@@ -147,6 +147,10 @@
 		. += newletter
 	return sanitize(.)
 
+//Ratvarian Slurring!
+
+#define CLOCK_CULT_SLUR(phrase) sanitize(text2ratvar(phrase))
+
 ///Adds stuttering to the message passed in
 /proc/stutter(phrase)
 	phrase = html_decode(phrase)
@@ -420,13 +424,10 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
 		return TRUE
 
 /mob/proc/getImplant(type)
-	if (!istype(src,/mob/living))
-		return
-	var/mob/living/L = src
-	for (var/I in L.implants)
-		if (istype(I,type))
-			return I
-	return null
+	return
+
+/mob/living/getImplant(type)
+	return locate(type) in implants
 
 /proc/canGhostWrite(var/mob/A, var/obj/target, var/desc="", var/allow_all=FALSE)
 	if(allow_all & TRUE)

code/modules/power/apc.dm

@@ -107,7 +107,7 @@
 	var/icon_update_needed = FALSE
 	var/obj/machinery/computer/apc_control/remote_control = null
 	var/mob/living/carbon/hijacker
-	var/hijackerlast = FALSE
+	var/hijackerlast = TRUE
 
 /obj/machinery/power/apc/unlocked
 	locked = FALSE
@@ -399,14 +399,14 @@
 	if (hijacker)
 		var/obj/item/implant/hijack/H = hijacker.getImplant(/obj/item/implant/hijack)
 		hijackerreturn = H && !H.stealthmode
-	if(last_update_state == update_state && last_update_overlay == update_overlay && hijackerreturn ? hijackerlast : !hijackerlast)
+	if(last_update_state == update_state && last_update_overlay == update_overlay && hijackerreturn == hijackerlast)
 		return 0
 	if(last_update_state != update_state)
 		results += 1
-	if(last_update_overlay != update_overlay || hijackerreturn ? !hijackerlast : hijackerlast)
+	if(last_update_overlay != update_overlay || hijackerreturn  != hijackerlast)
 		results += 2
-	if (hijackerreturn ? !hijackerlast : hijackerlast)
-		hijackerlast = hijackerreturn ? TRUE : FALSE
+	if (hijackerreturn  != hijackerlast)
+		hijackerlast = hijackerreturn
 	return results
 
 // Used in process so it doesn't update the icon too much

code/modules/projectiles/guns/energy.dm

@@ -150,7 +150,7 @@
 		if(istype(v, /obj/item/ammo_casing/energy))		//already set
 			ammo_type[v] = isnull(user_can_select)? TRUE : user_can_select
 		else
-			C = new v			//if you put non energycasing/type stuff in here you deserve the runtime
+			C = new v(src)			//if you put non energycasing/type stuff in here you deserve the runtime
 			ammo_type[i] = C
 			ammo_type[C] = isnull(user_can_select)? TRUE : user_can_select
 	set_firemode_index(initial(current_firemode_index))

code/modules/projectiles/projectile/bullets/shotgun.dm

@@ -61,7 +61,7 @@
 
 /obj/item/projectile/bullet/pellet/shotgun_buckshot
 	name = "buckshot pellet"
-	damage = 10
+	damage = 12.5
 
 /obj/item/projectile/bullet/pellet/shotgun_rubbershot
 	name = "rubbershot pellet"

code/modules/reagents/chemistry/reagents/alcohol_reagents.dm

@@ -1513,6 +1513,23 @@ All effects don't start immediately, but rather get worse over time; the rate is
 	M.stuttering = min(M.stuttering + 3, 3)
 	..()
 
+/datum/reagent/consumable/ethanol/cogchamp
+	name = "CogChamp"
+	description = "Now you can fill yourself with the power of Ratvar!"
+	color = rgb(255, 201, 49)
+	boozepwr = 10
+	quality = DRINK_FANTASTIC
+	taste_description = "a brass taste with a hint of oil"
+	glass_icon_state = "cogchamp"
+	glass_name = "CogChamp"
+	glass_desc = "Not even Ratvar's Four Generals could withstand this!  Qevax Jryy!"
+	value = 8.13
+
+/datum/reagent/consumable/ethanol/cogchamp/on_mob_life(mob/living/carbon/M)
+	M.clockcultslurring = min(M.clockcultslurring + 3, 3)
+	M.stuttering = min(M.stuttering + 3, 3)
+	..()
+
 /datum/reagent/consumable/ethanol/triple_sec
 	name = "Triple Sec"
 	description = "A sweet and vibrant orange liqueur."

code/modules/reagents/reagent_containers.dm

@@ -105,11 +105,11 @@
 /obj/item/reagent_containers/proc/bartender_check(atom/target)
 	. = FALSE
 	var/turf/T = get_turf(src)
-	if(!T || target.CanPass(src, T) || !thrownby || !thrownby.actions)
+	if(!T || !target.CanPass(src, T) || !thrownby || !thrownby.actions)
 		return
-	for(var/datum/action/innate/drink_fling/D in thrownby.actions)
-		if(D.active)
-			return TRUE
+	var/datum/action/innate/D = get_action_of_type(thrownby, /datum/action/innate/drink_fling)
+	if(D?.active)
+		return TRUE
 
 /obj/item/reagent_containers/proc/ForceResetRotation()
 	transform = initial(transform)
@@ -131,13 +131,14 @@
 		if(thrownby)
 			log_combat(thrownby, M, "splashed", R)
 		reagents.reaction(target, TOUCH)
-
+		
 	else if(bartender_check(target) && thrown)
 		visible_message("<span class='notice'>[src] lands onto the [target.name] without spilling a single drop.</span>")
 		transform = initial(transform)
 		addtimer(CALLBACK(src, .proc/ForceResetRotation), 1)
 		return
 
+
 	else
 		if(isturf(target) && reagents.reagent_list.len && thrownby)
 			log_combat(thrownby, target, "splashed (thrown) [english_list(reagents.reagent_list)]", "in [AREACOORD(target)]")

code/modules/reagents/reagent_containers/hypospray.dm

@@ -423,9 +423,9 @@
 		else
 			unload_hypo(vial,user)
 
-/obj/item/hypospray/mkii/AltClick(mob/living/user)
+/obj/item/hypospray/mkii/CtrlClick(mob/living/user)
 	. = ..()
-	if(user.canUseTopic(src, FALSE))
+	if(user.canUseTopic(src, FALSE) && user.get_active_held_item(src))
 		switch(mode)
 			if(HYPO_SPRAY)
 				mode = HYPO_INJECT
@@ -437,7 +437,7 @@
 
 /obj/item/hypospray/mkii/examine(mob/user)
 	. = ..()
-	. += "<span class='notice'><b>Alt-Click</b> it to toggle its mode from spraying to injecting and vice versa.</span>"
+	. += "<span class='notice'><b>Ctrl-Click</b> it to toggle its mode from spraying to injecting and vice versa.</span>"
 
 #undef HYPO_SPRAY
 #undef HYPO_INJECT