Skip to content

Commit

Permalink
add: vulp sprites (#3160)
Browse files Browse the repository at this point in the history
  • Loading branch information
WolfLox authored Jul 12, 2023
1 parent ee782c2 commit 981c68a
Show file tree
Hide file tree
Showing 19 changed files with 195 additions and 12 deletions.
2 changes: 2 additions & 0 deletions code/game/gamemodes/changeling/powers/mutations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,9 @@
flags_inv = HIDEJUMPSUIT
cold_protection = 0
heat_protection = 0
hide_tail_by_species = list("Vulpkanin", "Unathi")
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
"Unathi" = 'icons/mob/species/unathi/suit.dmi'
)

Expand Down
5 changes: 5 additions & 0 deletions code/game/gamemodes/clockwork/clockwork_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,9 @@
flags_inv = HIDEJUMPSUIT
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
allowed = list(/obj/item/clockwork, /obj/item/twohanded/ratvarian_spear, /obj/item/twohanded/clock_hammer, /obj/item/melee/clock_sword)
hide_tail_by_species = list("Vulpkanin")
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi',
"Unathi" = 'icons/mob/species/unathi/suit.dmi'
)
var/absorb_uses = 2
Expand Down Expand Up @@ -1010,6 +1012,9 @@
flags_inv = HIDEHEADSETS|HIDEGLASSES|HIDENAME
flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES
armor = list(melee = 45, bullet = 65, laser = 10, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
)

/obj/item/clothing/head/helmet/clockwork/equipped(mob/living/user, slot, initial)
. = ..()
Expand Down
10 changes: 10 additions & 0 deletions code/game/gamemodes/cult/cult_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@
armor = list("melee" = 70, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 40, "acid" = 75)
magical = TRUE
species_restricted = null
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
)

/obj/item/clothing/suit/space/cult
name = "cult armor"
Expand All @@ -130,6 +133,9 @@
flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL
magical = TRUE
species_restricted = null
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi'
)

/obj/item/clothing/suit/hooded/cultrobes/cult_shield
name = "empowered cultist robes"
Expand All @@ -144,6 +150,10 @@
var/current_charges = 3
var/shield_state = "shield-cult"
var/shield_on = "shield-cult"
species_restricted = null
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/suit.dmi'
)

/obj/item/clothing/head/hooded/cult_hoodie
name = "empowered cultist hood"
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/head/hardhat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
dog_fashion = null
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
"Grey" = 'icons/mob/species/grey/helmet.dmi',
"Monkey" = 'icons/mob/species/monkey/head.dmi',
"Farwa" = 'icons/mob/species/monkey/head.dmi',
Expand Down
47 changes: 46 additions & 1 deletion code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"Farwa" = 'icons/mob/species/monkey/head.dmi',
"Wolpin" = 'icons/mob/species/monkey/head.dmi',
"Neara" = 'icons/mob/species/monkey/head.dmi',
"Stok" = 'icons/mob/species/monkey/head.dmi'
"Stok" = 'icons/mob/species/monkey/head.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
)

/obj/item/clothing/head/helmet/attack_self(mob/user)
Expand Down Expand Up @@ -83,6 +84,9 @@
item_state = "swat-alt"
armor = list("melee" = 15, "bullet" = 60, "laser" = 10, "energy" = 10, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
dog_fashion = null
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/helmet.dmi',
)

/obj/item/clothing/head/helmet/riot
name = "riot helmet"
Expand All @@ -94,6 +98,10 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
strip_delay = 80
dog_fashion = null
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/helmet.dmi',
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
)

/obj/item/clothing/head/helmet/riot/knight
name = "medieval helmet"
Expand All @@ -103,6 +111,9 @@
flags = BLOCKHAIR
flags_inv = HIDEMASK|HIDEHEADSETS|HIDEGLASSES|HIDENAME
dog_fashion = null
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
)

