cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-21 03:59:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Suit DMI split p2: Obj icons (#69174)

Browse Source 
About The Pull Request

second part of #68417, which splits the suits.dmi, but this time focuses on obj items. everything stated in that pr applies to here aswell, it follows the same categorization.

Why It's Good For The Game

finishes the much needed splitting of suits.dmi, easing the minds of spriters everywhere and lowering the probability of future pr conflicts in this area
This commit is contained in:
Twaticus
2022-08-13 17:13:20 -07:00
committed by GitHub
parent 079857bae7
commit dbc2435fa5
36 changed files with 49 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/equipment/explorer_gear.dm
+2
View File
@@ -3,6 +3,7 @@
name = "explorer suit"
desc = "An armoured suit for exploring harsh environments."
icon_state = "explorer"
icon = 'icons/obj/clothing/suits/utility.dmi'
worn_icon = 'icons/mob/clothing/suits/utility.dmi'
inhand_icon_state = "explorer"
body_parts_covered = CHEST|GROIN|LEGS|ARMS
@@ -70,6 +71,7 @@
adjustmask()
/obj/item/clothing/suit/hooded/cloak
icon = 'icons/obj/clothing/suits/armor.dmi'
worn_icon = 'icons/mob/clothing/suits/armor.dmi'
/obj/item/clothing/suit/hooded/cloak/goliath
code/modules/mining/lavaland/tendril_loot.dm
+1
View File
@@ -594,6 +594,7 @@
name = "berserker armor"
desc = "Voices echo from the armor, driving the user insane. Is not space-proof."
icon_state = "berserker"
icon = 'icons/obj/clothing/suits/armor.dmi'
worn_icon = 'icons/mob/clothing/suits/armor.dmi'
hoodtype = /obj/item/clothing/head/hooded/berserker
armor = list(MELEE = 30, BULLET = 30, LASER = 10, ENERGY = 20, BOMB = 50, BIO = 0, FIRE = 100, ACID = 100)