Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit

modular_citadel/code/_onclick/other_mobs.dm

@@ -9,21 +9,43 @@
 	return TRUE
 
 /mob/living/carbon/human/AltRangedAttack(atom/A, params)
+	if(isturf(A) || incapacitated()) // pretty annoying to wave your fist at floors and walls. And useless.
+		return TRUE
+	changeNext_move(CLICK_CD_RANGE)
+	var/list/target_viewers = viewers(11, A) //Byond proc, doesn't check for blindness.
+	if(!(src in target_viewers)) //click catcher issuing calls for out of view objects.
+		return TRUE
 	if(!has_active_hand())
 		to_chat(src, "<span class='notice'>You ponder your life choices and sigh.</span>")
 		return TRUE
+	var/list/src_viewers = get_hearers_in_view(DEFAULT_MESSAGE_RANGE, src) - src // src has a different message.
+	var/the_action = "waves to [A]"
+	var/what_action = "waves to something you can't see"
+	var/self_action = "wave to [A]"
 
-	if(!incapacitated())
-		switch(a_intent)
-			if(INTENT_HELP)
-				visible_message("<span class='notice'>[src] waves to [A].</span>", "<span class='notice'>You wave to [A].</span>")
-			if(INTENT_DISARM)
-				visible_message("<span class='notice'>[src] shoos away [A].</span>", "<span class='notice'>You shoo away [A].</span>")
-			if(INTENT_GRAB)
-				visible_message("<span class='notice'>[src] beckons [A] to come.</span>", "<span class='notice'>You beckon [A] to come.</span>") //This sounds lewder than it actually is. Fuck.
-			if(INTENT_HARM)
-				visible_message("<span class='notice'>[src] shakes [p_their()] fist at [A].</span>", "<span class='notice'>You shake your fist at [A].</span>")
-		return TRUE
+	switch(a_intent)
+		if(INTENT_DISARM)
+			the_action = "shoos away [A]"
+			what_action = "shoo away something you can't see"
+			self_action = "shoo away [A]"
+		if(INTENT_GRAB)
+			the_action = "beckons [A] to come"
+			what_action = "beckons something you can't see to come"
+			self_action = "beckon [A] to come"
+		if(INTENT_HARM)
+			var/pronoun = "[p_their()]"
+			the_action = "shakes [pronoun] fist at [A]"
+			what_action = "shakes [pronoun] fist at something you can't see"
+			self_action = "shake your fist at [A]"
+
+	if(!eye_blind)
+		to_chat(src, "You [self_action].")
+	for(var/B in src_viewers)
+		var/mob/M = B
+		if(!M.eye_blind)
+			var/message = (M in target_viewers) ? the_action : what_action
+			to_chat(M, "[src] [message].")
+	return TRUE
 
 /atom/proc/alt_attack_hand(mob/user)
 	return FALSE

modular_citadel/code/modules/client/loadout/backpack.dm

@@ -115,4 +115,17 @@
 	name = "A fancy pen"
 	category = SLOT_IN_BACKPACK
 	path = /obj/item/pen/fountain
-	cost = 2
+	cost = 2
+
+/datum/gear/modular_tablet
+	name = "A modular tablet"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/modular_computer/tablet/preset/cheap/
+	cost = 4
+
+/datum/gear/modular_laptop
+	name = "A modular laptop"
+	category = SLOT_IN_BACKPACK
+	path = /obj/item/modular_computer/laptop/preset/civilian
+	cost = 7
+	

modular_citadel/code/modules/client/loadout/uniform.dm

@@ -424,3 +424,38 @@
 	path = /obj/item/clothing/under/stripper_green
 	cost = 3
 
+/datum/gear/qipao
+	name = "Qipao, Black"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/lunar/qipao
+	cost = 3
+
+/datum/gear/qipao/white
+	name = "Qipao, White"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/lunar/qipao/white
+	cost = 3
+
+/datum/gear/qipao/red
+	name = "Qipao, Red"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/lunar/qipao/red
+	cost = 3
+
+/datum/gear/cheongsam
+	name = "Cheongsam, Black"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/lunar/cheongsam
+	cost = 3
+
+/datum/gear/cheongsam/white
+	name = "Cheongsam, White"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/lunar/cheongsam/white
+	cost = 3
+
+/datum/gear/cheongsam/red
+	name = "Cheongsam, Red"
+	category = SLOT_W_UNIFORM
+	path = /obj/item/clothing/under/lunar/cheongsam/red
+	cost = 3

modular_citadel/code/modules/projectiles/guns/ballistic/spinfusor.dm

@@ -65,18 +65,4 @@
 	icon_state = "spinfusorbox"
 	ammo_type = /obj/item/ammo_casing/caseless/spinfusor
 	w_class = WEIGHT_CLASS_NORMAL
-	max_ammo = 4
-
-/datum/supply_pack/security/armory/spinfusor
-	name = "Stormhammer Spinfusor Crate"
-	cost = 14000
-	contains = list(/obj/item/gun/ballistic/automatic/spinfusor,
-					/obj/item/gun/ballistic/automatic/spinfusor)
-	crate_name = "spinfusor crate"
-
-/datum/supply_pack/security/armory/spinfusorammo
-	name = "Spinfusor Disk Crate"
-	cost = 7000
-	contains = list(/obj/item/ammo_box/aspinfusor,
-					/obj/item/ammo_box/aspinfusor)
-	crate_name = "spinfusor disk crate"
+	max_ammo = 4

modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm

@@ -200,8 +200,10 @@
 	FermiExplode 			= TRUE
 	PurityMin 				= 0.1
 
-/datum/chemical_reaction/fermi/breast_enlarger/FermiFinish(datum/reagents/holder, var/atom/my_atom)
+/datum/chemical_reaction/fermi/breast_enlarger/FermiFinish(datum/reagents/holder, atom/my_atom)
 	var/datum/reagent/fermi/breast_enlarger/BE = locate(/datum/reagent/fermi/breast_enlarger) in my_atom.reagents.reagent_list
+	if(!BE)
+		return
 	var/cached_volume = BE.volume
 	if(BE.purity < 0.35)
 		holder.remove_reagent(type, cached_volume)
@@ -249,8 +251,10 @@
 	P.length = ((PE.volume * PE.purity) / 10)//half as effective.
 	my_atom.reagents.clear_reagents()
 
-/datum/chemical_reaction/fermi/penis_enlarger/FermiFinish(datum/reagents/holder, var/atom/my_atom)
+/datum/chemical_reaction/fermi/penis_enlarger/FermiFinish(datum/reagents/holder, atom/my_atom)
 	var/datum/reagent/fermi/penis_enlarger/PE = locate(/datum/reagent/fermi/penis_enlarger) in my_atom.reagents.reagent_list
+	if(!PE)
+		return
 	var/cached_volume = PE.volume
 	if(PE.purity < 0.35)
 		holder.remove_reagent(type, cached_volume)
@@ -306,13 +310,11 @@
 /datum/chemical_reaction/fermi/enthrall/FermiFinish(datum/reagents/holder, var/atom/my_atom)
 	var/datum/reagent/blood/B = locate(/datum/reagent/blood) in my_atom.reagents.reagent_list
 	var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in my_atom.reagents.reagent_list
-	if(!B)
+	if(!B || !E)
 		return
 	if(!B.data)
-		var/list/seen = viewers(5, get_turf(my_atom))
-		for(var/mob/M in seen)
-			to_chat(M, "<span class='warning'>The reaction splutters and fails to react properly.</span>") //Just in case
-			E.purity = 0
+		my_atom.visible_message("<span class='warning'>The reaction splutters and fails to react properly.</span>") //Just in case
+		E.purity = 0
 	if (B.data["gender"] == "female")
 		E.data["creatorGender"] = "Mistress"
 		E.creatorGender = "Mistress"
@@ -332,11 +334,11 @@
 /datum/chemical_reaction/fermi/enthrall/slime/FermiFinish(datum/reagents/holder, var/atom/my_atom)
 	var/datum/reagent/blood/jellyblood/B = locate(/datum/reagent/blood/jellyblood) in my_atom.reagents.reagent_list//The one line change.
 	var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in my_atom.reagents.reagent_list
+	if(!B || !E)
+		return
 	if(!B.data)
-		var/list/seen = viewers(5, get_turf(my_atom))
-		for(var/mob/M in seen)
-			to_chat(M, "<span class='warning'>The reaction splutters and fails to react.</span>") //Just in case
-			E.purity = 0
+		my_atom.visible_message("<span class='warning'>The reaction splutters and fails to react properly.</span>") //Just in case
+		E.purity = 0
 	if (B.data["gender"] == "female")
 		E.data["creatorGender"] = "Mistress"
 		E.creatorGender = "Mistress"
@@ -466,9 +468,9 @@
 
 
 /datum/chemical_reaction/fermi/acidic_buffer/FermiFinish(datum/reagents/holder, var/atom/my_atom) //might need this
-	if(!locate(/datum/reagent/fermi/acidic_buffer) in my_atom.reagents.reagent_list)
-		return
 	var/datum/reagent/fermi/acidic_buffer/Fa = locate(/datum/reagent/fermi/acidic_buffer) in my_atom.reagents.reagent_list
+	if(!Fa)
+		return
 	Fa.data = 0.1//setting it to 0 means byond thinks it's not there.
 
 /datum/chemical_reaction/fermi/basic_buffer//done test
@@ -493,10 +495,10 @@
 	FermiChem 		= TRUE
 
 
-/datum/chemical_reaction/fermi/basic_buffer/FermiFinish(datum/reagents/holder, var/atom/my_atom) //might need this
-	if(!locate(/datum/reagent/fermi/basic_buffer) in my_atom.reagents.reagent_list)
-		return
+/datum/chemical_reaction/fermi/basic_buffer/FermiFinish(datum/reagents/holder, atom/my_atom) //might need this
 	var/datum/reagent/fermi/basic_buffer/Fb = locate(/datum/reagent/fermi/basic_buffer) in my_atom.reagents.reagent_list
+	if(!Fb)
+		return
 	Fb.data = 14
 
 //secretcatchemcode, shh!! Of couse I hide it amongst cats. Though, I moved it with your requests.