Merge branch 'master' of https://github.com/Monkestation/Monkestation2.0

 into recipes-galore

_maps/theseus.json

@@ -0,0 +1,24 @@
+{
+	"version": 1,
+	"map_name": "Theseus",
+	"map_path": "map_files/Theseus",
+	"map_file": "Theseus.dmm",
+	"shuttles": {
+		"cargo": "cargo_box",
+		"ferry": "ferry_fancy",
+		"whiteship": "whiteship_meta",
+		"emergency": "emergency_meta"
+	},
+	"traits": [
+		{
+			"Linkage": "Cross",
+			"Bombcap Multiplier": 0.8
+		}
+	],
+	"orbit_shift_replacement": "Attention crew, it appears your station orbit has breached the containment area of an unstable sector. Be aware, and act accordingly.",
+	"job_changes": {
+		"Cook": {
+			"additional_cqc_areas": ["/area/station/service/cafeteria", "/area/station/service/bar"]
+		}
+	}
+}

_maps/~monkestation/RandomEngines/KiloStation/supermatter.dmm

@@ -486,21 +486,14 @@
 /obj/structure/cable,
 /turf/open/floor/circuit/red,
 /area/station/engineering/supermatter/room)
-"sz" = (
-/obj/effect/turf_decal/stripes/corner,
-/obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
-/turf/open/floor/engine,
-/area/station/engineering/supermatter/room)
 "sF" = (
 /obj/effect/mapping_helpers/broken_floor,
 /obj/structure/cable,
 /turf/open/floor/plating,
 /area/station/engineering/supermatter/room)
 "sG" = (
-/obj/effect/turf_decal/stripes/corner{
-	dir = 8
-	},
 /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible,
+/obj/effect/turf_decal/stripes/line,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
 "th" = (
@@ -610,6 +603,16 @@
 /obj/effect/spawner/structure/window/reinforced/plasma,
 /turf/open/floor/plating,
 /area/station/engineering/supermatter/room)
+"vH" = (
+/obj/effect/turf_decal/siding/dark_red{
+	dir = 9
+	},
+/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/yellow,
+/turf/open/floor/iron/dark/textured,
+/area/station/engineering/supermatter/room)
 "vL" = (
 /obj/machinery/light/directional/east,
 /obj/effect/decal/cleanable/dirt,
@@ -839,6 +842,16 @@
 /obj/structure/lattice,
 /turf/open/space,
 /area/space/nearstation)
+"Ew" = (
+/obj/effect/turf_decal/siding/dark_red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/yellow,
+/turf/open/floor/iron/dark/textured,
+/area/station/engineering/supermatter/room)
 "EA" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -1462,6 +1475,14 @@
 /obj/effect/turf_decal/stripes/corner,
 /turf/open/floor/engine,
 /area/station/engineering/supermatter/room)
