Merge master and fix newline conflict.

2020-11-19 17:12:19 -06:00
parent be009f2e54 c1cecb651d
commit cfaa988217
453 changed files with 951 additions and 456 deletions
@@ -783,7 +783,8 @@
 	if(ispath(chosen, /turf))
 		T.ChangeTurf(chosen)
 	else
-		var/obj/structure/closet/supplypod/centcompod/pod = new()
+		var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas
+		var/obj/structure/closet/supplypod/centcompod/pod = new(pick(get_area_turfs(pod_storage_area))) //Lets just have it in the pod bay for a moment instead of runtiming
 		var/atom/A = new chosen(pod)
 		A.flags_1 |= ADMIN_SPAWNED_1
 		new /obj/effect/pod_landingzone(T, pod)
@@ -212,4 +212,4 @@
 	dat += build_antag_listing()

 	dat += "</body></html>"
-	usr << browse(dat.Join(), "window=roundstatus;size=500x500")
+	usr << browse(dat.Join(), "window=roundstatus;size=500x500")
@@ -8,4 +8,4 @@

 	var/datum/cinematic/choice = input(src,"Cinematic","Choose",null) as anything in subtypesof(/datum/cinematic)
 	if(choice)
-		Cinematic(initial(choice.id),world,null)
+		Cinematic(initial(choice.id),world,null)
@@ -41,4 +41,4 @@
 	message_admins("[key_name_admin(usr)] is changing the map to [VM.map_name]")
 	log_admin("[key_name(usr)] is changing the map to [VM.map_name]")
 	if (SSmapping.changemap(VM) == 0)
-		message_admins("[key_name_admin(usr)] has changed the map to [VM.map_name]")
+		message_admins("[key_name_admin(usr)] has changed the map to [VM.map_name]")
@@ -28,4 +28,4 @@ GLOBAL_VAR_INIT(highlander, FALSE)
 	addtimer(CALLBACK(src, .proc/only_one), 420)

 /mob/living/carbon/human/proc/make_scottish()
-	mind.add_antag_datum(/datum/antagonist/highlander)
+	mind.add_antag_datum(/datum/antagonist/highlander)
@@ -1347,7 +1347,8 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
 			new /obj/effect/immovablerod(startT, endT,target)
 		if(ADMIN_PUNISHMENT_SUPPLYPOD_QUICK)
 			var/target_path = input(usr,"Enter typepath of an atom you'd like to send with the pod (type \"empty\" to send an empty pod):" ,"Typepath","/obj/item/reagent_containers/food/snacks/grown/harebell") as null|text
-			var/obj/structure/closet/supplypod/centcompod/pod = new()
+			var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas
+			var/obj/structure/closet/supplypod/centcompod/pod = new(pick(get_area_turfs(pod_storage_area))) //Lets not runtime
 			pod.damage = 40
 			pod.explosionSize = list(0,0,0,2)
 			pod.effectStun = TRUE
@@ -27,4 +27,4 @@
 	if(!SSdbcore.Connect())
 		message_admins("Database connection failed: " + SSdbcore.ErrorMsg())
 	else
-		message_admins("Database connection re-established")
+		message_admins("Database connection re-established")
@@ -93,4 +93,4 @@

 	return "[header][item]</li>"

-#undef VV_HTML_ENCODE
+#undef VV_HTML_ENCODE
@@ -98,7 +98,7 @@
 					L.adjustFireLoss(amount)
 					newamt = L.getFireLoss()
 				if("toxin")
-					L.adjustToxLoss(amount)
+					L.adjustToxLoss(amount, toxins_type = TOX_OMNI)
 					newamt = L.getToxLoss()
 				if("oxygen")
 					L.adjustOxyLoss(amount)
@@ -16,4 +16,4 @@
 			continue
 		var/datum/team/T = A.get_team()
 		if(!team_type || istype(T,team_type))
-			. |= T
+			. |= T
@@ -50,4 +50,4 @@
 /datum/mind/proc/leave_all_antag_huds()
 	for(var/datum/atom_hud/antag/hud in GLOB.huds)
 		if(hud.hudusers[current])
-			hud.leave_hud(current)
+			hud.leave_hud(current)
@@ -52,4 +52,4 @@
 	user.temporarilyRemoveItemFromInventory(tool, TRUE)
 	var/obj/item/organ/heart/gland/gland = tool
 	gland.Insert(target, 2)
