Merge branch 'dev-sierra' into dev-sierra-fax

baystation12.dme

@@ -976,7 +976,6 @@
 #include "code\game\objects\effects\decals\decal.dm"
 #include "code\game\objects\effects\decals\misc.dm"
 #include "code\game\objects\effects\decals\remains.dm"
-#include "code\game\objects\effects\decals\warning_stripes.dm"
 #include "code\game\objects\effects\decals\Cleanable\aliens.dm"
 #include "code\game\objects\effects\decals\Cleanable\fuel.dm"
 #include "code\game\objects\effects\decals\Cleanable\humans.dm"
@@ -1205,6 +1204,7 @@
 #include "code\game\objects\items\weapons\material\urn.dm"
 #include "code\game\objects\items\weapons\melee\energy.dm"
 #include "code\game\objects\items\weapons\melee\misc.dm"
+#include "code\game\objects\items\weapons\storage\ammobox.dm"
 #include "code\game\objects\items\weapons\storage\backpack.dm"
 #include "code\game\objects\items\weapons\storage\bags.dm"
 #include "code\game\objects\items\weapons\storage\belt.dm"
@@ -3008,6 +3008,7 @@
 #include "code\modules\reagents\reagent_containers\food\snacks\bugmeat.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\cheese.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\donkpocket.dm"
+#include "code\modules\reagents\reagent_containers\food\snacks\fortunecookie.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\meat.dm"
 #include "code\modules\reagents\reagent_containers\food\snacks\shellfish.dm"
 #include "code\modules\reagents\reagent_containers\glass\bottle.dm"

code/__defines/colors.dm

@@ -39,6 +39,8 @@
 #define COLOR_PURPLE_GRAY      "#a2819e"
 #define COLOR_BLUE_LIGHT       "#33ccff"
 #define COLOR_RED_LIGHT        "#ff3333"
+#define COLOR_GREEN_LIGHT      "#33ff33"
+#define COLOR_ORANGE_LIGHT     "#ffcc33"
 #define COLOR_BEIGE            "#ceb689"
 #define COLOR_BABY_BLUE        "#89cff0"
 #define COLOR_PALE_GREEN_GRAY  "#aed18b"

code/__defines/~mods/expanded_culture_descriptor.dm

@@ -15,6 +15,7 @@
 #define FACTION_MORPHEUS        "Morpheus Cyberkinetics"
 #define FACTION_ZPCI            "Zone Protection Control Inc."
 #define FACTION_SEPTENERGO      "SeptEnergo"
+#define FACTION_SIBI            "Solar Investigation Bureau Inc."
 
 #define CULTURE_HUMAN_PLUTO    "Plutonian"
 #define CULTURE_HUMAN_LORRIMAN "Lorrimanian"

code/_global_vars/lists/objects.dm