+"Xz" = (
+/mob/living/basic/pet/poppy,
+/obj/structure/bed/dogbed/ian{
+	name = "Poppy's Bed"
+	},
+/obj/effect/turf_decal/tile/yellow,
+/turf/open/floor/iron/dark/textured,
+/area/station/engineering/supermatter/room)
 "XE" = (
 /obj/machinery/atmospherics/pipe/heat_exchanging/simple,
 /obj/effect/turf_decal/stripes/corner{
@@ -1483,7 +1504,15 @@
 /turf/closed/wall/r_wall,
 /area/station/engineering/supermatter)
 "Yu" = (
-/turf/open/floor/iron/dark,
+/obj/effect/turf_decal/siding/dark_red{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/neutral/half/contrasted{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/yellow,
+/obj/structure/tank_holder/extinguisher/advanced,
+/turf/open/floor/iron/dark/textured,
 /area/station/engineering/supermatter/room)
 "YC" = (
 /obj/effect/turf_decal/delivery,
@@ -1741,7 +1770,7 @@ aK
 fN
 BL
 sG
-Yu
+vH
 Yu
 pk
 FB
@@ -1763,9 +1792,9 @@ aK
 (10,1,1) = {"
 BM
 Qj
-sz
-Yu
-Yu
+sG
+Ew
+Xz
 ZC
 wk
 EA

code/__DEFINES/antagonists.dm

@@ -342,7 +342,13 @@ GLOBAL_LIST_INIT(human_invader_antagonists, list(
 #define HUNTER_PACK_PSYKER "Psyker Shikaris"
 
 // This flag disables certain checks that presume antagonist datums mean 'baddie'.
-#define FLAG_FAKE_ANTAG (1 << 0)
+#define FLAG_FAKE_ANTAG					(1 << 0)
+/// monkestation addition: Whether the antagonist can see exploitable info on people they examine.
+#define FLAG_CAN_SEE_EXPOITABLE_INFO	(1 << 1)
+// monkestation addition: The storyteller will ignore this antag datum as counting against the antag cap.
+#define FLAG_ANTAG_CAP_IGNORE			(1 << 2)
+// monkestation addition: The storyteller will count everyone on this antag's team as a singular antag instead.
+#define FLAG_ANTAG_CAP_TEAM				(1 << 3)
 
 #define FREEDOM_IMPLANT_CHARGES 4
 

code/__DEFINES/dcs/signals/signals_turf.dm

@@ -48,3 +48,6 @@
 #define COMSIG_TURF_RESET_ELEVATION "turf_reset_elevation"
 	#define ELEVATION_CURRENT_PIXEL_SHIFT 1
 	#define ELEVATION_MAX_PIXEL_SHIFT 2
+
+///Called when turf no longer blocks light from passing through
+#define COMSIG_TURF_NO_LONGER_BLOCK_LIGHT "turf_no_longer_block_light"

code/__DEFINES/icon_smoothing.dm

@@ -178,6 +178,8 @@ DEFINE_BITFIELD(smoothing_flags, list(
 
 #define SMOOTH_GROUP_CLEANABLE_DIRT S_OBJ(68) ///obj/effect/decal/cleanable/dirt
 
+#define SMOOTH_GROUP_GRAV_FIELD S_OBJ(69)
+
 #define SMOOTH_GROUP_INDUSTRIAL_LIFT S_OBJ(71) ///obj/structure/industrial_lift
 
 #define SMOOTH_GROUP_GAS_TANK S_OBJ(72)

code/__DEFINES/spatial_gridmap.dm

@@ -1,12 +1,13 @@
-///each cell in a spatial_grid is this many turfs in length and width
+/// each cell in a spatial_grid is this many turfs in length and width (with world.max(x or y) being 255, 15 of these fit on each side of a z level)
 #define SPATIAL_GRID_CELLSIZE 17
-///Takes a coordinate, and spits out the spatial grid index (x or y) it's inside
+/// Takes a coordinate, and spits out the spatial grid index (x or y) it's inside
 #define GET_SPATIAL_INDEX(coord) ROUND_UP((coord) / SPATIAL_GRID_CELLSIZE)
-#define GRID_INDEX_TO_COORDS(index) (index * SPATIAL_GRID_CELLSIZE)
+/// changes the cell_(x or y) vars on /datum/spatial_grid_cell to the x or y coordinate on the map for the LOWER LEFT CORNER of the grid cell.
+/// index is from 1 to SPATIAL_GRID_CELLS_PER_SIDE
+#define GRID_INDEX_TO_COORDS(index) ((((index) - 1) * SPATIAL_GRID_CELLSIZE) + 1)
+/// number of grid cells per x or y side of all z levels. pass in world.maxx or world.maxy
 #define SPATIAL_GRID_CELLS_PER_SIDE(world_bounds) GET_SPATIAL_INDEX(world_bounds)
 
-#define SPATIAL_GRID_CHANNELS 2
-
 //grid contents channels
 
 ///everything that is hearing sensitive is stored in this channel

code/__DEFINES/surgery.dm

@@ -17,6 +17,8 @@
 #define ORGAN_HIDDEN (1<<7)
 /// Synthetic organ granted by a species (for use for organ replacements between species)
 #define ORGAN_SYNTHETIC_FROM_SPECIES (1<<8)
+/// This organ has no impact on conversion via flash, such as revs or bbs. Doesn't affect hypnosis and whatnot, though. MONKESTATION EDIT
+#define ORGAN_DOESNT_PROTECT_AGAINST_CONVERSION (1<<9)
 
 // Flags for the bodypart_flags var on /obj/item/bodypart
 /// Bodypart cannot be dismembered or amputated

code/__DEFINES/traits/monkestation/declarations.dm

@@ -53,6 +53,8 @@
 #define TRAIT_REVIVES_BY_HEALING "trait_revives_by_healing"
 /// This mob is a ghost critter.
 #define TRAIT_GHOST_CRITTER "ghost_critter"
+/// This mob is *currently* being flashed by someone with CAN_BYPASS_INNATE_FLASH_RESISTANCE returning TRUE. Used to make IPCs not immune to rev and bb conversions.
+#define TRAIT_CONVERSION_FLASHED "conversion_flashed"
 
 // /datum/mind + /mob/living
 /// Prevents the user from casting spells using sign language. Works on both /datum/mind and /mob/living.

code/__DEFINES/~monkestation/antagonists.dm

@@ -26,6 +26,12 @@
 /// is something a worm
 #define iscorticalborer(A) (istype(A, /mob/living/basic/cortical_borer))
 
+/// Is the mob a blood brother
+#define IS_BROTHER(mob) (mob?.mind?.has_antag_datum(/datum/antagonist/brother))
+
+/// Whether the mob can convert others through innate flash shielding like IPCs (head revolutionaries and blood brothers)
+#define CAN_BYPASS_INNATE_FLASH_RESISTANCE(mob) (IS_BROTHER(mob) || IS_HEAD_REVOLUTIONARY(mob))
+
 // Borer evolution defines
 // The three primary paths that eventually diverge
 #define BORER_EVOLUTION_SYMBIOTE "Symbiote"

code/__HELPERS/~monkestation-helpers/cmp.dm

@@ -8,3 +8,7 @@
 /// Use when you want a list of most to least severe wounds.
 /proc/cmp_wound_severity_dsc(datum/wound/a, datum/wound/b)
 	return cmp_numeric_dsc(a.severity, b.severity)
+
+/// Used to sort overtime in profiling data.
+/proc/sort_overtime_dsc(list/a, list/b)
+	return b["over"] - a["over"]

code/_globalvars/traits/_traits.dm

@@ -186,6 +186,7 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_CLUMSY" = TRAIT_CLUMSY,
 		"TRAIT_COAGULATING" = TRAIT_COAGULATING,
 		"TRAIT_COLDBLOODED" = TRAIT_COLDBLOODED,
+		"TRAIT_CONVERSION_FLASHED" = TRAIT_CONVERSION_FLASHED,
 		"TRAIT_CORPSELOCKED" = TRAIT_CORPSELOCKED,
 		"TRAIT_CRITICAL_CONDITION" = TRAIT_CRITICAL_CONDITION,
 		"TRAIT_CULT_HALO" = TRAIT_CULT_HALO,

code/controllers/master.dm

@@ -289,7 +289,7 @@ GLOBAL_REAL(Master, /datum/controller/master)
 	if(sleep_offline_after_initializations && CONFIG_GET(flag/resume_after_initializations))
 		world.sleep_offline = FALSE
 	initializations_finished_with_no_players_logged_in = initialized_tod < REALTIMEOFDAY - 10
-	SSgamemode.handle_picking_stroyteller() //monkestation edit
+	SSgamemode.handle_picking_storyteller() //monkestation edit
 
 /**
  * Initialize a given subsystem and handle the results.

code/controllers/subsystem/init_profiler.dm

@@ -1,3 +1,4 @@
+/* monkestation edit: reimplemented in [monkestation\code\controllers\subsystem\init_profiler.dm]
 #define INIT_PROFILE_NAME "init_profiler.json"
 
 ///Subsystem exists so we can separately log init time costs from the costs of general operation
@@ -26,3 +27,4 @@ SUBSYSTEM_DEF(init_profiler)
 	world.Profile(PROFILE_CLEAR) //Now that we're written this data out, dump it. We don't want it getting mixed up with our current round data
 
 #undef INIT_PROFILE_NAME
+monkestation end */

code/controllers/subsystem/profiler.dm

@@ -6,10 +6,12 @@ SUBSYSTEM_DEF(profiler)
 	var/fetch_cost = 0
 	var/write_cost = 0
 
+/* monkestation edit: reimplemented in [monkestation\code\controllers\subsystem\profiler.dm]
 /datum/controller/subsystem/profiler/stat_entry(msg)
 	msg += "F:[round(fetch_cost,1)]ms"
 	msg += "|W:[round(write_cost,1)]ms"
 	return msg
+monkestation end */
 
 /datum/controller/subsystem/profiler/Initialize()
 	if(CONFIG_GET(flag/auto_profile))
@@ -37,6 +39,7 @@ SUBSYSTEM_DEF(profiler)
 	world.Profile(PROFILE_STOP, type = "sendmaps")
 
 
+/* monkestation edit: reimplemented in [monkestation\code\controllers\subsystem\profiler.dm]
 /datum/controller/subsystem/profiler/proc/DumpFile()
 	var/timer = TICK_USAGE_REAL
 	var/current_profile_data = world.Profile(PROFILE_REFRESH, format = "json")
@@ -59,4 +62,4 @@ SUBSYSTEM_DEF(profiler)
 	WRITE_FILE(prof_file, current_profile_data)
 	WRITE_FILE(sendmaps_file, current_sendmaps_data)
 	write_cost = MC_AVERAGE(write_cost, TICK_DELTA_TO_MS(TICK_USAGE_REAL - timer))
-
+monkestation end */

code/controllers/subsystem/spatial_gridmap.dm

@@ -435,18 +435,18 @@ SUBSYSTEM_DEF(spatial_grid)
 	for(var/type in spatial_grid_categories[old_target.spatial_grid_key])
 		switch(type)
 			if(SPATIAL_GRID_CONTENTS_TYPE_CLIENTS)
-				var/list/old_target_contents = old_target.important_recursive_contents //cache for sanic speeds (lists are references anyways)
-				GRID_CELL_REMOVE(intersecting_cell.client_contents, old_target_contents[SPATIAL_GRID_CONTENTS_TYPE_CLIENTS])
-				SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_EXITED(SPATIAL_GRID_CONTENTS_TYPE_CLIENTS), old_target_contents[SPATIAL_GRID_CONTENTS_TYPE_CLIENTS])
+				var/list/old_target_contents = old_target.important_recursive_contents?[type] || old_target
+				GRID_CELL_REMOVE(intersecting_cell.client_contents, old_target_contents)
+				SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_EXITED(type), old_target_contents)
 
 			if(SPATIAL_GRID_CONTENTS_TYPE_HEARING)
-				var/list/old_target_contents = old_target.important_recursive_contents //cache for sanic speeds (lists are references anyways)
-				GRID_CELL_REMOVE(intersecting_cell.hearing_contents, old_target_contents[SPATIAL_GRID_CONTENTS_TYPE_HEARING])
-				SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_EXITED(SPATIAL_GRID_CONTENTS_TYPE_HEARING), old_target_contents[SPATIAL_GRID_CONTENTS_TYPE_HEARING])
+				var/list/old_target_contents = old_target.important_recursive_contents?[type] || old_target
+				GRID_CELL_REMOVE(intersecting_cell.hearing_contents, old_target_contents)
+				SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_EXITED(type), old_target_contents)
 
 			if(SPATIAL_GRID_CONTENTS_TYPE_ATMOS)
 				GRID_CELL_REMOVE(intersecting_cell.atmos_contents, old_target)
-				SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_EXITED(SPATIAL_GRID_CONTENTS_TYPE_ATMOS), old_target)
+				SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_EXITED(type), old_target)
 
 	return TRUE
 
@@ -467,14 +467,14 @@ SUBSYSTEM_DEF(spatial_grid)
 
 	switch(exclusive_type)
 		if(SPATIAL_GRID_CONTENTS_TYPE_CLIENTS)
-			var/list/old_target_contents = old_target.important_recursive_contents //cache for sanic speeds (lists are references anyways)
-			GRID_CELL_REMOVE(intersecting_cell.client_contents, old_target_contents[SPATIAL_GRID_CONTENTS_TYPE_CLIENTS])
-			SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_EXITED(exclusive_type), old_target_contents[SPATIAL_GRID_CONTENTS_TYPE_CLIENTS])
+			var/list/old_target_contents = old_target.important_recursive_contents?[exclusive_type] || old_target //cache for sanic speeds (lists are references anyways)
+			GRID_CELL_REMOVE(intersecting_cell.client_contents, old_target_contents)
+			SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_EXITED(exclusive_type), old_target_contents)
 
 		if(SPATIAL_GRID_CONTENTS_TYPE_HEARING)
-			var/list/old_target_contents = old_target.important_recursive_contents
-			GRID_CELL_REMOVE(intersecting_cell.hearing_contents, old_target_contents[SPATIAL_GRID_CONTENTS_TYPE_HEARING])
-			SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_EXITED(exclusive_type), old_target_contents[SPATIAL_GRID_CONTENTS_TYPE_HEARING])
+			var/list/old_target_contents = old_target.important_recursive_contents?[exclusive_type] || old_target
+			GRID_CELL_REMOVE(intersecting_cell.hearing_contents, old_target_contents)
+			SEND_SIGNAL(intersecting_cell, SPATIAL_GRID_CELL_EXITED(exclusive_type), old_target_contents)
 
 		if(SPATIAL_GRID_CONTENTS_TYPE_ATMOS)
 			GRID_CELL_REMOVE(intersecting_cell.atmos_contents, old_target)
