Merge pull request #104 from NebulaSS13/dev

Updating from Neb dev

code/__defines/colors.dm

@@ -99,6 +99,7 @@
 #define COLOR_VERDANT_GREEN    "#287d00"
 #define COLOR_SCIENCE_PURPLE   "#6633cc"
 #define COLOR_DAYLIGHT         "#f3e6ca"
+#define COLOR_CHERRY_RED       "#902630"
 
 #define PIPE_COLOR_GREY        "#808080"
 #define PIPE_COLOR_RED         "#ff0000"

code/__defines/inventory_sizes.dm

@@ -16,16 +16,17 @@
 	20 - things that take up an entire turf, like wall girders or door assemblies
 */
 
-#define ITEM_SIZE_TINY           1
-#define ITEM_SIZE_SMALL          2
-#define ITEM_SIZE_NORMAL         3
-#define ITEM_SIZE_LARGE          4
-#define ITEM_SIZE_HUGE           5
-#define ITEM_SIZE_GARGANTUAN     6
-#define ITEM_SIZE_STRUCTURE      20
+#define ITEM_SIZE_TINY            1
+#define ITEM_SIZE_SMALL           2
+#define ITEM_SIZE_NORMAL          3
+#define ITEM_SIZE_LARGE           4
+#define ITEM_SIZE_HUGE            5
+#define ITEM_SIZE_GARGANTUAN      6
+#define ITEM_SIZE_STRUCTURE       20
+#define ITEM_SIZE_LARGE_STRUCTURE 30
 
-#define ITEM_SIZE_MIN            ITEM_SIZE_TINY
-#define ITEM_SIZE_MAX            ITEM_SIZE_STRUCTURE
+#define ITEM_SIZE_MIN             ITEM_SIZE_TINY
+#define ITEM_SIZE_MAX             ITEM_SIZE_LARGE_STRUCTURE
 
 #define BASE_STORAGE_COST(w_class) (2**(w_class-1)) //1,2,4,8,16,...
 

code/__defines/tools.dm

@@ -87,6 +87,7 @@
 #define TOOL_PROP_COLOR_NAME       "color_name"     //Property containing a color name for some tools. Namely the pen tool.
 #define TOOL_PROP_COLOR            "color"          //Property for specifying a color, for something like a pen.
 #define TOOL_PROP_USES             "uses_left"      //Property for things that have a fixed amount of uses. -1 is unlimited.
+#define TOOL_PROP_EMPTY_MESSAGE    "empty_msg"      //The message given on depletion when a tool runs out of charges.
 
 //Pen specific stuff
 #define TOOL_PROP_PEN_FLAG         "pen_flag"     //Property for pens to specify additional properties about themselves

code/__defines/turfs.dm

@@ -2,12 +2,10 @@
 #define TURF_REMOVE_SCREWDRIVER BITFLAG(1)
 #define TURF_REMOVE_SHOVEL      BITFLAG(2)
 #define TURF_REMOVE_WRENCH      BITFLAG(3)
-#define TURF_CAN_BREAK          BITFLAG(4)
-#define TURF_CAN_BURN           BITFLAG(5)
-#define TURF_IS_FRAGILE         BITFLAG(6)
-#define TURF_ACID_IMMUNE        BITFLAG(7)
-#define TURF_IS_WET             BITFLAG(8)
-#define TURF_HAS_RANDOM_BORDER  BITFLAG(9)
+#define TURF_IS_FRAGILE         BITFLAG(4)
+#define TURF_ACID_IMMUNE        BITFLAG(5)
+#define TURF_IS_WET             BITFLAG(6)
+#define TURF_HAS_RANDOM_BORDER  BITFLAG(7)
 
 //Used for floor/wall smoothing
 #define SMOOTH_NONE 0	//Smooth only with itself

code/__defines/zmimic.dm

@@ -52,7 +52,7 @@ var/global/list/mimic_defines = list(
 )
 
 // Movable flags.
