Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits

code/datums/components/acid.dm

@@ -53,7 +53,7 @@
 	if(!(O.resistance_flags & ACID_PROOF))
 		if(prob(33))
 			playsound(O.loc, 'sound/items/welder.ogg', 150, 1)
-		O.take_damage(min(1 + round(sqrt(level)*0.3), 300), BURN, "acid", 0)
+		O.take_damage(min(1 + round(sqrt(level)*0.3), 300), BURN, ACID, 0)
 
 	level = max(level - (5 + 3*round(sqrt(level))), 0)
 	if(level <= 0)

code/datums/components/armor_plate.dm

@@ -2,7 +2,7 @@
 	var/amount = 0
 	var/maxamount = 3
 	var/upgrade_item = /obj/item/stack/sheet/animalhide/goliath_hide
-	var/datum/armor/added_armor = list("melee" = 10)
+	var/datum/armor/added_armor = list(MELEE = 10)
 	var/upgrade_name
 
 /datum/component/armor_plate/Initialize(_maxamount,obj/item/_upgrade_item,datum/armor/_added_armor)
@@ -12,7 +12,7 @@
 	RegisterSignal(parent, COMSIG_PARENT_EXAMINE, .proc/examine)
 	RegisterSignal(parent, COMSIG_PARENT_ATTACKBY, .proc/applyplate)
 	RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, .proc/dropplates)
-	if(istype(parent, /obj/mecha/working/ripley))
+	if(istype(parent, /obj/vehicle/sealed/mecha/working/ripley))
 		RegisterSignal(parent, COMSIG_ATOM_UPDATE_OVERLAYS, .proc/apply_mech_overlays)
 
 	if(_maxamount)
@@ -67,7 +67,7 @@
 	O.armor = O.armor.attachArmor(added_armor)
 
 	if(ismecha(O))
-		var/obj/mecha/R = O
+		var/obj/vehicle/sealed/mecha/R = O
 		R.update_icon()
 		to_chat(user, "<span class='info'>You strengthen [R], improving its resistance against melee, bullet and laser damage.</span>")
 	else
@@ -80,11 +80,11 @@
 		for(var/i in 1 to amount)
 			new upgrade_item(get_turf(parent))
 
-/datum/component/armor_plate/proc/apply_mech_overlays(obj/mecha/mech, list/overlays)
+/datum/component/armor_plate/proc/apply_mech_overlays(obj/vehicle/sealed/mecha/mech, list/overlays)
 	if(amount)
 		var/overlay_string = "ripley-g"
 		if(amount >= 3)
 			overlay_string += "-full"
-		if(!mech.occupant)
+		if(LAZYLEN(mech.occupants) < 1)
 			overlay_string += "-open"
 		overlays += overlay_string

code/datums/components/embedded.dm

@@ -152,7 +152,7 @@
 		to_chat(victim, "<span class='userdanger'>[weapon] sticks itself to your [limb.name]!</span>")
 
 	if(damage > 0)
-		var/armor = victim.run_armor_check(limb.body_zone, "melee", "Your armor has protected your [limb.name].", "Your armor has softened a hit to your [limb.name].",weapon.armour_penetration)
+		var/armor = victim.run_armor_check(limb.body_zone, MELEE, "Your armor has protected your [limb.name].", "Your armor has softened a hit to your [limb.name].",weapon.armour_penetration)
 		limb.receive_damage(brute=(1-pain_stam_pct) * damage, stamina=pain_stam_pct * damage, blocked=armor, sharpness = weapon.get_sharpness())
 
 /// Called every time a carbon with a harmful embed moves, rolling a chance for the item to cause pain. The chance is halved if the carbon is crawling or walking.

code/datums/components/killerqueen.dm

@@ -1,6 +1,6 @@
 /**
   * KILLER QUEEN
-  * 
+  *
   * Simple contact bomb component
   * Blows up the first person to touch it.
   */
