Merge pull request #104 from NebulaSS13/dev

Updating from Neb dev

Author: MistakeNot4892

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)