-#define ZMM_IGNORE        1	//! Do not copy this movable.
-#define ZMM_MANGLE_PLANES 2	//! Check this movable's overlays/underlays for explicit plane use and mangle for compatibility with Z-Mimic. If you're using emissive overlays, you probably should be using this flag. Expensive, only use if necessary.
-#define ZMM_LOOKAHEAD     3	//! Look one turf ahead and one turf back when considering z-turfs that might be seeing this atom. Cheap, but not free.
-#define ZMM_LOOKBESIDE    4	//! Look one turf beside (left/right) when considering z-turfs that might be seeing this atom. Cheap, but not free.
+#define ZMM_IGNORE        BITFLAG(0)	//! Do not copy this movable.
+#define ZMM_MANGLE_PLANES BITFLAG(1)	//! Check this movable's overlays/underlays for explicit plane use and mangle for compatibility with Z-Mimic. If you're using emissive overlays, you probably should be using this flag. Expensive, only use if necessary.
+#define ZMM_LOOKAHEAD     BITFLAG(2)	//! Look one turf ahead and one turf back when considering z-turfs that might be seeing this atom. Cheap, but not free.
+#define ZMM_LOOKBESIDE    BITFLAG(3)	//! Look one turf beside (left/right) when considering z-turfs that might be seeing this atom. Cheap, but not free.

code/_onclick/adjacent.dm

@@ -103,7 +103,7 @@ Quick adjacency (to turf):
 		return TRUE
 	if(istype(loc, /obj/item) || istype(loc, /obj/structure))
 		if(recurse > 0)
-			return loc.Adjacent(neighbor,recurse - 1)
+			return loc.Adjacent(neighbor, recurse - 1)
 		return FALSE
 	return ..()
 
@@ -112,7 +112,7 @@ Quick adjacency (to turf):
 		return TRUE
 	if(istype(loc, /obj/item) || istype(loc, /obj/structure))
 		if(recurse > 0)
-			return loc.Adjacent(neighbor,recurse - 1)
+			return loc.Adjacent(neighbor, recurse - 1)
 		return FALSE
 	return ..()
 

code/_onclick/item_attack.dm

@@ -24,16 +24,18 @@ avoid code duplication. This includes items that may sometimes act as a standard
 	var/datum/extension/tool/tool = get_extension(src, /datum/extension/tool)
 	return (tool?.handle_physical_manipulation(user)) || FALSE
 
+// If TRUE, prevent afterattack from running.
 /obj/item/proc/resolve_attackby(atom/A, mob/user, var/click_params)
 	if(!(item_flags & ITEM_FLAG_NO_PRINT))
 		add_fingerprint(user)
 	return A.attackby(src, user, click_params)
 
+// If TRUE, prevent afterattack from running.
 /atom/proc/attackby(obj/item/used_item, mob/user, var/click_params)
 	if(storage)
 		if(isrobot(user) && (used_item == user.get_active_held_item()))
 			return FALSE //Robots can't store their modules.
-		if(!storage.can_be_inserted(used_item, user))
+		if(!storage.can_be_inserted(used_item, user, click_params = click_params))
 			return FALSE
 		used_item.add_fingerprint(user)
 		return storage.handle_item_insertion(user, used_item, click_params = click_params)
@@ -44,6 +46,7 @@ avoid code duplication. This includes items that may sometimes act as a standard
 	if(!.)
 		return bash(W,user)
 
+// Return TRUE if further actions (afterattack, etc) should be prevented, FALSE if they can proceed.
 /atom/movable/proc/bash(obj/item/weapon, mob/user)
 	if(isliving(user) && user.a_intent == I_HELP)
 		return FALSE
@@ -105,6 +108,7 @@ avoid code duplication. This includes items that may sometimes act as a standard
 	var/mob/living/attackee = null
 
 //I would prefer to rename this attack_as_weapon(), but that would involve touching hundreds of files.
+// If this returns TRUE, the interaction has been handled and other interactions like afterattack should be skipped.
 /obj/item/proc/use_on_mob(mob/living/target, mob/living/user, animate = TRUE)
 
 	// TODO: revisit if this should be a silent failure/parent call instead, for mob-level storage interactions?

code/controllers/subsystems/mapping.dm

@@ -42,7 +42,7 @@ SUBSYSTEM_DEF(mapping)
 	/// Z-levels available to various consoles, such as the crew monitor. Defaults to station_levels if unset.
 	var/list/map_levels
 	/// The turf type used when generating floors between Z-levels at startup.