-	return 1
+	return 1
@@ -110,4 +110,4 @@
 		active = 0

 /obj/item/organ/heart/gland/proc/activate()
-	return
+	return
@@ -17,4 +17,4 @@
 /obj/item/organ/heart/gland/access/Remove(special = FALSE)
 	if(!QDELETED(owner))
 		UnregisterSignal(owner, COMSIG_MOB_ALLOWED)
-	return ..()
+	return ..()
@@ -15,4 +15,4 @@
 	var/mob/living/carbon/human/H = owner
 	var/datum/species/species = H.dna.species
 	to_chat(H, "<span class='warning'>You feel your blood heat up for a moment.</span>")
-	species.exotic_blood = get_random_reagent_id()
+	species.exotic_blood = get_random_reagent_id()
@@ -17,4 +17,4 @@
 	var/chem_to_add = pick(possible_reagents)
 	owner.reagents.add_reagent(chem_to_add, 2)
 	owner.adjustToxLoss(-5, TRUE, TRUE)
-	..()
+	..()
@@ -12,4 +12,4 @@
 /obj/item/organ/heart/gland/egg/activate()
 	owner.visible_message("<span class='alertalien'>[owner] [pick(EGG_LAYING_MESSAGES)]</span>")
 	var/turf/T = owner.drop_location()
-	new /obj/item/reagent_containers/food/snacks/egg/gland(T)
+	new /obj/item/reagent_containers/food/snacks/egg/gland(T)
@@ -24,4 +24,4 @@

 /obj/item/organ/heart/gland/electric/proc/zap()
 	tesla_zap(owner, 4, 8000, ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN)
-	playsound(get_turf(owner), 'sound/magic/lightningshock.ogg', 50, TRUE)
+	playsound(get_turf(owner), 'sound/magic/lightningshock.ogg', 50, TRUE)
@@ -175,4 +175,4 @@

 	var/obj/item/bodypart/chest/new_chest = new(null)
 	new_chest.replace_limb(owner, TRUE)
-	qdel(chest)
+	qdel(chest)
@@ -61,4 +61,4 @@
 		to_chat(H, "<span class='userdanger'>You feel the compulsion fade, and you <i>completely forget</i> about your previous orders.</span>")
 		H.clear_alert("mind_control")
 	active_mind_control = FALSE
-	return TRUE
+	return TRUE
@@ -19,4 +19,4 @@
 	var/turf/open/T = get_turf(owner)
 	if(istype(T))
 		T.atmos_spawn_air("plasma=50;TEMP=[T20C]")
-	owner.vomit()
+	owner.vomit()
@@ -44,4 +44,4 @@
 	if(active_mind_control)
 		to_chat(entangled_mob, "<span class='userdanger'>You feel the compulsion fade, and you completely forget about your previous orders.</span>")
 		entangled_mob.clear_alert("mind_control")
-	..()
+	..()
@@ -23,4 +23,4 @@

 	var/mob/living/simple_animal/slime/Slime = new(get_turf(owner), "grey")
 	Slime.Friends = list(owner)
-	Slime.Leader = owner
+	Slime.Leader = owner
@@ -11,4 +11,4 @@
 	to_chat(owner, "<span class='warning'>You feel something crawling in your skin.</span>")
 	owner.faction |= "spiders"
 	var/obj/structure/spider/spiderling/S = new(owner.drop_location())
-	S.directive = "Protect your nest inside [owner.real_name]."
+	S.directive = "Protect your nest inside [owner.real_name]."
@@ -12,4 +12,4 @@
 	to_chat(owner, "<span class='notice'>You feel unlike yourself.</span>")
 	randomize_human(owner)
 	var/species = pick(list(/datum/species/human, /datum/species/lizard, /datum/species/insect, /datum/species/fly))
-	owner.set_species(species)
+	owner.set_species(species)
@@ -9,4 +9,4 @@

 /obj/item/organ/heart/gland/ventcrawling/activate()
 	to_chat(owner, "<span class='notice'>You feel very stretchy.</span>")
-	owner.ventcrawler = VENTCRAWLER_ALWAYS
+	owner.ventcrawler = VENTCRAWLER_ALWAYS
@@ -31,4 +31,4 @@
 			var/datum/symptom/S = new chosen_symptom
 			A.symptoms += S
 	A.Refresh() //just in case someone already made and named the same disease