/obj/item/clothing/head/helmet/justice
name = "helmet of justice"
Expand Down Expand Up @@ -139,6 +150,7 @@
strip_delay = 80
dog_fashion = null
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi',
"Vox" = 'icons/mob/species/vox/helmet.dmi',
"Monkey" = 'icons/mob/species/monkey/head.dmi',
"Farwa" = 'icons/mob/species/monkey/head.dmi',
Expand Down Expand Up @@ -249,21 +261,33 @@
/obj/item/clothing/head/helmet/riot/knight/blue
icon_state = "knight_blue"
item_state = "knight_blue"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
)

/obj/item/clothing/head/helmet/riot/knight/yellow
icon_state = "knight_yellow"
item_state = "knight_yellow"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
)

/obj/item/clothing/head/helmet/riot/knight/red
icon_state = "knight_red"
item_state = "knight_red"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
)

/obj/item/clothing/head/helmet/riot/knight/templar
name = "crusader helmet"
desc = "Deus Vult."
icon_state = "knight_templar"
item_state = "knight_templar"
armor = list(melee = 20, bullet = 7, laser = 2, energy = 2, bomb = 2, bio = 2, rad = 0, fire = 80, acid = 80)
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
)

/obj/item/clothing/head/helmet/skull
name = "skull helmet"
Expand All @@ -274,6 +298,9 @@
icon_state = "skull"
item_state = "skull"
strip_delay = 100
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
)

/obj/item/clothing/head/helmet/skull/Yorick
name = "Йорик"
Expand All @@ -294,41 +321,59 @@
name = "emergency response team commander helmet"
desc = "An in-atmosphere helmet worn by the commander of a Nanotrasen Emergency Response Team. Has blue highlights."
icon_state = "erthelmet_cmd"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

//Security
/obj/item/clothing/head/helmet/ert/security
flags = BLOCKHAIR
name = "emergency response team security helmet"
desc = "An in-atmosphere helmet worn by security members of the Nanotrasen Emergency Response Team. Has red highlights."
icon_state = "erthelmet_sec"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

/obj/item/clothing/head/helmet/ert/security/paranormal
flags = BLOCKHAIR
name = "paranormal emergency response team helmet"
desc = "An in-atmosphere helmet worn by paranormal members of the Nanotrasen Emergency Response Team. Has crusader sigils."
icon_state = "knight_templar"
item_state = "knight_templar"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/helmet.dmi'
)

//Engineer
/obj/item/clothing/head/helmet/ert/engineer
flags = BLOCKHAIR
name = "emergency response team engineer helmet"
desc = "An in-atmosphere helmet worn by engineering members of the Nanotrasen Emergency Response Team. Has orange highlights."
icon_state = "erthelmet_eng"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

//Medical
/obj/item/clothing/head/helmet/ert/medical
flags = BLOCKHAIR
name = "emergency response team medical helmet"
desc = "A set of armor worn by medical members of the Nanotrasen Emergency Response Team. Has red and white highlights."
icon_state = "erthelmet_med"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

//Janitorial
/obj/item/clothing/head/helmet/ert/janitor
flags = BLOCKHAIR
name = "emergency response team janitor helmet"
desc = "A set of armor worn by janitorial members of the Nanotrasen Emergency Response Team. Has red and white highlights."
icon_state = "erthelmet_jan"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

/obj/item/clothing/head/helmet/buckhelm
name = "buckhelm"
Expand Down
5 changes: 5 additions & 0 deletions code/modules/clothing/head/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH

sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi',
"Grey" = 'icons/mob/species/grey/head.dmi',
"Monkey" = 'icons/mob/species/monkey/head.dmi',
"Farwa" = 'icons/mob/species/monkey/head.dmi',
Expand Down Expand Up @@ -287,6 +288,7 @@
flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES

sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi',
"Grey" = 'icons/mob/species/grey/head.dmi',
"Monkey" = 'icons/mob/species/monkey/head.dmi',
"Farwa" = 'icons/mob/species/monkey/head.dmi',
Expand Down Expand Up @@ -486,6 +488,7 @@
flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES

sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi',
"Grey" = 'icons/mob/species/grey/head.dmi',
"Monkey" = 'icons/mob/species/monkey/head.dmi',
"Farwa" = 'icons/mob/species/monkey/head.dmi',
Expand Down Expand Up @@ -525,6 +528,7 @@
flags_inv = HIDENAME|HIDEHEADSETS

sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi',
"Grey" = 'icons/mob/species/grey/head.dmi',
"Monkey" = 'icons/mob/species/monkey/head.dmi',
"Farwa" = 'icons/mob/species/monkey/head.dmi',
Expand All @@ -541,6 +545,7 @@
flags_inv = HIDENAME|HIDEHEADSETS

sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi',
"Grey" = 'icons/mob/species/grey/head.dmi',
"Monkey" = 'icons/mob/species/monkey/head.dmi',
"Farwa" = 'icons/mob/species/monkey/head.dmi',
Expand Down
2 changes: 2 additions & 0 deletions code/modules/clothing/head/misc_special.dm
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH

sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi',
"Grey" = 'icons/mob/species/grey/head.dmi',
"Monkey" = 'icons/mob/species/monkey/head.dmi',
"Farwa" = 'icons/mob/species/monkey/head.dmi',
Expand Down Expand Up @@ -324,6 +325,7 @@
species_disguise = "High-tech robot"
dog_fashion = /datum/dog_fashion/head/cardborg
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi',
"Grey" = 'icons/mob/species/grey/head.dmi',
"Monkey" = 'icons/mob/species/monkey/head.dmi',
"Farwa" = 'icons/mob/species/monkey/head.dmi',
Expand Down
3 changes: 3 additions & 0 deletions code/modules/clothing/masks/gasmask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,9 @@
desc = "A colorful clown mask for the clown that loves to dazzle and impress. Its form can be changed by using it in your hand."
icon_state = "rainbow"
item_state = "rainbow"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

/obj/item/clothing/mask/gas/clownwiz
name = "wizard clown wig and mask"
Expand Down
30 changes: 30 additions & 0 deletions code/modules/clothing/masks/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -390,61 +390,91 @@
desc = "A mask made of soft vinyl and latex, representing the head of a rat."
icon_state = "rat"
item_state = "rat"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

/obj/item/clothing/mask/face/fox
name = "fox mask"
desc = "A mask made of soft vinyl and latex, representing the head of a fox."
icon_state = "fox"
item_state = "fox"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

/obj/item/clothing/mask/face/bee
name = "bee mask"
desc = "A mask made of soft vinyl and latex, representing the head of a bee."
icon_state = "bee"
item_state = "bee"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

/obj/item/clothing/mask/face/bear
name = "bear mask"
desc = "A mask made of soft vinyl and latex, representing the head of a bear."
icon_state = "bear"
item_state = "bear"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

/obj/item/clothing/mask/face/bat
name = "bat mask"
desc = "A mask made of soft vinyl and latex, representing the head of a bat."
icon_state = "bat"
item_state = "bat"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

/obj/item/clothing/mask/face/raven
name = "raven mask"
desc = "A mask made of soft vinyl and latex, representing the head of a raven."
icon_state = "raven"
item_state = "raven"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

/obj/item/clothing/mask/face/jackal
name = "jackal mask"
desc = "A mask made of soft vinyl and latex, representing the head of a jackal."
icon_state = "jackal"
item_state = "jackal"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

/obj/item/clothing/mask/face/tribal
name = "tribal mask"
desc = "A mask carved out of wood, detailed carefully by hand."
icon_state = "bumba"
item_state = "bumba"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

/obj/item/clothing/mask/face/fawkes
name = "Guy Fawkes mask"
desc = "A mask designed to help you remember a specific date."
icon_state = "fawkes"
item_state = "fawkes"
w_class = WEIGHT_CLASS_SMALL
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

/obj/item/clothing/mask/gas/pennywise
name = "Pennywise Mask"
desc = "It's the eater of worlds, and of children."
icon_state = "pennywise_mask"
item_state = "pennywise_mask"
sprite_sheets = list(
"Vulpkanin" = 'icons/mob/species/vulpkanin/head.dmi'
)

flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR

Expand Down
Loading

0 comments on commit 981c68a

Please sign in to comment.