-	var/base_floor_type = /turf/floor/airless
+	var/base_floor_type = /turf/floor/plating/airless
 	/// Replacement area, if a base_floor_type is generated. Leave blank to skip.
 	var/base_floor_area
 	/// A list of connected z-levels to avoid repeatedly rebuilding connections

code/controllers/subsystems/zcopy.dm

@@ -496,10 +496,10 @@ SUBSYSTEM_DEF(zcopy)
 	ASSERT(!QDELETED(object))
 
 	var/turf/Tloc = object.loc
-	if (!isturf(Tloc) || !Tloc.above)
+	if (!isturf(Tloc) || !MOVABLE_SHALL_MIMIC(object))
 		return TRUE
 
-	var/turf/T = Tloc.above
+	var/turf/T = GetAbove(Tloc)
 
 	ZM_RECORD_START
 

code/datums/ai/_ai.dm

@@ -44,6 +44,8 @@
 	/// What directions can we wander in? Uses global.cardinal if unset.
 	var/list/wander_directions
 
+	/// Should we retaliate/startle when grabbed or buckled?
+	var/spooked_by_grab = TRUE
 	/// Can we automatically escape from buckling?
 	var/can_escape_buckles = FALSE
 
@@ -314,3 +316,15 @@
 	if(body)
 		return body.set_target_zone(ran_zone())
 	return FALSE
+
+/datum/mob_controller/proc/on_buckled(mob/scary_grabber)
+	if(!scary_grabber || body.buckled_mob != scary_grabber) // the buckle got cancelled somehow?
+		return
+	if(spooked_by_grab && !is_friend(scary_grabber))
+		retaliate(scary_grabber)
+
+/datum/mob_controller/proc/on_grabbed(mob/scary_grabber)
+	if(!scary_grabber)
+		return
+	if(spooked_by_grab && !is_friend(scary_grabber))
+		retaliate(scary_grabber)

code/datums/extensions/assembly/assembly_interaction.dm

@@ -102,4 +102,5 @@
 		return TRUE
 
 	if(istype(W, /obj/item/stock_parts))
-		return try_install_component(user, W)
+		return try_install_component(user, W)
+	return FALSE

code/datums/extensions/storage/_storage.dm

@@ -124,7 +124,7 @@ var/global/list/_test_storage_items = list()
 
 //This proc return 1 if the item can be picked up and 0 if it can't.
 //Set the stop_messages to stop it from printing messages
-/datum/storage/proc/can_be_inserted(obj/item/W, mob/user, stop_messages = 0)
+/datum/storage/proc/can_be_inserted(obj/item/W, mob/user, stop_messages = 0, click_params = null)
 	if(!istype(W)) return //Not an item
 
 	if(user && !user.canUnEquip(W))

code/datums/extensions/storage/subtypes_backpack.dm

@@ -7,7 +7,7 @@
 	max_w_class = ITEM_SIZE_NORMAL
 	max_storage_space = 56
 
-/datum/storage/backpack/holding/can_be_inserted(obj/item/W, stop_messages = 0)
+/datum/storage/backpack/holding/can_be_inserted(obj/item/W, mob/user, stop_messages = 0, click_params)
 	if(istype(W, /obj/item/backpack/holding))
 		return 1
 	return ..()

code/datums/extensions/storage/subtypes_bag.dm

@@ -15,7 +15,7 @@
 		var/obj/item/bag/bag = holder
 		bag.update_w_class()
 
-/datum/storage/bag/can_be_inserted(obj/item/W, mob/user, stop_messages = 0)
+/datum/storage/bag/can_be_inserted(obj/item/W, mob/user, stop_messages = 0, click_params = null)
 	var/mob/living/human/H = ishuman(user) ? user : null // if we're human, then we need to check if bag in a pocket
 	if(holder.loc?.storage || H?.is_in_pocket(holder))
 		if(!stop_messages)

code/datums/extensions/storage/subtypes_misc.dm

@@ -106,7 +106,7 @@
 	can_hold = list(/obj/item)
 	expected_type = /obj/structure/reagent_dispensers/compost_bin
 
-/datum/storage/hopper/industrial/compost/can_be_inserted(obj/item/W, mob/user, stop_messages = 0)
+/datum/storage/hopper/industrial/compost/can_be_inserted(obj/item/W, mob/user, stop_messages = 0, click_params = null)
 	. = ..()
 	if(!.)
 		return