@@ -565,7 +565,7 @@ SUBSYSTEM_DEF(spatial_grid)
 
 #ifdef UNIT_TESTS
 	if(untracked_movable_error(to_remove))
-		find_hanging_cell_refs_for_movable(to_remove, remove_from_cells=TRUE)
+		find_hanging_cell_refs_for_movable(to_remove, remove_from_cells=FALSE) //dont remove from cells because we should be able to see 2 errors
 		return
 #endif
 

code/datums/proximity_monitor/field.dm

@@ -38,37 +38,36 @@
 
 	var/list/old_field_turfs = field_turfs
 	var/list/old_edge_turfs = edge_turfs
-	field_turfs = new_turfs[FIELD_TURFS_KEY]
-	edge_turfs = new_turfs[EDGE_TURFS_KEY]
-	if(!full_recalc)
-		field_turfs = list()
-		edge_turfs = list()
+	//MONKESTATION EDIT START
+	var/list/field_turfs_overlap = full_recalc ? list() : new_turfs[FIELD_TURFS_KEY]
+	var/list/edge_turfs_overlap = full_recalc ? list() : new_turfs[EDGE_TURFS_KEY]
 
-	for(var/turf/old_turf as anything in old_field_turfs - field_turfs)
+	for(var/turf/old_turf as anything in old_field_turfs - field_turfs_overlap)
 		if(QDELETED(src))
 			return
 		cleanup_field_turf(old_turf)
