Merge branch 'master' of https://github.com/tgstation/TerraGov-Marine…

…-Corps

code/__DEFINES/dcs/signals.dm

@@ -198,8 +198,6 @@
 	#define EXAMINE_POSITION_BEFORE (1<<1)
 	//End positions
 	#define COMPONENT_EXNAME_CHANGED (1<<0)
-///from base of atom/specialclick(): (/mob/living/carbon/user)
-#define COMSIG_ATOM_SPECIALCLICK "atom_specialclick"
 ///from base of atom/get_mechanics_info(): (/mob)
 #define COMSIG_ATOM_GET_MECHANICS_INFO "atom_mechanics_info"
 	#define COMPONENT_MECHANICS_CHANGE (1<<0)
@@ -660,7 +658,6 @@
 #define COMSIG_KB_CARBON_SELECTDISARMINTENT_DOWN "keybinding_carbon_selectdisarmintent_down"
 #define COMSIG_KB_CARBON_SELECTGRABINTENT_DOWN "keybinding_carbon_selectgrabintent_down"
 #define COMSIG_KB_CARBON_SELECTHARMINTENT_DOWN "keybinding_carbon_selectharmintent_down"
-#define COMSIG_KB_CARBON_SPECIALCLICK_DOWN "keybinding_carbon_specialclick_down"
 #define COMSIG_KB_CLIENT_GETHELP_DOWN "keybinding_client_gethelp_down"
 #define COMSIG_KB_CLIENT_SCREENSHOT_DOWN "keybinding_client_screenshot_down"
 #define COMSIG_KB_CLIENT_MINIMALHUD_DOWN "keybinding_client_minimalhud_down"

code/__DEFINES/loadout.dm