-	return A
+	return A
@@ -9,4 +9,4 @@
 /obj/structure/fluff/iced_abductor/Destroy()
 	var/turf/T = get_turf(src)
 	new /obj/effect/mob_spawn/human/abductor(T)
-	. = ..() 
+	. = ..() 
@@ -81,4 +81,4 @@


 /datum/antagonist/bloodsucker/proc/AssignRandomBane()
-	return
+	return
@@ -113,4 +113,4 @@
 	popup.set_content(dat)
 	popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
 	popup.open()
-*/
+*/
@@ -24,4 +24,4 @@
 /obj/effect/proc_holder/changeling/digitalcamo/on_refund(mob/user)
 	action.Remove(user)
 	user.digitalcamo = 0
-	user.digitalinvis = 0
+	user.digitalinvis = 0
@@ -57,4 +57,4 @@

 /obj/screen/alert/status_effect/agent_pinpointer/changeling
 	name = "Pheromone Scent"
-	desc = "The nose always knows."
+	desc = "The nose always knows."
@@ -22,4 +22,4 @@
 	if((is_servant_of_ratvar(user) || isobserver(user)) && clockwork_desc)
 		desc = clockwork_desc
 	. = ..()
-	desc = initial(desc)
+	desc = initial(desc)
@@ -48,4 +48,4 @@
 	plane = FLOOR_PLANE

 /obj/effect/clockwork/overlay/floor/bloodcult //this is used by BLOOD CULT, it shouldn't use such a path...
-	icon_state = "cult"
+	icon_state = "cult"
@@ -416,7 +416,7 @@

 /obj/effect/clockwork/sigil/rite
 	name = "radiant sigil"
-	desc = "A glowing sigil glowing with barely-contained power."
+	desc = "A sigil glowing with barely-contained power."
 	clockwork_desc = "A sigil that will allow you to perform certain rites on it, provided you have access to sufficient power and materials."
 	icon_state = "sigiltransmission" //am big lazy - recolored transmission sigil
 	sigil_name = "Sigil of Rites"
@@ -440,7 +440,8 @@
 		return
 	var/list/possible_rites = list()
 	for(var/datum/clockwork_rite/R in GLOB.all_clockwork_rites)
-		possible_rites[R] = R
+		if(is_servant_of_ratvar(user, require_full_power = TRUE) || !R.requires_full_power)
+			possible_rites[R] = R
 	var/input_key = input(user, "Choose a rite", "Choosing a rite") as null|anything in possible_rites
 	if(!input_key)
 		return
@@ -287,4 +287,4 @@
 		linked_gateway.visible_message("<span class='warning'>[linked_gateway] begins to destabilise!</span>")

 /obj/effect/clockwork/spatial_gateway/stable/pass_through_gateway(atom/movable/A, no_cost = TRUE)
-	return ..()
+	return ..()
@@ -6,12 +6,13 @@
 //The base clockwork rite. This should never be visible
 /datum/clockwork_rite
 	var/name = "Rite of THE frog" //The name of the rite
-	var/desc = "This rite is used to summon the legendary frog whose-name-shall-not-be-spoken, ender of many worlds." //What does this rite do? Shown to cultists if they choose 'Show Info' after selecting the rite.
+	var/desc = "This rite is used to summon the legendary frog whose-name-shall-not-be-spoken, ender of many worlds." //What does this rite do? Shown to servants if they choose 'Show Info' after selecting the rite.
 	var/list/required_ingredients = list(/obj/item/clockwork) //What does this rite require?
 	var/power_cost = 0 //How much power does this rite cost.. or does it even add power?
-	var/requires_human = FALSE	//Does the rite require a ../carbon/human on the rune?
+	var/requires_human = FALSE	//Does the rite require a ../carbon/human on the sigil?
 	var/must_be_servant = TRUE //If the above is true, does the human need to be a servant?
 	var/target_can_be_invoker = TRUE //Does this rite work if the invoker is also the target?
+	var/requires_full_power = FALSE //Does the invoker need to be an actual full-on servant, or is this available to neutered ones aswell?
 	var/cast_time = 0 //How long does the rite take to cast?
 	var/limit = INFINITE //How often can this rite be used per round? Set this to INFINITE for unlimited, 0 for disallowed, anything above 0 for a limit
 	var/times_used = 0 //How often has the rite already been used this shift?