-	for(var/turf/old_turf as anything in old_edge_turfs - edge_turfs)
+		field_turfs -= old_turf
+	for(var/turf/old_turf as anything in old_edge_turfs - edge_turfs_overlap)
 		if(QDELETED(src))
 			return
 		cleanup_edge_turf(old_turf)
+		edge_turfs -= old_turf
 
 	if(full_recalc)
 		old_field_turfs = list()
 		old_edge_turfs = list()
-		field_turfs = new_turfs[FIELD_TURFS_KEY]
-		edge_turfs = new_turfs[EDGE_TURFS_KEY]
 
-	for(var/turf/new_turf as anything in field_turfs - old_field_turfs)
+	for(var/turf/new_turf as anything in new_turfs[FIELD_TURFS_KEY] - old_field_turfs)
 		if(QDELETED(src))
 			return
 		field_turfs += new_turf
 		setup_field_turf(new_turf)
-	for(var/turf/new_turf as anything in edge_turfs - old_edge_turfs)
+	for(var/turf/new_turf as anything in new_turfs[EDGE_TURFS_KEY] - old_edge_turfs)
 		if(QDELETED(src))
 			return
 		edge_turfs += new_turf
 		setup_edge_turf(new_turf)
+	//MONKESTATION EDIT END
 
 /datum/proximity_monitor/advanced/on_initialized(turf/location, atom/created, init_flags)
 	. = ..()
@@ -128,7 +127,7 @@
 	var/turf/center = get_turf(host)
 	if(current_range > 0)
 		local_field_turfs += RANGE_TURFS(current_range - 1, center)
-	if(current_range > 1)
+	if(current_range >= 0) //monkestation edit: Range of 0 is 1 tile, and we count it as an edge turf.
 		local_edge_turfs = RANGE_TURFS(current_range, center) - local_field_turfs
 	return list(FIELD_TURFS_KEY = local_field_turfs, EDGE_TURFS_KEY = local_edge_turfs)