Merge remote-tracking branch 'origin/master' into map_generation

citadel.dme

@@ -2204,7 +2204,6 @@
 #include "code\modules\atmospherics\machinery\components\unary\unary_base.dm"
 #include "code\modules\atmospherics\machinery\components\unary\vent_pump.dm"
 #include "code\modules\atmospherics\machinery\components\unary\vent_scrubber.dm"
-#include "code\modules\atmospherics\machinery\components\unary\vent_scrubber_vr.dm"
 #include "code\modules\atmospherics\machinery\pipes\cap.dm"
 #include "code\modules\atmospherics\machinery\pipes\he_pipes.dm"
 #include "code\modules\atmospherics\machinery\pipes\manifold.dm"
@@ -4810,6 +4809,8 @@
 #include "code\modules\xenobio\items\weapons.dm"
 #include "code\modules\xenobio\machinery\processor.dm"
 #include "donator\legacy.dm"
+#include "donator\djkouta\donator_cloak.dm"
+#include "donator\timothytea\donator_bedsheet.dm"
 #include "donator\unclebourbon\pmc_mask.dm"
 #include "interface\interface.dm"
 #include "interface\stylesheet.dm"

code/__DEFINES/inventory/procs.dm

@@ -35,6 +35,8 @@
 #define INV_OP_DELETING				(1<<16)
 /// hint: we're currently mitigating a fatal error in an inventory proc, likely trying to revert state
 #define INV_OP_FATAL				(1<<17)
+/// hint: we're just checking instead of doing, don't invoke delayed checks just yet
+#define INV_OP_JUST_CHECKING		(1<<18)
 
 /// no delays and reachability checks entirely
 #define INV_OP_FLUFFLESS			(INV_OP_IGNORE_REACHABILITY | INV_OP_IGNORE_DELAY)

code/__DEFINES/jobs/spawnpoints.dm

@@ -11,5 +11,5 @@
 #define LATEJOIN_METHOD_ROBOT_STORAGE		"Robotic storage"
 /// Tram
 #define LATEJOIN_METHOD_TRAM				"Tram"
-/// Shuttle dock
-#define LATEJOIN_METHOD_SHUTTLE_DOCK		"Shuttle Dock"
+
+/// DO NOT ADD MORE SPAWNPOINT METHODS

code/__DEFINES/mapping/maploader.dm

@@ -1,5 +1,4 @@
-
-// Maploader bounds indices
+//* Maploader bounds indices
 #define MAP_MINX	1
 #define MAP_MINY	2
 #define MAP_MINZ	3

code/__DEFINES/movement.dm

@@ -32,7 +32,7 @@ GLOBAL_VAR_INIT(default_glide_size, 0)
 
 /// Set appearance flags in vars
 #ifdef SMOOTH_MOVEMENT
-	#define SET_APPEARANCE_FLAGS(_flags) appearance_flags = (_flags | LONG_GLIDE)
+	#define SET_APPEARANCE_FLAGS(_flags) appearance_flags = (_flags | LONG_GLIDE | TILE_MOVER)
 #else
 	#define SET_APPEARANCE_FLAGS(_flags) appearance_flags = _flags
 #endif

code/__DEFINES/rendering/darksight.dm

@@ -24,7 +24,7 @@
 
 #define SOFT_DARKSIGHT_FOV_DEFAULT SOFT_DARKSIGHT_FOV_90
 #define SOFT_DARKSIGHT_FOV_TIER_1 SOFT_DARKSIGHT_FOV_90
-#define SOFT_DARKSIGHT_FOV_TIER_2 SOFT_DARKSIGHT_FOV_90
+#define SOFT_DARKSIGHT_FOV_TIER_2 SOFT_DARKSIGHT_FOV_180
 #define SOFT_DARKSIGHT_FOV_TIER_3 SOFT_DARKSIGHT_FOV_270
 #define SOFT_DARKSIGHT_FOV_NVGS SOFT_DARKSIGHT_FOV_90
 #define SOFT_DARKSIGHT_FOV_SUPER SOFT_DARKSIGHT_FOV_OMNI

code/__HELPERS/global_lists.dm