@@ -99,7 +99,7 @@
 	else
 		..()

-/obj/item/clockwork/slab/cyborg/ratvar_act()
+/obj/item/clockwork/slab/cyborg/ui_act()
 	..()
 	if(!GLOB.ratvar_awakens)
 		SStgui.close_uis(src)
@@ -349,4 +349,4 @@
 	if(GLOB.ratvar_awakens)
 		portal_uses = max(portal_uses, 100) //Very powerful if Ratvar has been summoned
 		duration = max(duration, 100)
-	return slab.procure_gateway(invoker, duration, portal_uses)
+	return slab.procure_gateway(invoker, duration, portal_uses)
@@ -83,4 +83,4 @@
 	anchored = !anchored
 	to_chat(user, "<span class='notice'>You [anchored ? "secure" : "unsecure"] \the [src].</span>")
 	I.play_tool_sound(src)
-	return TRUE
+	return TRUE
@@ -17,4 +17,4 @@
 		return
 	audible_message("<i>*click*</i>")
 	playsound(src, 'sound/items/screwdriver2.ogg', 50, TRUE)
-	activate()
+	activate()
@@ -115,4 +115,4 @@
 	rune_word_type = /obj/effect/temp_visual/cult/rune_spawn/rune1
 	rune_innerring_type = /obj/effect/temp_visual/cult/rune_spawn/rune1/inner
 	rune_center_type = /obj/effect/temp_visual/cult/rune_spawn/rune1/center
-	rune_color = RUNE_COLOR_MEDIUMRED
+	rune_color = RUNE_COLOR_MEDIUMRED
@@ -35,4 +35,4 @@
 				DefaultCombatKnockdown(40)
 				qdel(weapon)
 				return 2
-	return 1
+	return 1
@@ -20,4 +20,4 @@
 	explanation_text = "You are the BEST thing on the station.  Make sure everyone knows it."

 /datum/objective/sintouched/acedia
-	explanation_text = "Angels, devils, good, evil... who cares?  Just ignore any hellish threats and do your job."
+	explanation_text = "Angels, devils, good, evil... who cares?  Just ignore any hellish threats and do your job."
@@ -105,7 +105,7 @@
 /mob/living/carbon/true_devil/assess_threat(judgement_criteria, lasercolor = "", datum/callback/weaponcheck=null)
 	return 666

-/mob/living/carbon/true_devil/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0)
+/mob/living/carbon/true_devil/flash_act(intensity = 1, override_blindness_check = 0, affect_silicon = 0, visual = 0, type = /obj/screen/fullscreen/flash, override_protection = 0)
 	if(mind && has_bane(BANE_LIGHT))
 		mind.disrupt_spells(-500)
 		return ..() //flashes don't stop devils UNLESS it's their bane.
@@ -6,4 +6,4 @@
 /datum/antagonist/magic_servant/proc/setup_master(mob/M)
 	var/datum/objective/O = new("Serve [M.real_name].")
 	O.owner = owner
-	objectives |= O
+	objectives |= O
@@ -178,4 +178,4 @@
 /obj/item/borg_chameleon/proc/disrupt(mob/living/silicon/robot/user)
 	if(active)
 		to_chat(user, "<span class='danger'>Your chameleon field deactivates.</span>")
-		deactivate(user)
+		deactivate(user)
@@ -28,4 +28,4 @@
 	santa_objective.explanation_text = "Bring joy and presents to the station!"
 	santa_objective.completed = 1 //lets cut our santas some slack.
 	santa_objective.owner = owner
-	objectives |= santa_objective
+	objectives |= santa_objective
@@ -16,4 +16,4 @@
 	return nation

 /datum/antagonist/separatist/greet()
-	to_chat(owner, "<B>You are a separatist! [nation.name] forever! Protect the sovereignty of your newfound land with your comrades in arms!</B>")
+	to_chat(owner, "<B>You are a separatist! [nation.name] forever! Protect the sovereignty of your newfound land with your comrades in arms!</B>")
@@ -187,8 +187,8 @@

 	partner_outfit.equip(partner)

-	var/obj/structure/closet/supplypod/arrival_pod = new()
-
+	var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas
+	var/obj/structure/closet/supplypod/arrival_pod = new(pick(get_area_turfs(pod_storage_area)))
 	arrival_pod.style = STYLE_SYNDICATE
 	arrival_pod.explosionSize = list(0,0,0,1)
 	arrival_pod.bluespace = TRUE
