Skip to content

Commit

Permalink
fixes some missing sprites
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Oct 11, 2024
1 parent 5426df0 commit c38d46a
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 16 deletions.
15 changes: 0 additions & 15 deletions code/modules/clothing/masks/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@
name = "pig mask"
desc = "A rubber pig mask with a built-in voice modulator."
icon_state = "pig"
item_state = "pig"
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
clothing_flags = VOICEBOX_TOGGLABLE
w_class = WEIGHT_CLASS_SMALL
Expand All @@ -148,7 +147,6 @@
name = "frog mask"
desc = "An ancient mask carved in the shape of a frog.<br> Sanity is like gravity, all it needs is a push."
icon_state = "frog"
item_state = "frog"
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_SMALL
clothing_flags = VOICEBOX_TOGGLABLE
Expand All @@ -170,7 +168,6 @@
/obj/item/clothing/mask/cowmask
name = "cow mask"
icon_state = "cowmask"
item_state = "cowmask"
clothing_flags = VOICEBOX_TOGGLABLE
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_SMALL
Expand All @@ -195,7 +192,6 @@
name = "horse head mask"
desc = "A mask made of soft vinyl and latex, representing the head of a horse."
icon_state = "horsehead"
item_state = "horsehead"
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDEEYES|HIDEEARS
w_class = WEIGHT_CLASS_SMALL
clothing_flags = VOICEBOX_TOGGLABLE
Expand All @@ -219,51 +215,43 @@
name = "rat mask"
desc = "A mask made of soft vinyl and latex, representing the head of a rat."
icon_state = "rat"
item_state = "rat"
flags_inv = HIDEFACE
flags_cover = MASKCOVERSMOUTH

/obj/item/clothing/mask/rat/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"

/obj/item/clothing/mask/rat/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"

/obj/item/clothing/mask/rat/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"

/obj/item/clothing/mask/rat/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"

/obj/item/clothing/mask/rat/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"

/obj/item/clothing/mask/rat/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"

/obj/item/clothing/mask/rat/tribal
name = "tribal mask"
desc = "A mask carved out of wood, detailed carefully by hand."
icon_state = "bumba"
item_state = "bumba"

/obj/item/clothing/mask/bandana
name = "botany bandana"
Expand Down Expand Up @@ -343,21 +331,18 @@
name = "mummy mask"
desc = "Ancient bandages."
icon_state = "mummy_mask"
item_state = "mummy_mask"
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR

/obj/item/clothing/mask/scarecrow
name = "sack mask"
desc = "A burlap sack with eyeholes."
icon_state = "scarecrow_sack"
item_state = "scarecrow_sack"
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR

/obj/item/clothing/mask/gondola
name = "gondola mask"
desc = "Genuine gondola fur."
icon_state = "gondola"
item_state = "gondola"
flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
w_class = WEIGHT_CLASS_SMALL
modifies_speech = TRUE
Expand Down
1 change: 1 addition & 0 deletions code/modules/projectiles/guns/energy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
desc = "A basic energy-based gun."
icon = 'icons/obj/guns/energy.dmi'
icon_state = "laser"
item_state = "spur"

muzzleflash_iconstate = "muzzle_flash_laser"
muzzle_flash_color = COLOR_SOFT_RED
Expand Down
1 change: 0 additions & 1 deletion code/modules/projectiles/guns/energy/laser.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal."

icon_state = "laser"
item_state = "laser"
w_class = WEIGHT_CLASS_NORMAL
custom_materials = list(/datum/material/iron=2000)
ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
Expand Down

0 comments on commit c38d46a

Please sign in to comment.