Merge pull request #11730 from Ghommie/Ghommie-cit667

Minor snowflakes clothing variations refactor. Removal of copypasted states.
This commit is contained in:
kevinz000
2020-04-17 05:49:09 -07:00
committed by GitHub
38 changed files with 164 additions and 37 deletions
+4 -1
View File
@@ -19,9 +19,12 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
///Icon file for mob worn overlays.
///no var for state because it should *always* be the same as icon_state
var/icon/mob_overlay_icon
//Forced mob worn layer instead of the standard preferred ssize.
//Forced mob worn layer instead of the standard preferred size.
var/alternate_worn_layer
var/icon/anthro_mob_worn_overlay //Version of the above dedicated to muzzles/digitigrade
var/icon/taur_mob_worn_overlay // Idem but for taurs. Currently only used by suits.
var/list/alternate_screams = list() //REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
//Dimensions of the icon file used when this item is worn, eg: hats.dmi
+1
View File
@@ -187,6 +187,7 @@
body_parts_covered = CHEST|GROIN|LEGS|ARMS
allowed = list(/obj/item/storage/book/bible, HOLY_WEAPONS, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
hoodtype = /obj/item/clothing/head/hooded/chaplain_hood
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
/obj/item/clothing/head/hooded/chaplain_hood
name = "follower hood"
+1
View File
@@ -189,6 +189,7 @@
slowdown = 2.0 //gotta pretend we're balanced.
body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
armor = list("melee" = 50, "bullet" = 50, "laser" = 50, "energy" = 40, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60)
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
/obj/item/clothing/suit/armor/plate/crusader/red
icon_state = "crusader-red"