@@ -59,7 +59,8 @@

 // Launch the pod to collect our victim.
 /datum/syndicate_contract/proc/launch_extraction_pod(turf/empty_pod_turf)
-	var/obj/structure/closet/supplypod/extractionpod/empty_pod = new()
+	var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas
+	var/obj/structure/closet/supplypod/extractionpod/empty_pod = new(pick(get_area_turfs(pod_storage_area))) //Lets not runtime

 	RegisterSignal(empty_pod, COMSIG_ATOM_ENTERED, .proc/enter_check)

@@ -180,8 +181,8 @@

 	if(possible_drop_loc.len > 0)
 		var/pod_rand_loc = rand(1, possible_drop_loc.len)
-
-		var/obj/structure/closet/supplypod/return_pod = new()
+		var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas
+		var/obj/structure/closet/supplypod/return_pod = new(pick(get_area_turfs(pod_storage_area)))
 		return_pod.bluespace = TRUE
 		return_pod.explosionSize = list(0,0,0,0)
 		return_pod.style = STYLE_SYNDICATE
@@ -16,4 +16,4 @@

 /datum/antagonist/heartbreaker/greet()
 	to_chat(owner, "<span class='warning'><B>You didn't get a date! They're all having fun without you! you'll show them though...</B></span>")
-	owner.announce_objectives()
+	owner.announce_objectives()
@@ -249,7 +249,7 @@
 	S.name = "Shade of [T.real_name]"
 	S.real_name = "Shade of [T.real_name]"
 	T.transfer_ckey(S)
-	S.original_mind = T.mind.current
+	S.original_mind = T.mind
 	S.copy_languages(T, LANGUAGE_MIND)//Copies the old mobs languages into the new mob holder.
 	S.update_atom_languages()
 	grant_all_languages(FALSE, FALSE, TRUE)	//Grants omnitongue
@@ -134,4 +134,4 @@
 	toggle_visibility(D.features["breasts_visibility"], FALSE)

 #undef BREASTS_ICON_MIN_SIZE
-#undef BREASTS_ICON_MAX_SIZE
+#undef BREASTS_ICON_MAX_SIZE
@@ -106,4 +106,4 @@
 	diameter_ratio = D.features["cock_diameter_ratio"]
 	shape = D.features["cock_shape"]
 	prev_length = length
-	toggle_visibility(D.features["cock_visibility"], FALSE)
+	toggle_visibility(D.features["cock_visibility"], FALSE)
@@ -13,4 +13,4 @@ Name:	IsAssemblyHolder
 Desc:	If true is an object that can hold an assemblyholder object
 */
 /obj/proc/IsAssemblyHolder()
-	return FALSE
+	return FALSE
@@ -48,4 +48,4 @@

 /obj/item/assembly/playback/toggle_secure()
 	. = ..()
-	listening = FALSE
+	listening = FALSE
@@ -336,4 +336,4 @@
 	return TRUE

 /obj/machinery/atmospherics/proc/update_layer()
-	layer = initial(layer) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE
+	layer = initial(layer) + (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE
@@ -106,4 +106,4 @@ It's like a regular ol' straight pipe, but you can turn it on and off.

 /obj/machinery/atmospherics/components/binary/valve/digital/on/layer3
 	piping_layer = 3
-	icon_state = "dvalve_map-3"
+	icon_state = "dvalve_map-3"
@@ -170,4 +170,4 @@

 /obj/machinery/atmospherics/components/analyzer_act(mob/living/user, obj/item/I)
 	atmosanalyzer_scan(airs, user, src)
-	return TRUE
+	return TRUE
@@ -42,4 +42,4 @@

 /obj/machinery/atmospherics/pipe/heat_exchanging/junction/layer3
 	piping_layer = 3
-	icon_state = "pipe11-3"
+	icon_state = "pipe11-3"
@@ -35,4 +35,4 @@

 /obj/machinery/atmospherics/pipe/heat_exchanging/simple/layer3
 	piping_layer = 3
-	icon_state = "pipe11-3"
+	icon_state = "pipe11-3"
@@ -38,4 +38,4 @@
 		if(nodes[i])
 			add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) )
 	update_layer()
