Fixes Universal Damage Issues. Implements Proper Ricochets (#12532)

This commit is contained in:
Fox McCloud
2019-10-08 20:41:40 -04:00
committed by variableundefined
parent 57298cb79f
commit f4451fcb3d
16 changed files with 53 additions and 52 deletions
@@ -73,13 +73,6 @@
/obj/item/storage/lockbox/hear_message(mob/living/M as mob, msg)
/obj/item/storage/lockbox/large
name = "Large lockbox"
desc = "A large lockbox"
max_w_class = WEIGHT_CLASS_BULKY
max_combined_w_class = 4 //The sum of the w_classes of all the items in this storage item.
storage_slots = 1
/obj/item/storage/lockbox/mindshield
name = "Lockbox (Mindshield Implants)"
req_access = list(access_security)
@@ -129,4 +122,16 @@
/obj/item/storage/lockbox/t4/New()
..()
for(var/i in 0 to 2)
new /obj/item/grenade/plastic/x4/thermite(src)
new /obj/item/grenade/plastic/x4/thermite(src)
/obj/item/storage/lockbox/research
/obj/item/storage/lockbox/research/deconstruct(disassembled = TRUE) // Get wrecked, Science nerds
qdel(src)
/obj/item/storage/lockbox/research/large
name = "Large lockbox"
desc = "A large lockbox"
max_w_class = WEIGHT_CLASS_BULKY
max_combined_w_class = 4 //The sum of the w_classes of all the items in this storage item.
storage_slots = 1