@@ -20,3 +20,5 @@ GLOBAL_DATUM_INIT(universe, /datum/universal_state, new)
 GLOBAL_LIST_INIT(full_alphabet, list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z"))
 
 GLOBAL_LIST_EMPTY(meteor_list)
+
+GLOBAL_LIST_EMPTY(shield_generators) // All shield generators

code/_onclick/click.dm

@@ -527,21 +527,16 @@ GLOBAL_LIST_INIT(click_catchers, create_click_catcher())
 	. = 1
 
 /client/MouseDown(object, location, control, params)
-	var/delay = mob.CanMobAutoclick(object, location, params)
-	if(delay)
-		selected_target[1] = object
-		selected_target[2] = params
-		while(selected_target[1])
-			Click(selected_target[1], location, control, selected_target[2])
-			sleep(delay)
+	var/datum/click_handler/click_handler = usr.GetClickHandler()
+	click_handler.OnMouseDown(object, location, params)
 
 /client/MouseUp(object, location, control, params)
-	selected_target[1] = null
+	var/datum/click_handler/click_handler = usr.GetClickHandler()
+	click_handler.OnMouseUp(object, location, params)
 
 /client/MouseDrag(src_object,atom/over_object,src_location,over_location,src_control,over_control,params)
-	if(selected_target[1] && over_object.IsAutoclickable())
-		selected_target[1] = over_object
-		selected_target[2] = params
+	var/datum/click_handler/click_handler = usr.GetClickHandler()
+	click_handler.OnMouseDrag(over_object, params)
 
 /mob/proc/CanMobAutoclick(object, location, params)
 	return

code/_onclick/click_handling.dm

@@ -103,12 +103,77 @@ var/global/const/CLICK_HANDLER_REMOVE_IF_NOT_TOP    = FLAG(1)
 /datum/click_handler/proc/OnDblClick(atom/A, params)
 	return
 
+/**
+ * Called on MouseDown by `/client/MouseDown()` when this is the mob's currently active click handler.
+ *
+ * **Parameters**:
+ * - `object` - The atom mouse is underneath.
+ * - `location` - the turf, stat panel, grid cell, etc. containing the object where it was clicked
+ * - `params` (list of strings) - List of click parameters. See BYOND's `CLick()` documentation.
+ *
+ * Has no return value.
+ */
+/datum/click_handler/proc/OnMouseDown(object, location, params)
+	return
+
+/**
+ * Called on MouseUp by `/client/MouseUp()` when this is the mob's currently active click handler.
+ *
+ * **Parameters**:
+ * - `object` - The atom underneath mouse.
+ * - `location` - the turf, stat panel, grid cell, etc. containing the object where it was clicked
+ * - `params` (list of strings) - List of click parameters. See BYOND's `CLick()` documentation.
+ *
+ * Has no return value.
+ */
+/datum/click_handler/proc/OnMouseUp(object, location, params)
+	return
+
+/**
+ * Called on MouseUp by `/client/MouseDrag()` when this is the mob's currently active click handler.
+ *
+ * **Parameters**:
+ * - `over_object` - The new atom underneath mouse.
+ * - `params` (list of strings) - List of click parameters. See BYOND's `CLick()` documentation.
+ *
+ * Has no return value.
+ */
+/datum/click_handler/proc/OnMouseDrag(atom/over_object, params)
+	return
+
+/datum/click_handler/proc/CanAutoClick(object, location, params)
+	return
+
+/datum/click_handler/default
+	/// Holds click params [2] and a reference [1] to the atom under the cursor on MouseDown/Drag
+	var/list/selected_target = list(null, null)
+
 /datum/click_handler/default/OnClick(atom/A, params)
 	user.ClickOn(A, params)
 
 /datum/click_handler/default/OnDblClick(atom/A, params)
 	user.DblClickOn(A, params)
 
+/datum/click_handler/default/OnMouseDown(object, location, params)
+	var/delay = CanAutoClick(object, location, params)
+	if(delay)
+		selected_target[1] = object
+		selected_target[2] = params
+		while(selected_target[1])
+			OnClick(selected_target[1], selected_target[2])
+			sleep(delay)
+
+/datum/click_handler/default/OnMouseUp(object, location, params)
+	selected_target[1] = null
+
+/datum/click_handler/default/OnMouseDrag(atom/over_object, params)
+	if(selected_target[1] && over_object && over_object.IsAutoclickable()) //Over object could be null, for example if dragging over darkness
+		selected_target[1] = over_object
+		selected_target[2] = params
+
+/datum/click_handler/default/CanAutoClick(object, location, params)
+	return user.CanMobAutoclick(object, location, params)
+
 /**
  * Returns the mob's currently active click handler.
  *

code/_onclick/hud/action.dm

@@ -9,6 +9,7 @@
 #define AB_CHECK_LYING 4
 #define AB_CHECK_ALIVE 8
 #define AB_CHECK_INSIDE 16
+#define AB_CHECK_INSIDE_ACCESSORY 32
 
 
 /datum/action
@@ -112,6 +113,11 @@
 	if(check_flags & AB_CHECK_INSIDE)
 		if(!(target in owner))
 			return 0
+	if(check_flags & AB_CHECK_INSIDE_ACCESSORY)
+		if(!(target in owner))
+			var/obj/item/clothing/C = target.loc
+			if (!(istype(C) && (C in owner) && (target in C.accessories)))
+				return 0
 	return 1
 
 /datum/action/proc/UpdateName()
@@ -237,6 +243,12 @@
 /datum/action/item_action/CheckRemoval(mob/living/user)
 	return !(target in user)
 
+/datum/action/item_action/accessory
+	check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_LYING|AB_CHECK_ALIVE|AB_CHECK_INSIDE_ACCESSORY
+
+/datum/action/item_action/accessory/CheckRemoval(mob/living/user)
+	return !(target in user || (target.loc && (target.loc in user)))
+
 /datum/action/item_action/hands_free
 	check_flags = AB_CHECK_ALIVE|AB_CHECK_INSIDE
 

code/datums/extensions/support_lattice.dm

@@ -37,12 +37,7 @@
 
 	if(isCoil(C))
 		var/obj/item/stack/cable_coil/coil = C
-		var/obj/structure/lattice/L = locate(/obj/structure/lattice, T)
-		if(L)
-			coil.PlaceCableOnTurf(T, user)
-			return TRUE
-		else
-			to_chat(user, SPAN_WARNING("The cable needs something to be secured to."))
-			return TRUE
+		coil.PlaceCableOnTurf(T, user)
+		return TRUE
 
 	return FALSE

code/datums/recipe.dm

@@ -28,8 +28,11 @@
 	var/antag_text
 
 
-/datum/microwave_recipe/proc/CreateResult(obj/machinery/microwave/microwave)
-	var/atom/movable/result = new result_path (microwave)
+/datum/microwave_recipe/proc/CreateResult(obj/machinery/microwave/microwave, ...)
+	var/list/result_args = list(microwave)
+	if (length(args) > 1)
+		result_args += args.Copy(2)
+	var/atom/movable/result = new result_path (arglist(result_args))
 	microwave.reagents.clear_reagents()
 	if (!length(microwave.ingredients))
 		return result

code/datums/trading/food.dm

@@ -81,12 +81,8 @@
 /datum/trader/ship/chinese/trade_quantity(quantity, list/offers, num, turf/location)
 	. = ..()
 	quantity = 1
-	if(.)
-		var/obj/item/reagent_containers/food/snacks/fortunecookie/cookie = new(location)
-		var/obj/item/paper/paper = new(cookie)
-		cookie.trash = paper
-		paper.SetName("Fortune")
-		paper.info = pick(fortunes)
+	if (.)
+		new /obj/item/reagent_containers/food/snacks/fortunecookie (location)
 
 /datum/trader/grocery
 	name = "Grocer"

code/game/antagonist/station/changeling.dm

@@ -74,13 +74,13 @@ GLOBAL_DATUM_INIT(changelings, /datum/antagonist/changeling, new)
 				var/mob/living/carbon/human/H = player.current
 				if(H.isSynthetic() || H.isFBP())
 					return 0
-				if(H.species.species_flags & SPECIES_FLAG_NO_SCAN)
+				if(H.species.species_flags & (SPECIES_FLAG_NO_SCAN|SPECIES_FLAG_NEED_DIRECT_ABSORB))
 					return 0
 				return 1
 			else if(isnewplayer(player.current))
 				if(player.current.client && player.current.client.prefs)
 					var/datum/species/S = all_species[player.current.client.prefs.species]
-					if(S && (S.species_flags & SPECIES_FLAG_NO_SCAN))
+					if(S?.species_flags & SPECIES_FLAG_NO_SCAN|SPECIES_FLAG_NEED_DIRECT_ABSORB)
 						return 0
 					if(player.current.client.prefs.organ_data[BP_CHEST] == "cyborg") // Full synthetic.
 						return 0

code/game/antagonist/station/loyalist.dm

@@ -23,7 +23,7 @@ GLOBAL_DATUM_INIT(loyalists, /datum/antagonist/loyalists, new)
 	faction_descriptor = "COMPANY"
 	faction_verb = /mob/living/proc/convert_to_loyalist
 	faction_indicator = "hud_loyal"
-	faction_invisible = 1
+	//faction_invisible = 1
 	blacklisted_jobs = list(/datum/job/ai, /datum/job/cyborg, /datum/job/submap)
 	skill_setter = /datum/antag_skill_setter/station
 

code/game/antagonist/station/revolutionary.dm

@@ -26,7 +26,7 @@ GLOBAL_DATUM_INIT(revs, /datum/antagonist/revolutionary, new)
 	faction_verb = /mob/living/proc/convert_to_rev
 	faction_welcome = "Help the cause overturn the ruling class. Do not harm your fellow freedom fighters."
 	faction_indicator = "hud_rev"
-	faction_invisible = 1
+	//faction_invisible = 1
 	faction = "revolutionary"
 
 	blacklisted_jobs = list(/datum/job/ai, /datum/job/cyborg)

code/game/machinery/vending/medical.dm

@@ -34,7 +34,8 @@
 		/obj/item/stack/medical/advanced/bruise_pack = 3,
 		/obj/item/stack/medical/advanced/ointment = 3,
 		/obj/item/stack/medical/splint = 2,
-		/obj/item/reagent_containers/hypospray/autoinjector/pain = 4
+		/obj/item/reagent_containers/hypospray/autoinjector/pain = 4,
+		/obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/allergy = 12
 	)
 	rare_products = list(
 		/obj/item/device/cosmetic_surgery_kit = 75,

code/game/machinery/vending/wallmed1.dm

@@ -23,6 +23,7 @@
 		/obj/item/stack/medical/bruise_pack = 3,
 		/obj/item/stack/medical/ointment = 3,
 		/obj/item/reagent_containers/pill/paracetamol = 4,
+		/obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/allergy = 3,
 		/obj/item/storage/med_pouch/trauma,
 		/obj/item/storage/med_pouch/burn,
 		/obj/item/storage/med_pouch/oxyloss,

code/game/machinery/vending/wallmed2.dm

@@ -21,6 +21,7 @@
 	"}
 	products = list(
 		/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 5,
+		/obj/item/reagent_containers/hypospray/autoinjector/pouch_auto/allergy = 4,
 		/obj/item/stack/medical/bruise_pack = 4,
 		/obj/item/stack/medical/ointment = 4,
 		/obj/item/storage/med_pouch/trauma,

code/game/objects/items.dm

@@ -971,6 +971,12 @@ modules/mob/living/carbon/human/life.dm if you die, you will be zoomed out.
 /obj/item/proc/equip_delay_after(mob/user, slot, equip_flags)
 	return
 
+
+/// Proc called when when the item has been equipped. Unlike `equip_delay_*`, this is always called.
+/obj/item/proc/post_equip_item(mob/user, slot, equip_flags)
+	return
+
+
 /obj/item/OnTopic(href, href_list, datum/topic_state/state)
 	. = ..()
 

code/game/objects/items/weapons/lighter.dm

@@ -12,6 +12,7 @@
 	var/max_fuel = 5
 	var/random_colour = FALSE
 	var/available_colors = list(COLOR_WHITE, COLOR_BLUE_GRAY, COLOR_GREEN_GRAY, COLOR_BOTTLE_GREEN, COLOR_DARK_GRAY, COLOR_RED_GRAY, COLOR_GUNMETAL, COLOR_RED, COLOR_YELLOW, COLOR_CYAN, COLOR_GREEN, COLOR_VIOLET, COLOR_NAVY_BLUE, COLOR_PINK)
+	var/fail_chance = 25
 
 /obj/item/flame/lighter/Initialize()
 	. = ..()
@@ -26,12 +27,27 @@
 	if(submerged())
 		to_chat(user, SPAN_WARNING("You cannot light \the [src] underwater."))
 		return
+	if (fail_light(user))
+		return
 	lit = 1
 	update_icon()
 	light_effects(user)
 	set_light(2, l_color = COLOR_PALE_ORANGE)
 	START_PROCESSING(SSobj, src)
 
+/obj/item/flame/lighter/proc/fail_light(mob/user)
+	if (prob(fail_chance))
+		user.visible_message(
+			SPAN_ITALIC("\The [user] fails to light \the [src]."),
+			SPAN_WARNING("You have failed to light \the [src]. Try again!")
+		)
+
+		playsound(src.loc, "light_bic", 70, TRUE, -4)
+
+		return TRUE
+
+	return FALSE
+
 /obj/item/flame/lighter/proc/light_effects(mob/living/carbon/user)
 	if(prob(95))
 		user.visible_message(SPAN_NOTICE("After a few attempts, [user] manages to light \the [src]."))