-	update_alpha()
+	update_alpha()
@@ -36,4 +36,4 @@
 		if(nodes[i])
 			add_overlay( getpipeimage(icon, "pipe-[piping_layer]", get_dir(src, nodes[i])) )
 	update_layer()
-	update_alpha()
+	update_alpha()
@@ -30,4 +30,4 @@
 /obj/machinery/atmospherics/pipe/simple/update_icon()
 	icon_state = "pipe[nodes[1] ? "1" : "0"][nodes[2] ? "1" : "0"]-[piping_layer]"
 	update_layer()
-	update_alpha()
+	update_alpha()
@@ -26,4 +26,4 @@ obj/machinery/atmospherics/pipe/simple/multiz ///This is an atmospherics pipe wh
 		above.nodes += src //Two way travel :)
 		return ..()
 	else
-		return ..()
+		return ..()
@@ -27,4 +27,4 @@
 /obj/effect/wind/process()
 	var/turf/open/T = get_turf(src)
 	if(istype(T))
-		T.consider_pressure_difference(get_step(T,dir),strength)
+		T.consider_pressure_difference(get_step(T,dir),strength)
@@ -10,4 +10,4 @@
 	new /obj/item/implantcase/exile(src)
 	new /obj/item/implantcase/exile(src)
 	new /obj/item/implantcase/exile(src)
-	new /obj/item/implantcase/exile(src)
+	new /obj/item/implantcase/exile(src)
@@ -155,4 +155,4 @@
 	endTurfX = 159
 	endTurfY = 157
 	startTurfX = 37
-	startTurfY = 35
+	startTurfY = 35
@@ -60,4 +60,4 @@
 	teams never did figure out what happened that last time... and I can't wrap my head \
 	around it myself. Why would a shuttle full of evacuees all snap and beat each other \
 	to death the moment they reached safety?<br>\
-	- D. Cereza"
+	- D. Cereza"
@@ -41,4 +41,4 @@
 	rare_pet_monkey_names = list("Sun Mukong", "Monkey Kong")

 /mob/living/simple_animal/hostile/jungle/leaper/boss
-	health = 450
+	health = 450
@@ -150,4 +150,4 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
 		mezzer()

 /obj/singularity/narsie/mini/ex_act()
-	return
+	return
@@ -65,4 +65,4 @@ BSQL_DEL_PROC(/datum/BSQL_Connection)
 		return null;
 	. = world._BSQL_Internal_Call("QuoteString", id, "[str]")
 	if(!.)
-		BSQL_ERROR("Library failed to provide quote for [str]!")
+		BSQL_ERROR("Library failed to provide quote for [str]!")
@@ -88,4 +88,4 @@
 			deselect_region()
 	return

-/datum/buildmode_mode/proc/handle_selected_area(client/c, params)
+/datum/buildmode_mode/proc/handle_selected_area(client/c, params)
@@ -158,4 +158,4 @@
 	
 #undef BM_SWITCHSTATE_NONE
 #undef BM_SWITCHSTATE_MODE
-#undef BM_SWITCHSTATE_DIR
+#undef BM_SWITCHSTATE_DIR
@@ -86,4 +86,4 @@

 /obj/screen/buildmode/quit/Click()
 	bd.quit()
-	return 1
+	return 1
@@ -25,4 +25,4 @@
 			cl.images -= I
 			cl = null
 		QDEL_NULL(I)
-	return ..()
+	return ..()
@@ -59,4 +59,4 @@
 				else
 					var/obj/A = new objholder(T)
 					A.setDir(BM.build_dir)
-			log_admin("Build Mode: [key_name(c)] with path [objholder], filled the region from [AREACOORD(cornerA)] through [AREACOORD(cornerB)]")
+			log_admin("Build Mode: [key_name(c)] with path [objholder], filled the region from [AREACOORD(cornerA)] through [AREACOORD(cornerB)]")
@@ -45,4 +45,4 @@
 		var/confirm = alert("Are you sure you want run the map generator?", "Run generator", "Yes", "No")
 		if(confirm == "Yes")
 			G.generate()
-		log_admin("Build Mode: [key_name(c)] ran the map generator '[G.buildmode_name]' in the region from [AREACOORD(cornerA)] to [AREACOORD(cornerB)]")
+		log_admin("Build Mode: [key_name(c)] ran the map generator '[G.buildmode_name]' in the region from [AREACOORD(cornerA)] to [AREACOORD(cornerB)]")
@@ -227,4 +227,4 @@
 	wanted_types = list(/obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate)
 	multiplier = 6
 	bonus_desc = "Under no circumstances mention this shipment to security."