@@ -120,7 +120,7 @@
 /datum/storage/hopper/mortar
 	max_w_class = ITEM_SIZE_NORMAL * 2
 
-/datum/storage/hopper/mortar/can_be_inserted(obj/item/inserting_item, mob/user, stop_messages)
+/datum/storage/hopper/mortar/can_be_inserted(obj/item/inserting_item, mob/user, stop_messages, click_params = null)
 	. = ..()
 	if(!.)
 		return

code/datums/extensions/storage/subtypes_pills.dm

@@ -17,7 +17,7 @@
 		if(pop.pop_sound)
 			playsound(get_turf(pop), pop.pop_sound, 50)
 
-/datum/storage/pillbottle/foil/can_be_inserted(obj/item/W, mob/user, stop_messages = 0)
+/datum/storage/pillbottle/foil/can_be_inserted(obj/item/W, mob/user, stop_messages = 0, click_params = null)
 	return FALSE
 
 /datum/storage/pillbottle/foil/remove_from_storage(mob/user, obj/item/W, atom/new_location, skip_update)

code/datums/extensions/storage/subtypes_secure.dm

@@ -16,7 +16,7 @@
 	. = ..()
 
 //Must be overriden to prevent gathering from tile and using on items when locked!
-/datum/storage/secure/can_be_inserted(obj/item/W, mob/user, stop_messages)
+/datum/storage/secure/can_be_inserted(obj/item/W, mob/user, stop_messages, click_params = null)
 	if(is_locked())
 		if(!stop_messages)
 			to_chat(user, SPAN_WARNING("\The [holder] is locked, you cannot put anything inside."))

code/datums/extensions/storage/subtypes_sheets.dm

@@ -9,7 +9,7 @@
 /datum/storage/sheets/robot
 	capacity = 500 //Borgs get more because >specialization
 
-/datum/storage/sheets/can_be_inserted(obj/item/W, mob/user, stop_messages = 0)
+/datum/storage/sheets/can_be_inserted(obj/item/W, mob/user, stop_messages = 0, click_params = null)
 	if(!istype(W,/obj/item/stack/material))
 		if(!stop_messages)
 			to_chat(user, "\The [holder] does not accept [W].")

code/datums/extensions/storage/subtypes_wallet.dm

@@ -51,7 +51,7 @@
 			wallet.front_stick = null
 
 /datum/storage/wallet/handle_item_insertion(mob/user, obj/item/W, prevent_warning, skip_update, click_params)
-	. = ..(W, prevent_warning)
+	. = ..()
 	if(. && istype(holder, /obj/item/wallet))
 		var/obj/item/wallet/wallet = holder
 		if(!wallet.front_id && istype(W, /obj/item/card/id))

code/datums/inventory_slots/_inventory_slot.dm

@@ -39,6 +39,7 @@
 	prop.forceMove(user)
 	prop.hud_layerise()
 	prop.equipped(user, slot_id)
+	prop.compile_overlays() // avoid world overlays on inventory state and vice versa
 
 	// Clean up the preexisting item.
 	if(held)

code/datums/outfits/outfit.dm

@@ -99,23 +99,26 @@
 		post_equip(H)
 
 	if(outfit_flags & OUTFIT_HAS_VITALS_SENSOR)
-		var/obj/item/clothing/sensor/vitals/sensor
-		for(var/check_slot in global.vitals_sensor_equip_slots)
-			if(!H.get_inventory_slot_datum(check_slot))
-				continue
-			if(!sensor) // only create the sensor if we have at least one eligible slot
-				sensor = new(get_turf(H))
-			var/obj/item/clothing/equipped = H.get_equipped_item(check_slot)
-			if(istype(equipped) && !(locate(/obj/item/clothing/sensor/vitals) in equipped.accessories) && equipped.can_attach_accessory(sensor))
-				equipped.attach_accessory(null, sensor)
-				break
-		if(isturf(sensor?.loc))
-			H.put_in_hands(sensor)
-		else
-			qdel(sensor)
+		try_equip_vitals_sensor(H)
 
 	return 1
 
