Merge pull request #8532 from Cyantime/patch-2

Allows some protean ventcrawl accessories
This commit is contained in:
Novacat
2020-07-30 14:53:25 -04:00
committed by GitHub
@@ -298,6 +298,12 @@
return
..()
var/global/list/disallowed_protean_accessories = list(
/obj/item/clothing/accessory/holster,
/obj/item/clothing/accessory/storage,
/obj/item/clothing/accessory/armor
)
// Helpers - Unsafe, WILL perform change.
/mob/living/carbon/human/proc/nano_intoblob()
var/panel_was_up = FALSE
@@ -343,7 +349,8 @@
var/obj/item/clothing/uniform = w_uniform
if(LAZYLEN(uniform.accessories))
for(var/obj/item/clothing/accessory/A in uniform.accessories)
uniform.remove_accessory(null,A) //First param is user, but adds fingerprints and messages
if(is_type_in_list(A, disallowed_protean_accessories))
uniform.remove_accessory(null,A) //First param is user, but adds fingerprints and messages
//Size update
blob.transform = matrix()*size_multiplier