-	foodtype = "\"meal\""
+	foodtype = "\"meal\""
@@ -136,4 +136,4 @@
 	description = "There's a debate around command as to weather or not ribs should be considered finger food, and we need a few delicious racks to process."
 	reward = 2250
 	required_count = 3
-	wanted_types = list(/obj/item/reagent_containers/food/snacks/bbqribs)
+	wanted_types = list(/obj/item/reagent_containers/food/snacks/bbqribs)
@@ -62,4 +62,4 @@
 	description = "Apparently people are putting vegetables on kebabs now. Central Command has taken an interest in this turn of events and would like to know more."
 	reward = 2600
 	required_count = 3
-	wanted_types = list(/obj/item/reagent_containers/food/snacks/kebab/fiesta)
+	wanted_types = list(/obj/item/reagent_containers/food/snacks/kebab/fiesta)
@@ -72,7 +72,7 @@
 		holder = user_mob.client //if its a mob, assign the mob's client to holder
 	bay =  locate(/area/centcom/supplypod/loading/one) in GLOB.sortedAreas //Locate the default bay (one) from the centcom map
 	bayNumber = bay.loading_id //Used as quick reference to what bay we're taking items from
-	var/area/pod_storage_area = locate(/area/centcom/supplypod/pod_storage) in GLOB.sortedAreas
+	var/area/pod_storage_area = locate(/area/centcom/supplypod/podStorage) in GLOB.sortedAreas
 	temp_pod = new(pick(get_area_turfs(pod_storage_area))) //Create a new temp_pod in the podStorage area on centcom (so users are free to look at it and change other variables if needed)
 	orderedArea = createOrderedArea(bay) //Order all the turfs in the selected bay (top left to bottom right) to a single list. Used for the "ordered" mode (launchChoice = 1)
 	selector = new(null, holder.mob)
@@ -638,7 +638,7 @@
 	refreshView()

 /area/centcom/supplypod/pod_storage/Initialize(mapload) //temp_pod holding area
-	. = ..() 
+	. = ..()
 	var/obj/imgbound = locate() in locate(200,SUPPLYPOD_X_OFFSET*-4.5, 1)
 	call(GLOB.podlauncher, "RegisterSignal")(imgbound, "ct[GLOB.podstyles[14][9]]", "[GLOB.podstyles[14][10]]dlauncher")

@@ -702,10 +702,11 @@
 /datum/centcom_podlauncher/proc/launch(turf/target_turf) //Game time started
 	if (isnull(target_turf))
 		return
-	var/obj/structure/closet/supplypod/centcompod/toLaunch = DuplicateObject(temp_pod) //Duplicate the temp_pod (which we have been varediting or configuring with the UI) and store the result
+	var/obj/structure/closet/supplypod/centcompod/toLaunch = DuplicateObject(temp_pod, sameloc = TRUE) //Duplicate the temp_pod (which we have been varediting or configuring with the UI) and store the result
 	toLaunch.update_icon()//we update_icon() here so that the door doesnt "flicker on" right after it lands
-	var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/supplypod_temp_holding]
-	toLaunch.forceMove(shippingLane)
+	//We don't have this area, lets just have it where we had the temp pod
+	//var/shippingLane = GLOB.areas_by_type[/area/centcom/supplypod/supplypod_temp_holding]
+	//toLaunch.forceMove(shippingLane)
 	if (launchClone) //We arent launching the actual items from the bay, rather we are creating clones and launching those
 		if(launchRandomItem)
 			var/launch_candidate = pick_n_take(launchList)
@@ -100,4 +100,4 @@
 /datum/export/material/runite
 	cost = 300
 	message = "cm3 of runite"
-	material_id = /datum/material/runite
+	material_id = /datum/material/runite
@@ -11,7 +11,7 @@
 	allow_dense = TRUE
 	delivery_icon = null
 	can_weld_shut = FALSE
-	armor = list(MELEE = 30, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 100, BIO = 0, RAD = 0, FIRE = 100, ACID = 80)
+	armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 100, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80)
 	anchored = TRUE //So it cant slide around after landing
 	anchorable = FALSE
 	flags_1 = PREVENT_CONTENTS_EXPLOSION_1