@@ -26,7 +26,7 @@
 	var/flame = 0
 	/// only triggered by living mobs
 	var/living_only = TRUE
-	
+
 
 /datum/component/killerqueen/Initialize(ex_strength = EXPLODE_HEAVY, datum/callback/pre_explode, datum/callback/failure, examine_message, light = 0, heavy = 0, dev = 0, flame = 0, living_only = TRUE)
 	. = ..()

code/datums/components/knockoff.dm

@@ -11,7 +11,7 @@
 	RegisterSignal(parent, COMSIG_ITEM_DROPPED,.proc/OnDropped)
 
 	src.knockoff_chance = knockoff_chance
-	
+
 	if(zone_override)
 		target_zones = zone_override
 

code/datums/components/mirv.dm

@@ -38,5 +38,5 @@
 			P.range = override_projectile_range
 		P.preparePixelProjectile(shootat_turf, target)
 		P.firer = firer // don't hit ourself that would be really annoying
-		P.permutated += target // don't hit the target we hit already with the flak
+		P.impacted = list(target = TRUE) // don't hit the target we hit already with the flak
 		P.fire()

code/datums/components/pellet_cloud.dm

@@ -242,7 +242,7 @@
 	P.original = target
 	P.fired_from = parent
 	P.firer = parent // don't hit ourself that would be really annoying
-	P.permutated += parent // don't hit the target we hit already with the flak
+	P.impacted = list(parent = TRUE) // don't hit the target we hit already with the flak
 	P.suppressed = SUPPRESSED_VERY // set the projectiles to make no message so we can do our own aggregate message
 	P.preparePixelProjectile(target, parent)
 	RegisterSignal(P, COMSIG_PROJECTILE_SELF_ON_HIT, .proc/pellet_hit)

code/datums/components/squeak.dm

@@ -42,6 +42,8 @@
 			RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
 			if(istype(parent, /obj/item/clothing/shoes))
 				RegisterSignal(parent, COMSIG_SHOES_STEP_ACTION, .proc/step_squeak)
+		else if(isstructure(parent))
+			RegisterSignal(parent, COMSIG_ATOM_ATTACK_HAND, .proc/use_squeak)
 
 	override_squeak_sounds = custom_sounds
 	if(chance_override)

code/datums/components/storage/concrete/rped.dm

@@ -39,7 +39,7 @@
 	var/datum/progressbar/progress = new(M, length(things), T)
 	while (do_after(M, 10, TRUE, T, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress, TRUE, M)))
 		stoplag(1)
-	qdel(progress)
+	progress.end_progress()
 	A.do_squish(0.8, 1.2)
 
 /datum/component/storage/concrete/bluespace/rped
@@ -83,5 +83,5 @@
 	var/datum/progressbar/progress = new(M, length(things), T)
 	while (do_after(M, 10, TRUE, T, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress, TRUE, M)))
 		stoplag(1)
-	qdel(progress)
+	progress.end_progress()
 	A.do_squish(0.8, 1.2)

code/datums/components/storage/storage.dm

@@ -215,7 +215,7 @@
 	var/list/rejections = list()
 	while(do_after(M, 10, TRUE, parent, FALSE, CALLBACK(src, .proc/handle_mass_pickup, things, I.loc, rejections, progress)))
 		stoplag(1)
-	qdel(progress)
+	progress.end_progress()
 	to_chat(M, "<span class='notice'>You put everything you could [insert_preposition] [parent].</span>")
 	A.do_squish(1.4, 0.4)
 
@@ -273,7 +273,7 @@
 	var/datum/progressbar/progress = new(M, length(things), T)
 	while (do_after(M, 10, TRUE, T, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress, TRUE, M)))
 		stoplag(1)
-	qdel(progress)
+	progress.end_progress()
 	A.do_squish(0.8, 1.2)
 
 /datum/component/storage/proc/mass_remove_from_storage(atom/target, list/things, datum/progressbar/progress, trigger_on_found = TRUE, mob/user)