+/decl/outfit/proc/try_equip_vitals_sensor(mob/living/human/H)
+	var/obj/item/clothing/sensor/vitals/sensor
+	for(var/check_slot in global.vitals_sensor_equip_slots)
+		if(!H.get_inventory_slot_datum(check_slot))
+			continue
+		if(!sensor) // only create the sensor if we have at least one eligible slot
+			sensor = new(get_turf(H))
+		var/obj/item/clothing/equipped = H.get_equipped_item(check_slot)
+		if(istype(equipped) && !(locate(/obj/item/clothing/sensor/vitals) in equipped.accessories) && equipped.can_attach_accessory(sensor))
+			equipped.attach_accessory(null, sensor)
+			break
+	if(isturf(sensor?.loc))
+		H.put_in_hands(sensor)
+	else
+		qdel(sensor)
+
 /decl/outfit/proc/equip_base(mob/living/human/H, var/equip_adjustments)
 	set waitfor = FALSE
 	pre_equip(H)

code/game/atoms.dm

@@ -737,7 +737,10 @@
 		LAZYREMOVE(climbers,user)
 		return FALSE
 
-	var/target_turf = get_turf(src)
+	// handle multitile objects
+	// this should also be fine for non-multitile objects
+	// and ensures we don't ever move more than 1 tile
+	var/target_turf = get_step(user, get_dir(user, src))
 
 	//climbing over border objects like railings
 	if((atom_flags & ATOM_FLAG_CHECKS_BORDER) && get_turf(user) == target_turf)

code/game/atoms_init.dm

@@ -118,6 +118,8 @@
 	// Changing this behavior will almost certainly break power; update accordingly.
 	if (!ml && loc)
 		loc.Entered(src, null)
+	if(loc && (z_flags & ZMM_WIDE_LOAD))
+		SSzcopy.discover_movable(src)
 
 /atom/movable/EarlyDestroy(force = FALSE)
 	loc = null // should NOT use forceMove, in order to avoid events

code/game/atoms_movable_overlay.dm

@@ -42,6 +42,7 @@
 /atom/movable/overlay/attackby(obj/item/I, mob/user)
 	if (master)
 		return master.attackby(I, user)
+	return TRUE
 
 /atom/movable/overlay/attack_hand(mob/user)
 	SHOULD_CALL_PARENT(FALSE)

code/game/machinery/CableLayer.dm

@@ -34,7 +34,7 @@
 			to_chat(user, "<span class='warning'>\The [src]'s cable reel is full.</span>")
 		else
 			to_chat(user, "You load [result] lengths of cable into [src].")
-		return
+		return TRUE
 
 	if(IS_WIRECUTTER(O))
 		if(cable && cable.amount)
@@ -48,6 +48,8 @@
 				CC.amount = m
 		else
 			to_chat(usr, "<span class='warning'>There's no more cable on the reel.</span>")
+		return TRUE
+	return ..()
 
 /obj/machinery/cablelayer/examine(mob/user)
 	. = ..()

code/game/machinery/OpTable.dm

@@ -48,7 +48,7 @@
 
 	if(stat & (NOPOWER|BROKEN))
 		to_chat(user, "<span class='warning'>You try to switch on the suppressor, yet nothing happens.</span>")
-		return
+		return TRUE
 
 	if(user != victim && !suppressing) // Skip checks if you're doing it to yourself or turning it off, this is an anti-griefing mechanic more than anything.
 		user.visible_message("<span class='warning'>\The [user] begins switching on \the [src]'s neural suppressor.</span>")

code/game/machinery/Sleeper.dm

@@ -308,7 +308,7 @@
 		add_fingerprint(user)
 		if(!beaker)
 			if(!user.try_unequip(I, src))
-				return
+				return TRUE
 			beaker = I
 			user.visible_message(SPAN_NOTICE("\The [user] adds \a [I] to \the [src]."), SPAN_NOTICE("You add \a [I] to \the [src]."))
 		else

code/game/machinery/_machines_base/stock_parts/access_lock.dm

@@ -61,8 +61,7 @@
 		if(I && check_access(I))
 			locked = !locked
 			visible_message(SPAN_NOTICE("\The [src] beeps and flashes green twice: it is now [locked ? "" : "un"]locked."))
-			return TRUE
-		return
+		return TRUE
 	return ..()
 
 /obj/item/stock_parts/access_lock/attack_self(mob/user)