@@ -167,7 +167,7 @@
 				. += decal
 			return
 		else if (GLOB.podstyles[style][POD_SHAPE] != POD_SHAPE_NORML) //If we're not a normal pod shape (aka, if we don't have fins), just add the door without masking
-			. += door	
+			. += door
 		else
 			var/icon/masked_door = new(icon, door) //The door we want to apply
 			var/icon/fin_masker = new(icon, "mask_[fin_mask]") //The fin shape we want to 'cut out' of the door
@@ -7,4 +7,4 @@ GLOBAL_LIST_EMPTY(clientmessages)
 	var/list/L = GLOB.clientmessages[ckey]
 	if(!L)
 		GLOB.clientmessages[ckey] = L = list()
-	L += message
+	L += message
@@ -3,4 +3,4 @@
 	var/list/logging = list()
 	var/list/post_login_callbacks = list()
 	var/list/post_logout_callbacks = list()
-	var/byond_version = "Unknown"
+	var/byond_version = "Unknown"
@@ -87,4 +87,4 @@
 		msg += "<span class='info'>Adminhelps are also sent to Discord. If no admins are available in game adminhelp anyways and an admin on Discord will see it and respond.</span>"
 	to_chat(src, msg)

-*/
+*/
@@ -42,4 +42,4 @@

 // Called just before an attack_hand(), in mob/UnarmedAttack()
 /obj/item/clothing/gloves/proc/Touch(atom/A, proximity)
-	return FALSE // return TRUE to cancel attack_hand()
+	return FALSE // return TRUE to cancel attack_hand()
@@ -61,4 +61,4 @@
 	..()
 	if(ismob(loc))
 		var/mob/M = loc
-		M.update_inv_head()
+		M.update_inv_head()
@@ -80,4 +80,4 @@
 	icon_state = "waldo_hat"
 	item_state = "waldo_hat"

-//No dog fashion sprites yet :(  poor Ian can't be dope like the rest of us yet
+//No dog fashion sprites yet :(  poor Ian can't be dope like the rest of us yet
@@ -167,4 +167,4 @@
 /obj/item/clothing/head/hardhat/weldhat/dblue
 	icon_state = "hardhat0_dblue"
 	item_state = "hardhat0_dblue"
-	hat_type = "dblue"
+	hat_type = "dblue"
@@ -161,4 +161,4 @@

 	head = /obj/item/clothing/head/helmet/space/plasmaman/clown
 	uniform = /obj/item/clothing/under/plasmaman/clown
-	mask = /obj/item/clothing/mask/gas/clown_hat
+	mask = /obj/item/clothing/mask/gas/clown_hat
@@ -46,4 +46,4 @@

 /obj/item/paper/fluff/vr/fluke_ops
 	name = "Where is my uplink?"
-	info = "Use the radio in your backpack."
+	info = "Use the radio in your backpack."
@@ -140,4 +140,4 @@
 	if(id_slot)
 		var/obj/item/card/id/card = id_slot.GetID()
 		if(istype(card))
-			card.access |= stored_access
+			card.access |= stored_access
@@ -60,4 +60,4 @@
 		to_chat(user, "<span class='warning'>You need bananium to turn the prototype shoes on!</span>")

 /obj/item/clothing/shoes/clown_shoes/banana_shoes/update_icon_state()
-	icon_state = "clown_prototype_[on? "on" : "off"]"
+	icon_state = "clown_prototype_[on? "on" : "off"]"
@@ -33,4 +33,4 @@
 		for(var/spell in spells)
 			var/obj/effect/proc_holder/spell/S = spell
 			H.mind.spell_list.Remove(S)
-			qdel(S)
+			qdel(S)
@@ -1,2 +1,2 @@
 /obj/item/proc/get_item_credit_value()
-	return
+	return
@@ -13,4 +13,4 @@


 /datum/round_event/grid_check/start()
-	power_fail(30, 120)
+	power_fail(30, 120)
@@ -61,4 +61,4 @@
 				temp.prison_open()
 			else if(istype(O, /obj/machinery/door_timer))
 				var/obj/machinery/door_timer/temp = O
-				temp.timer_end(forced = TRUE)
+				temp.timer_end(forced = TRUE)
--- a/Show More
+++ b/Show More