Merge remote-tracking branch 'upstream/master' into rename-organs

_maps/map_files/cyberiad/cyberiad.dmm

@@ -5205,10 +5205,7 @@
 	pixel_x = 0;
 	pixel_y = 10
 	},
-/obj/item/stock_parts/cell/high{
-	charge = 100;
-	maxcharge = 15000
-	},
+/obj/item/stock_parts/cell/high/plus,
 /obj/effect/decal/warning_stripes/east,
 /obj/item/clothing/glasses/welding,
 /obj/item/radio/intercom/department/security{
@@ -24484,14 +24481,8 @@
 "aRZ" = (
 /obj/structure/table,
 /obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high{
-	charge = 100;
-	maxcharge = 15000
-	},
-/obj/item/stock_parts/cell/high{
-	charge = 100;
-	maxcharge = 15000
-	},
+/obj/item/stock_parts/cell/high/plus,
+/obj/item/stock_parts/cell/high/plus,
 /turf/simulated/floor/plating,
 /area/maintenance/electrical)
 "aSa" = (
@@ -49466,10 +49457,7 @@
 "bNN" = (
 /obj/structure/table,
 /obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high{
-	charge = 100;
-	maxcharge = 15000
-	},
+/obj/item/stock_parts/cell/high/plus,
 /obj/item/radio/intercom{
 	frequency = 1459;
 	name = "station intercom (General)";
@@ -50524,13 +50512,8 @@
 	pixel_x = -8;
 	pixel_y = 4
 	},
-/obj/item/stock_parts/cell/high{
-	charge = 100;
-	maxcharge = 15000
-	},
-/obj/item/stock_parts/cell/high{
-	charge = 100;
-	maxcharge = 15000;
+/obj/item/stock_parts/cell/high/plus,
+/obj/item/stock_parts/cell/high/plus{
 	pixel_x = 5;
 	pixel_y = -5
 	},
@@ -53785,10 +53768,7 @@
 "bUQ" = (
 /obj/structure/table,
 /obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high{
-	charge = 100;
-	maxcharge = 15000
-	},
+/obj/item/stock_parts/cell/high/plus,
 /turf/simulated/floor/plasteel{
 	icon_state = "white"
 	},
@@ -70403,10 +70383,7 @@
 "cvA" = (
 /obj/structure/table,
 /obj/item/plant_analyzer,
-/obj/item/stock_parts/cell/high{
-	charge = 100;
-	maxcharge = 15000
-	},
+/obj/item/stock_parts/cell/high/plus,
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "cvB" = (
@@ -74447,10 +74424,7 @@
 	pixel_y = 3
 	},
 /obj/item/stack/cable_coil,
-/obj/item/stock_parts/cell/high{
-	charge = 100;
-	maxcharge = 15000
-	},
+/obj/item/stock_parts/cell/high/plus,
 /turf/simulated/floor/plating,
 /area/storage/tech)
 "cCP" = (
@@ -84452,14 +84426,8 @@
 /obj/item/rcd_ammo,
 /obj/item/rcd_ammo,
 /obj/item/rcd_ammo,
-/obj/item/stock_parts/cell/high{
-	charge = 100;
-	maxcharge = 15000
-	},
-/obj/item/stock_parts/cell/high{
-	charge = 100;
-	maxcharge = 15000
-	},
+/obj/item/stock_parts/cell/high/plus,
+/obj/item/stock_parts/cell/high/plus,
 /obj/item/clothing/glasses/meson{
 	pixel_y = 4
 	},
@@ -85173,10 +85141,7 @@
 	},
 /obj/item/airlock_electronics,
 /obj/item/airlock_electronics,
-/obj/item/stock_parts/cell/high{
-	charge = 100;
-	maxcharge = 15000
-	},
+/obj/item/stock_parts/cell/high/plus,
 /obj/effect/decal/warning_stripes/west,
 /turf/simulated/floor/plating,
 /area/storage/secure)
@@ -88466,14 +88431,8 @@
 "dbO" = (
 /obj/structure/table/reinforced,
 /obj/machinery/cell_charger,
-/obj/item/stock_parts/cell/high{
-	charge = 100;
-	maxcharge = 15000
-	},
-/obj/item/stock_parts/cell/high{
-	charge = 100;
-	maxcharge = 15000
-	},
+/obj/item/stock_parts/cell/high/plus,
+/obj/item/stock_parts/cell/high/plus,
 /obj/item/stack/cable_coil{
 	pixel_x = 3;
 	pixel_y = -7

code/datums/supplypacks.dm

@@ -1422,7 +1422,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	name = "Shaft Miner Starter Kit"
 	cost = 30
 	access = access_qm
-	contains = list(/obj/item/storage/backpack/duffel/mining_conscript/noid)
+	contains = list(/obj/item/storage/backpack/duffel/mining_conscript)
 	containertype = /obj/structure/closet/crate/secure
 	containername = "shaft miner starter kit"
 
@@ -1951,4 +1951,4 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 	name = "Chinese Supply Crate"
 	contains = list(/obj/item/vending_refill/chinese)
 	cost = 15
-	containername = "chinese supply crate"
+	containername = "chinese supply crate"

code/game/gamemodes/changeling/powers/revive.dm

@@ -57,6 +57,7 @@
 	user.update_blind_effects()
 	user.update_blurry_effects()
 	user.mind.changeling.regenerating = FALSE
+	user.UpdateAppearance() //Ensures that the user's appearance matches their DNA.
 
 	to_chat(user, "<span class='notice'>We have regenerated.</span>")
 

code/game/gamemodes/miniantags/abduction/abduction_surgery.dm

@@ -1,5 +1,5 @@
 /datum/surgery/organ_extraction
-	name = "experimental dissection"
+	name = "Experimental Dissection"
 	steps = list(/datum/surgery_step/generic/cut_open, /datum/surgery_step/generic/clamp_bleeders, /datum/surgery_step/generic/retract_skin, /datum/surgery_step/open_encased/saw, /datum/surgery_step/open_encased/retract, /datum/surgery_step/internal/extract_organ, /datum/surgery_step/internal/gland_insert, /datum/surgery_step/generic/cauterize)
 	possible_locs = list("chest")
 
@@ -19,32 +19,31 @@
 		return TRUE
 	return FALSE
 
-
 /datum/surgery_step/internal/extract_organ
 	name = "remove heart"
 	accept_hand = 1
 	time = 32
 	var/obj/item/organ/internal/IC = null
-	var/list/organ_types = list(/obj/item/organ/internal/heart)
 
 /datum/surgery_step/internal/extract_organ/begin_step(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	for(var/obj/item/I in target.internal_organs)
-		if(I.type in organ_types)
+		// Allows for multiple subtypes of heart.
+		if(istype(I, /obj/item/organ/internal/heart))
 			IC = I
 			break
 	user.visible_message("[user] starts to remove [target]'s organs.", "<span class='notice'>You start to remove [target]'s organs...</span>")
 	..()
 
 /datum/surgery_step/internal/extract_organ/end_step(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
 	var/mob/living/carbon/human/AB = target
-	if(NO_INTORGANS in AB.dna.species.species_traits)
-		user.visible_message("[user] prepares [target]'s [target_zone] for further dissection!", "<span class='notice'>You prepare [target]'s [target_zone] for further dissection.</span>")
-		return TRUE
 	if(IC)
 		user.visible_message("[user] pulls [IC] out of [target]'s [target_zone]!", "<span class='notice'>You pull [IC] out of [target]'s [target_zone].</span>")
 		user.put_in_hands(IC)
 		IC.remove(target, special = 1)
 		return TRUE
+	if(NO_INTORGANS in AB.dna.species.species_traits)
+		user.visible_message("[user] prepares [target]'s [target_zone] for further dissection!", "<span class='notice'>You prepare [target]'s [target_zone] for further dissection.</span>")
+		return TRUE
 	else
 		to_chat(user, "<span class='warning'>You don't find anything in [target]'s [target_zone]!</span>")
 		return TRUE
@@ -76,7 +75,7 @@
 //IPC Gland Surgery//
 
 /datum/surgery/organ_extraction/synth
-	name = "experimental robotic dissection"
+	name = "Experimental Robotic Dissection"
 	steps = list(/datum/surgery_step/robotics/external/unscrew_hatch,/datum/surgery_step/robotics/external/open_hatch,/datum/surgery_step/internal/extract_organ/synth,/datum/surgery_step/internal/gland_insert,/datum/surgery_step/robotics/external/close_hatch)
 	possible_locs = list("chest")
 	requires_organic_bodypart = 0
@@ -99,4 +98,3 @@
 
 /datum/surgery_step/internal/extract_organ/synth
 	name = "remove cell"
-	organ_types = list(/obj/item/organ/internal/cell)

code/game/gamemodes/miniantags/abduction/gland.dm

@@ -3,6 +3,7 @@
 	desc = "A nausea-inducing hunk of twisting flesh and metal."
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "gland"
+	dead_icon = null
 	status = ORGAN_ROBOT
 	origin_tech = "materials=4;biotech=7;abductor=3"
 	beating = TRUE
@@ -18,6 +19,9 @@
 	var/mind_control_duration = 1800
 	var/active_mind_control = FALSE
 
+/obj/item/organ/internal/heart/gland/update_icon()
+	return
+
 /obj/item/organ/internal/heart/gland/proc/ownerCheck()
 	if(ishuman(owner))
 		return TRUE

code/game/mecha/equipment/tools/mining_tools.dm

@@ -82,7 +82,7 @@
 	drill.move_ores()
 
 /obj/item/mecha_parts/mecha_equipment/drill/proc/move_ores()
-	if(locate(/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp) in chassis.equipment && istype(chassis, /obj/mecha/working/ripley))
+	if((locate(/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp) in chassis.equipment) && istype(chassis, /obj/mecha/working/ripley))
 		var/obj/mecha/working/ripley/R = chassis //we could assume that it's a ripley because it has a clamp, but that's ~unsafe~ and ~bad practice~
 		R.collect_ore()
 

code/game/objects/effects/spawners/lootdrop.dm

@@ -348,8 +348,8 @@
 		return
 	var/lootspawn = pickweight(loot)
 	var/obj/vehicle/V = new lootspawn(get_turf(src))
-	if(V.keytype)
-		new V.keytype(get_turf(src))
+	if(V.key_type)
+		new V.key_type(get_turf(src))
 	qdel(src)
 
 

code/game/objects/items/devices/camera_bug.dm

@@ -78,11 +78,9 @@
 				continue
 			if(length(list("SS13","MINE")&camera.network))
 				bugged_cameras[camera.c_tag] = camera
-	sortList(bugged_cameras)
+	sortTim(bugged_cameras, /proc/cmp_text_asc)
 	return bugged_cameras
 
-
-
 /obj/item/camera_bug/proc/menu(var/list/cameras)
 	if(!cameras || !cameras.len)
 		return "No bugged cameras found."

code/game/objects/items/weapons/storage/backpack.dm

@@ -359,19 +359,19 @@
 	new /obj/item/ammo_box/magazine/m12g/buckshot(src)
 	new /obj/item/ammo_box/magazine/m12g/dragon(src)
 
-/obj/item/storage/backpack/duffel/mining_conscript/noid
+/obj/item/storage/backpack/duffel/mining_conscript/
 	name = "mining conscription kit"
 	desc = "A kit containing everything a crewmember needs to support a shaft miner in the field."
 
-/obj/item/storage/backpack/duffel/mining_conscript/noid/New()
+/obj/item/storage/backpack/duffel/mining_conscript/New()
 	..()
 	new /obj/item/pickaxe(src)
 	new /obj/item/clothing/glasses/meson(src)
 	new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
 	new /obj/item/storage/bag/ore(src)
 	new /obj/item/clothing/under/rank/miner/lavaland(src)
 	new /obj/item/encryptionkey/headset_cargo(src)
-	new /obj/item/clothing/mask/gas(src)
+	new /obj/item/clothing/mask/gas/explorer(src)
 
 
 /obj/item/storage/backpack/duffel/syndie/ammo/smg

code/modules/events/anomaly_bluespace.dm

@@ -43,9 +43,10 @@
 				var/y_distance = TO.y - FROM.y
 				var/x_distance = TO.x - FROM.x
 				for(var/atom/movable/A in range(12, FROM )) // iterate thru list of mobs in the area
-					if(istype(A, /obj/item/radio/beacon)) continue // don't teleport beacons because that's just insanely stupid
-					if(A.anchored) continue
-
+					if(istype(A, /obj/item/radio/beacon)) // don't teleport beacons because that's just insanely stupid
+						continue 
+					if(A.anchored || A.move_resist == INFINITY)
+						continue
 					var/turf/newloc = locate(A.x + x_distance, A.y + y_distance, TO.z) // calculate the new place
 					if(!A.Move(newloc)) // if the atom, for some reason, can't move, FORCE them to move! :) We try Move() first to invoke any movement-related checks the atom needs to perform after moving
 						A.loc = locate(A.x + x_distance, A.y + y_distance, TO.z)

code/modules/mining/lavaland/loot/tendril_loot.dm

@@ -163,7 +163,7 @@
 	desc = "A boat used for traversing lava."
 	icon_state = "goliath_boat"
 	icon = 'icons/obj/lavaland/dragonboat.dmi'
-	keytype = /obj/item/oar
+	held_key_type = /obj/item/oar
 	burn_state = LAVA_PROOF
 
 /obj/vehicle/lavaboat/relaymove(mob/user, direction)
@@ -174,7 +174,7 @@
 		..()
 	else
 		to_chat(user, "<span class='warning'>Boats don't go on land!</span>")
-		return 0
+		return FALSE
 
 /obj/item/oar
 	name = "oar"
@@ -218,7 +218,7 @@
 /obj/vehicle/lavaboat/dragon
 	name = "mysterious boat"
 	desc = "This boat moves where you will it, without the need for an oar."
-	keytype = null
+	held_key_type = null
 	icon_state = "dragon_boat"
 	generic_pixel_y = 2
 	generic_pixel_x = 1

code/modules/mining/machine_vending.dm

@@ -36,7 +36,7 @@
 		new /datum/data/mining_equipment("Fulton Pack",					/obj/item/extraction_pack,											1000),
 		new /datum/data/mining_equipment("Lazarus Injector",			/obj/item/lazarus_injector,											1000),
 		new /datum/data/mining_equipment("Silver Pickaxe",				/obj/item/pickaxe/silver,											1000),
-		new /datum/data/mining_equipment("Mining Conscription Kit",		/obj/item/storage/backpack/duffel/mining_conscript,					1500),
+		new /datum/data/mining_equipment("Mining Conscription Kit",		/obj/item/storage/backpack/duffel/mining_conscript/full,					1500),
 		new /datum/data/mining_equipment("Jetpack Upgrade",				/obj/item/tank/jetpack/suit,										2000),
 		new /datum/data/mining_equipment("Mining Hardsuit",				/obj/item/clothing/suit/space/hardsuit/mining,						2000),
 		new /datum/data/mining_equipment("Diamond Pickaxe",				/obj/item/pickaxe/diamond,											2000),
@@ -235,7 +235,7 @@
 			new /obj/item/extinguisher/mini(drop_location)
 			new /obj/item/twohanded/kinetic_crusher(drop_location)
 		if("Mining Conscription Kit")
-			new /obj/item/storage/backpack/duffel/mining_conscript(drop_location)
+			new /obj/item/storage/backpack/duffel/mining_conscript/full(drop_location)
 
 	qdel(voucher)
 
@@ -293,19 +293,14 @@
 		to_chat(user, "You upgrade [I] with mining access.")
 		qdel(src)
 
-/obj/item/storage/backpack/duffel/mining_conscript
+/obj/item/storage/backpack/duffel/mining_conscript/full
 	name = "mining conscription kit"
 	desc = "A kit containing everything a crewmember needs to support a shaft miner in the field."
 
-/obj/item/storage/backpack/duffel/mining_conscript/New()
+/obj/item/storage/backpack/duffel/mining_conscript/full/New()
 	..()
-	new /obj/item/clothing/glasses/meson(src)
-	new /obj/item/t_scanner/adv_mining_scanner/lesser(src)
-	new /obj/item/storage/bag/ore(src)
 	new /obj/item/clothing/suit/hooded/explorer(src)
-	new /obj/item/encryptionkey/headset_cargo(src)
-	new /obj/item/clothing/mask/gas/explorer(src)
 	new /obj/item/card/id/mining_access_card(src)
 	new /obj/item/gun/energy/kinetic_accelerator(src)
 	new /obj/item/kitchen/knife/combat/survival(src)
-	new /obj/item/flashlight/seclite(src)
+	new /obj/item/flashlight/seclite(src)

code/modules/mob/living/carbon/human/species/slime.dm

@@ -20,7 +20,7 @@
 	cold_level_3 = 200
 	coldmod = 3
 
-	brain_mod = 2.5
+	brain_mod = 1.5
 
 	male_cough_sounds = list('sound/effects/slime_squish.ogg')
 	female_cough_sounds = list('sound/effects/slime_squish.ogg')

code/modules/mob/living/silicon/robot/drone/drone.dm

@@ -13,7 +13,7 @@
 	braintype = "Robot"
 	lawupdate = 0
 	density = 0
-	req_access = list(access_engine, access_robotics)
+	req_one_access = list(access_engine, access_robotics)
 	ventcrawler = 2
 	magpulse = 1
 	mob_size = MOB_SIZE_SMALL