@@ -327,6 +327,7 @@ var/global/list/edible_trash = list(/obj/item/broken_device,
 				/obj/item/flame,
 				/obj/item/light,
 				/obj/item/lipstick,
+				/obj/item/material/kitchen/utensil,
 				/obj/item/material/shard,
 				/obj/item/newspaper,
 				/obj/item/paper,
@@ -336,6 +337,8 @@ var/global/list/edible_trash = list(/obj/item/broken_device,
 				/obj/item/reagent_containers/food,
 				/obj/item/reagent_containers/glass/bottle,
 				/obj/item/reagent_containers/glass/rag,
+				/obj/item/reagent_containers/hypospray/autoinjector,
+				/obj/item/skub,
 				/obj/item/soap,
 				/obj/item/spacecash,
 				/obj/item/storage/box/vmcrystal,

code/controllers/subsystem/job/spawnpoints.dm

@@ -36,7 +36,7 @@
 	for(var/obj/landmark/spawnpoint/overflow/S in GLOB.landmarks_list)
 		if(!S.faction)
 			continue
-		LAZYDISTINCTADD(latejoin_spawnpoints[S.faction], S)
+		LAZYDISTINCTADD(overflow_spawnpoints[S.faction], S)
 	for(var/obj/landmark/spawnpoint/custom/S in GLOB.landmarks_list)
 		if(!S.key)
 			continue

code/controllers/subsystem/mapping/levels.dm

@@ -16,6 +16,8 @@
 	/// stuff that puts themselves in this get map_initializations() hook called on them
 	/// at end of level or map load cycle before general atom init.
 	var/tmp/list/obj/map_helper/map_initialization_hooked
+	/// this initializations hooked - this cycle
+	var/tmp/list/obj/map_helper/map_initialization_hooking
 
 /datum/controller/subsystem/mapping/on_max_z_changed(old_z_count, new_z_count)
 	. = ..()
@@ -135,6 +137,7 @@
 	var/real_x = 1
 	var/real_y = 1
 	var/real_z = instance.z_index
+	var/real_orientation = orientation || instance.orientation
 
 	// todo: check my math
 
@@ -147,8 +150,9 @@
 
 	if(isnull(deferred_callbacks))
 		map_initialization_hooked = list()
+	map_initialization_hooking = list()
 
-	var/list/loaded_bounds = parsed.load(real_x, real_y, real_z, no_changeturf = TRUE, place_on_top = FALSE, orientation = orientation || instance.orientation, area_cache = area_cache)
+	var/list/loaded_bounds = parsed.load(real_x, real_y, real_z, no_changeturf = TRUE, place_on_top = FALSE, orientation = real_orientation, area_cache = area_cache)
 
 	var/list/datum/callback/generation_callbacks = list()
 	instance.on_loaded_immediate(instance.z_index, generation_callbacks)
@@ -158,8 +162,9 @@
 		for(var/obj/map_helper/D in map_initialization_hooked)
 			if(QDELETED(D))
 				continue
-			D.map_initializations(loaded_bounds)
+			D.map_initializations(loaded_bounds, real_x, real_y, real_z, real_orientation)
 		map_initialization_hooked = null
+		map_initialization_hooking = null
 
 		for(var/datum/callback/cb as anything in generation_callbacks)
 			cb.Invoke()
@@ -170,6 +175,9 @@
 		instance.on_loaded_finalize(instance.z_index)
 	else
 		deferred_callbacks += generation_callbacks
+		for(var/obj/map_helper/D as anything in map_initialization_hooking)
+			map_initialization_hooked[D] = list(loaded_bounds, real_x, real_y, real_z, real_orientation)
+		map_initialization_hooking = null
 
 	. = loaded_bounds
 

code/controllers/subsystem/mapping/maps.dm

@@ -86,7 +86,7 @@
 	var/raw = file2text(reading)
 	subsystem_log("read raw next map [raw]")
 	var/list/json = safe_json_decode(raw)
-	var/path = json["type"]
+	var/path = text2path(json["type"])
 	var/id = json["id"]
 	var/modified = json["modified"]
 	var/list/data = json["data"]
@@ -132,7 +132,7 @@
 	for(var/obj/map_helper/D in map_initialization_hooked)
 		if(QDELETED(D))
 			continue
-		D.map_initializations(loaded_bounds)
+		D.map_initializations(arglist(map_initialization_hooked[D]))
 	map_initialization_hooked = null
 	// invoke generation
 	for(var/datum/callback/cb as anything in generation_callbacks)

code/controllers/subsystem/research.dm

@@ -1,4 +1,5 @@
 SUBSYSTEM_DEF(research)
+	name = "Research"
 	subsystem_flags = SS_NO_FIRE
 	init_order = INIT_ORDER_RESEARCH
 

code/datums/armor/outsider/lavaland.dm

@@ -46,3 +46,11 @@
 	laser = 0.25
 	energy = 0.1
 	bomb = 0.25
+
+/datum/armor/lavaland/xeno
+	melee = 0.5
+	bullet = 0.35
+	laser = 0.4
+	energy = 0.4
+	bio = 0.3
+	rad = 0.3

code/datums/status_effects/grouped.dm

@@ -43,9 +43,6 @@
 	return TRUE
 
 /datum/status_effect/grouped/proc/apply_source(source, value, duration = src.duration)
-	// source can technically be any non-number value, but to enforce code durability
-	// we don't want any del'able reference types.
-	ASSERT(istext(source) && !isnull(value))
 	var/old = sources[source]
 	sources[source] = value
 	var/old_expires = expires[source]
@@ -63,9 +60,6 @@
 	on_change(source, old, value)
 
 /datum/status_effect/grouped/proc/set_source(source, value, duration = src.duration)
-	// source can technically be any non-number value, but to enforce code durability
-	// we don't want any del'able reference types.
-	ASSERT(istext(source))
 	if(isnull(value))
 		// autodetect if we're just setting duration
 		value = sources[source]
@@ -105,14 +99,14 @@
  * * source - source of application; must be text
  * * value - metadata; must be non-null
  * * duration - duration override, otherwise we use default of the path.
+ * * ... - additional args
  *
  * @return effect datum
  */
-/mob/proc/apply_grouped_effect(datum/status_effect/grouped/path, source, value, duration)
+/mob/proc/apply_grouped_effect(datum/status_effect/grouped/path, source, value, duration, ...)
 	if(!ispath(path, /datum/status_effect/grouped))
 		CRASH("[path] is not a grouped effect.")
-	ASSERT(istext(source) && !isnull(value))
-	return apply_status_effect(path, additional = list(source, value))
+	return apply_status_effect(path, additional = args.Copy(2))
 
 /**
  * removes a source from a grouped effect
@@ -124,6 +118,5 @@
 /mob/proc/remove_grouped_effect(datum/status_effect/grouped/path, source)
 	if(!ispath(path, /datum/status_effect/grouped))
 		CRASH("[path] is not a grouped effect.")
-	ASSERT(istext(source))
 	var/datum/status_effect/grouped/effect = has_status_effect(path)
 	return effect.remove_source(source)

code/datums/status_effects/grouped/crusher_mark.dm

@@ -2,18 +2,15 @@
 	identifier = "crusher_mark"
 	duration = 300 //if you leave for 30 seconds you lose the mark, deal with it
 	var/mutable_appearance/marked_underlay
-	var/obj/item/kinetic_crusher/hammer_synced
 
-/datum/status_effect/grouped/crusher_mark/on_apply(obj/item/kinetic_crusher/crusher, ...)
-	hammer_synced = crusher
+/datum/status_effect/grouped/crusher_mark/on_apply()
 	marked_underlay = mutable_appearance('icons/effects/effects.dmi', "shield2")
 	marked_underlay.pixel_x = -owner.pixel_x
 	marked_underlay.pixel_y = -owner.pixel_y
-	owner.underlays += marked_underlay
+	owner.add_overlay(marked_underlay, TRUE)
 	return ..()
 
 /datum/status_effect/grouped/crusher_mark/on_remove()
-	hammer_synced = null
-	owner.underlays -= marked_underlay
+	owner.cut_overlay(marked_underlay, TRUE)
 	QDEL_NULL(marked_underlay)
 	return ..()

code/game/area/Off Station Areas.dm

@@ -53,7 +53,7 @@
 /area/triumph/surfacebase/north_stairs_one
 	name = "\improper North Stairwell First Floor"
 	icon_state = "dk_yellow"
-/area/triumph/surfacebase/north_staires_two
+/area/triumph/surfacebase/north_stairs_two
 	name = "\improper North Stairwell Second Floor"
 	icon_state = "dk_yellow"
 /area/triumph/surfacebase/north_stairs_three

code/game/area/Space Station 13 areas.dm

@@ -1014,7 +1014,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/maintenance/south
 	name = "\improper South Maintenance"
 
-/area/maintenance/public_garden_maintenence
+/area/maintenance/public_garden_maintenance
 	name = "\improper Public Garden Maintenance"
 
 /area/maintenance/elevator
@@ -2809,7 +2809,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	icon_state = "eva"
 
 /area/rnd/outpost/maintenance
-	name = "\improper Research Outpost Maintenence"
+	name = "\improper Research Outpost Maintenance"
 	area_flags = AREA_RAD_SHIELDED
 	sound_env = TUNNEL_ENCLOSED
 	turf_initializer = new /datum/turf_initializer/maintenance()

code/game/area/Tether_areas.dm

@@ -191,7 +191,7 @@
 /area/tether/surfacebase/north_stairs_one
 	name = "\improper North Stairwell First Floor"
 	icon_state = "dk_yellow"
-/area/tether/surfacebase/north_staires_two
+/area/tether/surfacebase/north_stairs_two
 	name = "\improper North Stairwell Second Floor"
 	icon_state = "dk_yellow"
 /area/tether/surfacebase/north_stairs_three
@@ -700,10 +700,10 @@
 	name = "\improper Solars Maintenance"
 /area/maintenance/lower/mining_eva
 	name = "\improper Mining EVA Maintenance"
-/area/maintenance/lower/public_garden_maintenence
-	name = "\improper Public Garden Maintenence"
-/area/maintenance/lower/public_garden_maintenence/upper
-	name = "\improper Upper Public Garden Maintenence"
+/area/maintenance/lower/public_garden_maintenance
+	name = "\improper Public Garden Maintenance"
+/area/maintenance/lower/public_garden_maintenance/upper
+	name = "\improper Upper Public Garden Maintenance"
 /area/maintenance/lower/medsec_maintenance
 	name = "\improper Surface MedSec Maintenance"
 

code/game/area/asteroid_areas.dm

@@ -229,7 +229,7 @@
 	name = "Research Outpost Anomaly Analysis"
 
 /area/outpost/research/exp_prep
-	name = "Research Outpost Expedition Preperation"
+	name = "Research Outpost Expedition Preparation"
 
 /area/outpost/research/disposal
 	name = "Research Outpost Waste Disposal"