@@ -307,7 +307,7 @@ GLOBAL_LIST_INIT(marine_clothes_listed_products, list(
 		/obj/item/storage/pouch/magazine/large = list(CAT_POU, "Magazine pouch", 0, "black"),
 		/obj/item/storage/holster/flarepouch/full = list(CAT_POU, "Flare pouch", 0, "orange"),
 		/obj/item/storage/pouch/medkit/firstaid = list(CAT_POU, "First aid pouch", 0,"orange"),
-		/obj/item/storage/pouch/medical_injectors/firstaid = list(CAT_POU, "Combat injector pouch", 0,"orange"),
+		/obj/item/storage/pouch/medical_injectors/standard = list(CAT_POU, "Combat injector pouch", 0,"orange"),
 		/obj/item/storage/pouch/tools/full = list(CAT_POU, "Tool pouch (tools included)", 0,"black"),
 		/obj/item/storage/pouch/grenade/slightlyfull = list(CAT_POU, "Grenade pouch (grenades included)", 0,"black"),
 		/obj/item/storage/pouch/construction/full = list(CAT_POU, "Construction pouch (materials included)", 0,"black"),
@@ -384,7 +384,7 @@ GLOBAL_LIST_INIT(engineer_clothes_listed_products, list(
 		/obj/item/storage/pouch/general/medium = list(CAT_POU, "Medium general pouch", 0, "black"),
 		/obj/item/storage/holster/flarepouch/full = list(CAT_POU, "Flare pouch", 0, "black"),
 		/obj/item/storage/pouch/medkit/firstaid = list(CAT_POU, "First aid pouch", 0, "orange"),
-		/obj/item/storage/pouch/medical_injectors/firstaid = list(CAT_POU, "Combat injector pouch", 0, "orange"),
+		/obj/item/storage/pouch/medical_injectors/standard = list(CAT_POU, "Combat injector pouch", 0, "orange"),
 		/obj/item/storage/pouch/magazine/pistol/large = list(CAT_POU, "Pistol magazine pouch", 0, "black"),
 		/obj/item/storage/pouch/pistol = list(CAT_POU, "Sidearm pouch", 0, "black"),
 		/obj/effect/vendor_bundle/mimir = list(CAT_ARMMOD, "Mark 1 Mimir Resistance set", 0,"black"),
@@ -495,7 +495,7 @@ GLOBAL_LIST_INIT(smartgunner_clothes_listed_products, list(
 		/obj/item/storage/pouch/magazine/large = list(CAT_POU, "Magazine pouch", 0, "black"),
 		/obj/item/storage/pouch/general/medium = list(CAT_POU, "Medium general pouch", 0, "black"),
 		/obj/item/storage/holster/flarepouch/full = list(CAT_POU, "Flare pouch", 0, "orange"),
-		/obj/item/storage/pouch/medical_injectors/firstaid = list(CAT_POU, "Combat injector pouch", 0,"orange"),
+		/obj/item/storage/pouch/medical_injectors/standard = list(CAT_POU, "Combat injector pouch", 0,"orange"),
 		/obj/item/storage/pouch/medkit/firstaid = list(CAT_POU, "First aid pouch", 0, "orange"),
 		/obj/item/storage/pouch/magazine/pistol/large = list(CAT_POU, "Pistol magazine pouch", 0, "black"),
 		/obj/item/storage/pouch/pistol = list(CAT_POU, "Sidearm pouch", 0, "black"),
@@ -555,7 +555,7 @@ GLOBAL_LIST_INIT(leader_clothes_listed_products, list(
 		/obj/item/storage/pouch/general/large = list(CAT_POU, "General pouch", 0, "black"),
 		/obj/item/storage/pouch/magazine/large = list(CAT_POU, "Magazine pouch", 0, "black"),
 		/obj/item/storage/holster/flarepouch/full = list(CAT_POU, "Flare pouch", 0, "black"),
-		/obj/item/storage/pouch/medical_injectors/firstaid = list(CAT_POU, "Combat injector pouch", 0,"orange"),
+		/obj/item/storage/pouch/medical_injectors/standard = list(CAT_POU, "Combat injector pouch", 0,"orange"),
 		/obj/item/storage/pouch/medkit/firstaid = list(CAT_POU, "First aid pouch", 0, "orange"),
 		/obj/item/storage/pouch/tools/full = list(CAT_POU, "Tool pouch (tools included)", 0, "black"),
 		/obj/item/storage/pouch/grenade/slightlyfull = list(CAT_POU, "Grenade pouch (grenades included)", 0,"black"),

code/_onclick/click.dm

@@ -337,12 +337,12 @@
 	return ..()
 
 /mob/living/carbon/xenomorph/RightClickOn(atom/target)
-	. = ..()
 	if(selected_ability) //If we have a selected ability that we can use, return TRUE
 		target = ability_target(target)
 		if(selected_ability.can_use_ability(target))
 			selected_ability.use_ability(target)
 			return !CHECK_BITFIELD(selected_ability.use_state_flags, ABILITY_DO_AFTER_ATTACK)
+	return ..()
 
 ///Called when a owner mob CTRL + Rightmouseclicks an atom
 /mob/proc/CtrlRightClickOn(atom/target, params)
@@ -431,12 +431,12 @@ if(selected_ability.target_flags & flagname && !istype(target, typepath)){\
 	return target
 
 /mob/living/carbon/xenomorph/MiddleClickOn(atom/target)
-	. = ..()
 	if(!(client.prefs.toggles_gameplay & MIDDLESHIFTCLICKING) || !selected_ability)
 		return FALSE
 	target = ability_target(target)
 	if(selected_ability.can_use_ability(target))
 		selected_ability.use_ability(target)
+	return ..()
 
 ///Called when a owner mob CTRL + Middlemouseclicks an atom
 /mob/proc/CtrlMiddleClickOn(atom/target, params)
@@ -533,6 +533,10 @@ if(selected_ability.target_flags & flagname && !istype(target, typepath)){\
 			return FALSE
 		if(COMSIG_MOB_CLICK_HANDLED)
 			return TRUE
+
+	if(examinate(target))
+		return
+
 	return target.ShiftClick(src)
 
 ///Called when a mob SHIFT + Leftmouseclicks this atom

code/_onclick/hud/fullscreen.dm

@@ -71,7 +71,7 @@
 
 
 /atom/movable/screen/fullscreen
-	icon = 'icons/mob/screen/full.dmi'
+	icon = 'icons/mob/screen/full/misc.dmi'
 	icon_state = "default"
 	screen_loc = "CENTER-7,CENTER-7"
 	layer = FULLSCREEN_LAYER
@@ -100,30 +100,34 @@
 	icon_state = "blackimageoverlay" //mostly just a black square, you can change this if you get better ideas
 	layer = FULLSCREEN_INTRO_LAYER
 
-/atom/movable/screen/fullscreen/brute
+/atom/movable/screen/fullscreen/blind
+	icon_state = "blackimageoverlay"
+	layer = FULLSCREEN_BLIND_LAYER
+	plane = FULLSCREEN_PLANE
+
+/atom/movable/screen/fullscreen/damage
+	icon = 'icons/mob/screen/full/damage.dmi'
+
+/atom/movable/screen/fullscreen/damage/brute
 	icon_state = "brutedamageoverlay"
 	layer = FULLSCREEN_DAMAGE_LAYER
 	plane = FULLSCREEN_PLANE
 
-/atom/movable/screen/fullscreen/oxy
+/atom/movable/screen/fullscreen/damage/oxy
 	icon_state = "oxydamageoverlay"
 	layer = FULLSCREEN_DAMAGE_LAYER
 	plane = FULLSCREEN_PLANE
 
-/atom/movable/screen/fullscreen/crit
-	icon_state = "passage"
-	layer = FULLSCREEN_CRIT_LAYER
-	plane = FULLSCREEN_PLANE
-
-/atom/movable/screen/fullscreen/blind
-	icon_state = "blackimageoverlay"
-	layer = FULLSCREEN_BLIND_LAYER
-	plane = FULLSCREEN_PLANE
-
 /atom/movable/screen/fullscreen/impaired
+	icon = 'icons/mob/screen/full/impaired.dmi'
 	icon_state = "impairedoverlay"
 	layer = FULLSCREEN_IMPAIRED_LAYER
 
+/atom/movable/screen/fullscreen/impaired/crit
+	icon_state = "critical"
+	layer = FULLSCREEN_CRIT_LAYER
+	plane = FULLSCREEN_PLANE
+
 /atom/movable/screen/fullscreen/flash
 	icon = 'icons/mob/screen/generic.dmi'
 	screen_loc = "WEST,SOUTH to EAST,NORTH"
@@ -142,18 +146,23 @@
 	layer = FULLSCREEN_DRUGGY_LAYER
 
 /atom/movable/screen/fullscreen/pain
+	icon = 'icons/mob/screen/full/pain.dmi'
 	icon_state = "painoverlay"
 	layer = FULLSCREEN_PAIN_LAYER
 
-/atom/movable/screen/fullscreen/bloodlust
+/atom/movable/screen/fullscreen/animated/bloodlust
+	icon = 'icons/mob/screen/full/animated.dmi'
+
+/atom/movable/screen/fullscreen/animated/bloodlust
 	icon_state = "bloodlust"
 	layer = FULLSCREEN_NERVES_LAYER
 
-/atom/movable/screen/fullscreen/infection
+/atom/movable/screen/fullscreen/animated/infection
 	icon_state = "curseoverlay"
 	layer = FULLSCREEN_INFECTION_LAYER
 
 /atom/movable/screen/fullscreen/machine
+	icon = 'icons/mob/screen/full/machine.dmi'
 	icon_state = "machine"
 	alpha = 120
 	layer = FULLSCREEN_DRUGGY_LAYER

code/datums/components/chem_booster.dm

@@ -198,7 +198,7 @@
 	if(vali_necro_timer > 10 SECONDS)
 		to_chat(wearer, span_bold("WARNING: You have [(200 - (vali_necro_timer))/10] seconds before necrotic tissue forms on your limbs."))
 	if(vali_necro_timer > 15 SECONDS)
-		wearer.overlay_fullscreen("degeneration", /atom/movable/screen/fullscreen/infection, 1)
+		wearer.overlay_fullscreen("degeneration", /atom/movable/screen/fullscreen/animated/infection, 1)
 		to_chat(wearer, span_highdanger("The process of necrosis begins to set in. Turn it off before it's too late!"))
 
 /**

code/datums/keybinding/carbon.dm

@@ -116,32 +116,3 @@
 		return
 	user.mob?.a_intent_change(INTENT_HARM)
 	return TRUE
-
-/datum/keybinding/carbon/specialclick
-	hotkey_keys = list("Ctrl")
-	name = "specialclick"
-	full_name = "Special Click"
-	description = "Hold this hotkey_keys and click to trigger special object interactions."
-	keybind_signal = COMSIG_KB_CARBON_SPECIALCLICK_DOWN
-
-
-/datum/keybinding/carbon/specialclick/down(client/user)
-	. = ..()
-	if(.)
-		return
-	RegisterSignals(user.mob, list(COMSIG_MOB_CLICKON), PROC_REF(specialclicky))
-	RegisterSignals(user.mob, list(COMSIG_MOB_MOUSEDOWN, COMSIG_MOB_MOUSEUP), TYPE_PROC_REF(/datum/keybinding, intercept_mouse_special))
-	return TRUE
-
-
-/datum/keybinding/carbon/specialclick/up(client/user)
-	UnregisterSignal(user.mob, list(COMSIG_MOB_MOUSEDOWN, COMSIG_MOB_MOUSEUP, COMSIG_MOB_CLICKON))
-	return TRUE
-
-/datum/keybinding/carbon/specialclick/proc/specialclicky(datum/source, atom/A, params)
-	SIGNAL_HANDLER
-	var/mob/living/carbon/user = source
-	if(!user.client || !(user.client.eye == user || user.client.eye == user.loc))
-		UnregisterSignal(user, (COMSIG_MOB_CLICKON))
-		return
-	return A.specialclick(user)

code/datums/keybinding/mob.dm

@@ -174,34 +174,6 @@
 		user.mob.dropItemToGround(I)
 	return TRUE
 
-
-/datum/keybinding/mob/examine
-	hotkey_keys = list("Shift")
-	name = "examine_kb"
-	full_name = "Examine"
-	description = "Hold this hotkey_keys and click to examine things."
-	keybind_signal = COMSIG_KB_MOB_EXAMINE_DOWN
-
-
-/datum/keybinding/mob/examine/down(client/user)
-	. = ..()
-	if(.)
-		return
-	RegisterSignals(user.mob, list(COMSIG_MOB_CLICKON, COMSIG_OBSERVER_CLICKON), PROC_REF(examinate))
-	RegisterSignals(user.mob, list(COMSIG_MOB_MOUSEDOWN, COMSIG_MOB_MOUSEUP), TYPE_PROC_REF(/datum/keybinding, intercept_mouse_special))
-	return TRUE
-
-
-/datum/keybinding/mob/examine/up(client/user)
-	UnregisterSignal(user.mob, list(COMSIG_MOB_MOUSEDOWN, COMSIG_MOB_MOUSEUP, COMSIG_MOB_CLICKON, COMSIG_OBSERVER_CLICKON))
-	return TRUE
-
-
-/datum/keybinding/mob/examine/proc/examinate(datum/source, atom/A, params)
-	SIGNAL_HANDLER
-	var/mob/user = source
-	return user.examinate(A)
-
 /datum/keybinding/mob/toggle_move_intent
 	hotkey_keys = list("5")
 	name = "toggle_move_intent"

code/datums/status_effects/xeno_buffs.dm

@@ -546,7 +546,7 @@
 	owner = new_owner
 	duration = set_duration
 	src.plasma_drain = plasma_drain
-	owner.overlay_fullscreen("xeno_feast", /atom/movable/screen/fullscreen/bloodlust)
+	owner.overlay_fullscreen("xeno_feast", /atom/movable/screen/fullscreen/animated/bloodlust)
 	owner.add_filter("[id]2", 2, outline_filter(2, "#61132360"))
 	owner.add_filter("[id]1", 1, wave_filter(0.72, 0.24, 0.4, 0.5))
 	return ..()

code/game/atoms/_atom.dm

@@ -983,13 +983,6 @@ directive is properly returned.
 
 	return TRUE
 
-
-// For special click interactions (take first item out of container, quick-climb, etc.)
-/atom/proc/specialclick(mob/living/carbon/user)
-	SHOULD_CALL_PARENT(TRUE)
-	SEND_SIGNAL(src, COMSIG_ATOM_SPECIALCLICK, user)
-	return COMSIG_MOB_CLICK_CANCELED
-
 /atom/proc/prepare_huds()
 	hud_list = new
 	for(var/hud in hud_possible) //Providing huds.

code/game/objects/effects/acid_hole.dm

@@ -50,7 +50,7 @@
 		use_wall_hole(user)
 
 
-/obj/effect/acid_hole/specialclick(mob/living/carbon/user)
+/obj/effect/acid_hole/CtrlClick(mob/living/carbon/user)
 	. = ..()
 	if(!isxeno(user))
 		return

code/game/objects/effects/weeds.dm

@@ -218,11 +218,11 @@
 		return ..()
 	return window.MouseDrop_T(dropping, user)
 
-/obj/alien/weeds/weedwall/window/specialclick(mob/living/carbon/user)
+/obj/alien/weeds/weedwall/window/CtrlClick(mob/living/carbon/user)
 	var/obj/structure/window = locate(window_type) in loc
 	if(!window)
 		return ..()
-	return window.specialclick(user)
+	return window.CtrlClick(user)
 
 /obj/alien/weeds/weedwall/window/attackby(obj/item/I, mob/user, params) //yes, this blocks attacking the weed itself, but if you destroy the frame you destroy the weed!
 	var/obj/structure/window = locate(window_type) in loc

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

@@ -194,7 +194,6 @@
 	for(var/i in 1 to 5)
 		new /obj/item/clothing/mask/cigarette/antitox(src)
 
-	new /obj/item/clothing/mask/cigarette/emergency(src)
 	new /obj/item/tool/lighter(src)
 
 /obj/item/storage/fancy/chemrettes/update_icon_state()

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

@@ -521,7 +521,7 @@
 /obj/item/storage/pouch/medical_injectors/firstaid
 	desc = "Standard marine first-aid injector pouch. Specialized to store only auto-injectors. Contains basic injectors, a stabilizing injector, stimulant injector, and an emergency injector."
 
-/obj/item/storage/pouch/medical_injectors/firstaid/Initialize(mapload)
+/obj/item/storage/pouch/medical_injectors/firstaid/Initialize(mapload) //used in hvh and erts
 	. = ..()
 	new /obj/item/reagent_containers/hypospray/autoinjector/bicaridine (src)
 	new /obj/item/reagent_containers/hypospray/autoinjector/kelotane (src)
@@ -532,6 +532,17 @@
 	new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine (src)
 	new /obj/item/reagent_containers/hypospray/autoinjector/russian_red (src)
 
+/obj/item/storage/pouch/medical_injectors/standard/Initialize(mapload) //normal access variant available by default to marines
+	. = ..()
+	new /obj/item/reagent_containers/hypospray/autoinjector/bicaridine(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector/kelotane(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector/tramadol(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector/tricordrazine(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector/dylovene(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine(src)
+	new /obj/item/reagent_containers/hypospray/autoinjector/synaptizine(src)
+
 /obj/item/storage/pouch/medical_injectors/medic/Initialize(mapload) //corpsman autoinjector pouch gets upgraded, but more general chems.
 	. = ..()
 	new /obj/item/reagent_containers/hypospray/autoinjector/combat_advanced(src)

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

@@ -854,7 +854,7 @@
 		return
 	attempt_draw_object(user)
 
-/obj/item/storage/specialclick(mob/living/carbon/user)
+/obj/item/storage/CtrlClick(mob/living/carbon/user)
 	. = ..()
 	attempt_draw_object(user, TRUE)
 

code/game/objects/machinery/vending/marine_vending.dm

@@ -919,7 +919,6 @@
 			/obj/item/reagent_containers/hypospray/autoinjector/imidazoline = 20,
 			/obj/item/reagent_containers/hypospray/autoinjector/quickclot = 10,
 			/obj/item/reagent_containers/hypospray/autoinjector/medicalnanites = 20,
-			/obj/item/reagent_containers/hypospray/autoinjector/russian_red = 10,
 		),
 		"Heal Pack" = list(
 			/obj/item/stack/medical/heal_pack/gauze = -1,

code/game/objects/structures.dm

@@ -49,7 +49,7 @@
 
 	do_climb(usr)
 
-/obj/structure/specialclick(mob/living/carbon/user)
+/obj/structure/CtrlClick(mob/living/carbon/user)
 	. = ..()
 	INVOKE_ASYNC(src, PROC_REF(do_climb), user)
 

code/modules/clothing/modular_armor/attachments/storage.dm

@@ -36,13 +36,13 @@
 	RegisterSignal(parent, COMSIG_ATOM_ATTACKBY, PROC_REF(insert_item))
 	RegisterSignal(parent, COMSIG_ATOM_ATTACK_GHOST, PROC_REF(open_storage))
 	RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND_ALTERNATE, PROC_REF(draw_from_storage))
-	RegisterSignal(parent, COMSIG_ATOM_SPECIALCLICK, PROC_REF(left_draw_from_storage))
+	RegisterSignal(parent, COMSIG_CTRL_LEFT_CLICK, PROC_REF(left_draw_from_storage))
 	storage.master_item = parent
 
 /obj/item/armor_module/storage/on_detach(obj/item/detaching_from, mob/user)
 	equip_delay_self = initial(equip_delay_self)
 	strip_delay = initial(strip_delay)
-	UnregisterSignal(parent, list(COMSIG_ATOM_ATTACK_HAND, COMSIG_ALT_RIGHT_CLICK, COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_ATTACK_GHOST, COMSIG_ATOM_ATTACK_HAND_ALTERNATE, COMSIG_ATOM_SPECIALCLICK))
+	UnregisterSignal(parent, list(COMSIG_ATOM_ATTACK_HAND, COMSIG_ALT_RIGHT_CLICK, COMSIG_ATOM_ATTACKBY, COMSIG_ATOM_ATTACK_GHOST, COMSIG_ATOM_ATTACK_HAND_ALTERNATE, COMSIG_CTRL_LEFT_CLICK))
 	storage.master_item = src
 	return ..()
 

code/modules/mob/dead/observer/observer.dm

@@ -685,7 +685,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 /mob/dead/observer/stop_orbit(datum/component/orbiter/orbits)
 	. = ..()
 	pixel_y = 0
-	animate(src, pixel_y = 2, time = 10, loop = -1)
+	animate(src, pixel_y = 2, time = 10, loop = -1, flags = ANIMATION_RELATIVE)
+	animate(pixel_y = -2, time = 10, loop = -1, flags = ANIMATION_RELATIVE)
 
 
 /mob/dead/observer/verb/toggle_zoom()

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

@@ -138,9 +138,9 @@
 		if(ITEM_UNEQUIP_UNEQUIPPED)
 			return
 	if(I == wear_suit)
+		wear_suit = null
 		if(s_store)
 			dropItemToGround(s_store)
-		wear_suit = null
 		I.unequipped(src, SLOT_WEAR_SUIT)
 		if(I.flags_inv_hide & HIDESHOES)
 			update_inv_shoes()