[MIRROR] Refactors armor into dedicated subtypes [MDB IGNORE] (#18291)

* Refactors armor into dedicated subtypes

* start

* most tg things

* pain (#18584)

* shit

* non-mod changes

* compile

Co-authored-by: John Doe <gamingskeleton3@gmail.com>

* #18291

* compile fix

* ???

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>
Co-authored-by: John Doe <gamingskeleton3@gmail.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-01-08 05:06:16 +01:00
committed by GitHub
parent 9aac55ef4d
commit 011fefdd81
322 changed files with 8499 additions and 993 deletions
@@ -296,7 +296,16 @@
//Some armor so it's harder to kill someone by mistake.
/obj/structure/puzzle_element/prison
armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, BIO = 0, FIRE = 50, ACID = 50)
armor_type = /datum/armor/puzzle_element_prison
/datum/armor/puzzle_element_prison
melee = 50
bullet = 50
laser = 50
energy = 50
bomb = 50
fire = 50
acid = 50
/obj/structure/puzzle_element/prison/relaymove(mob/living/user, direction)
return
@@ -307,6 +316,15 @@
icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "prison_cube"
/datum/armor/puzzle_element_prison
melee = 50
bullet = 50
laser = 50
energy = 50
bomb = 50
fire = 50
acid = 50
/obj/item/prisoncube/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
. = ..()
if(!proximity_flag || !isliving(target))