beeg commit

code/game/machinery/suit_storage_unit.dm

@@ -31,6 +31,8 @@
 	var/uv_cycles = 6
 	var/message_cooldown
 	var/breakout_time = 300
+	/// How fast it charges cells in a suit
+	var/charge_rate = 250
 
 /obj/machinery/suit_storage_unit/standard_unit
 	suit_type = /obj/item/clothing/suit/space/eva
@@ -43,7 +45,7 @@
 	storage_type = /obj/item/tank/jetpack/oxygen/captain
 
 /obj/machinery/suit_storage_unit/captainmod
-	mask_type = /obj/item/clothing/mask/gas/atmos/captain
+	mask_type = /obj/item/clothing/mask/gas/sechailer
 	storage_type = /obj/item/tank/jetpack/oxygen/captain
 	mod_type = /obj/item/mod/control/pre_equipped/magnate
 
@@ -58,11 +60,11 @@
 
 /obj/machinery/suit_storage_unit/atmos
 	suit_type = /obj/item/clothing/suit/space/hardsuit/engine/atmos
-	mask_type = /obj/item/clothing/mask/gas/atmos
+	mask_type = /obj/item/clothing/mask/breath
 	storage_type = /obj/item/watertank/atmos
 
 /obj/machinery/suit_storage_unit/atmosmod
-	mask_type = /obj/item/clothing/mask/gas/atmos
+	mask_type = /obj/item/clothing/mask/breath
 	storage_type = /obj/item/watertank/atmos
 	mod_type = /obj/item/mod/control/pre_equipped/atmospheric
 
@@ -332,7 +334,7 @@
 				things_to_clear += mask.GetAllContents()
 			if(mod)
 				things_to_clear += mod
-				things_to_clear += mod.get_all_contents()
+				things_to_clear += mod.GetAllContents()
 			if(storage)
 				things_to_clear += storage
 				things_to_clear += storage.GetAllContents()
@@ -352,13 +354,7 @@
 
 /obj/machinery/suit_storage_unit/process(delta_time)
 	var/obj/item/stock_parts/cell/cell
-	if(suit)
-		if(!istype(suit))
-			return
-		if(!suit.cell)
-			return
-		cell = suit.cell
-	else if(mod)
+	if(mod)
 		if(!istype(mod))
 			return
 		if(!mod.cell)
@@ -370,6 +366,14 @@
 	use_power(charge_rate * delta_time)
 	cell.give(charge_rate * delta_time)
 
+/obj/machinery/suit_storage_unit/proc/shock(mob/user, prb)
+	if(!prob(prb))
+		var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
+		s.set_up(5, 1, src)
+		s.start()
+		if(electrocute_mob(user, src, src, 1, TRUE))
+			return 1
+
 /obj/machinery/suit_storage_unit/relaymove(mob/user)
 	if(locked)
 		if(message_cooldown <= world.time)

code/game/objects/items.dm

@@ -399,7 +399,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	if(throwing)
 		throwing.finalize(FALSE)
 	if(loc == user)
-		if(!allow_attack_hand_drop(user) || !user.temporarilyRemoveItemFromInventory(src))
+		if(!allow_attack_hand_drop(user) || !user.temporarilyRemoveItemFromInventory(I = src))
 			return
 
 	. = FALSE
@@ -428,7 +428,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 	if(throwing)
 		throwing.finalize(FALSE)
 	if(loc == user)
-		if(!user.temporarilyRemoveItemFromInventory(src))
+		if(!allow_attack_hand_drop(user) || !user.temporarilyRemoveItemFromInventory(src))
 			return
 
 	pickup(user)

code/game/objects/items/defib.dm

@@ -461,6 +461,8 @@
 			cooldown = TRUE
 	busy = FALSE
 	update_icon()
+	if(SEND_SIGNAL(src, COMSIG_DEFIBRILLATOR_SUCCESS) & COMPONENT_DEFIB_STOP)
+		return
 	if(req_defib)
 		defib.cooldowncheck(user)
 	else
@@ -514,6 +516,8 @@
 				cooldown = TRUE
 			busy = FALSE
 			update_icon()
+			if(SEND_SIGNAL(src, COMSIG_DEFIBRILLATOR_SUCCESS) & COMPONENT_DEFIB_STOP)
+				return
 			if(!req_defib)
 				recharge(60)
 			if(req_defib && (defib.cooldowncheck(user)))
@@ -632,6 +636,8 @@
 					defib.deductcharge(revivecost)
 					cooldown = 1
 				update_icon()
+				if(SEND_SIGNAL(src, COMSIG_DEFIBRILLATOR_SUCCESS) & COMPONENT_DEFIB_STOP)
+					return
 				if(req_defib)
 					defib.cooldowncheck(user)
 				else

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

@@ -28,17 +28,11 @@
 
 /obj/item/aicard/pre_attack(atom/target, mob/living/user, params)
 	if(AI) //AI is on the card, implies user wants to upload it.
-		var/our_ai = AI
 		target.transfer_ai(AI_TRANS_FROM_CARD, user, AI, src)
 	else //No AI on the card, therefore the user wants to download one.
 		target.transfer_ai(AI_TRANS_TO_CARD, user, null, src)
 		if(AI)
-			log_combat(user, our_ai, "uploaded", src, "to [target].")
-			return TRUE
-	else //No AI on the card, therefore the user wants to download one.
-		target.transfer_ai(AI_TRANS_TO_CARD, user, null, src)
-		if(AI)
-			log_combat(user, AI, "carded", src)
+			log_combat(user, AI, "uploaded", src, "to [target].")
 			return TRUE
 	update_appearance() //Whatever happened, update the card's state (icon, name) to match.
 	return ..()