cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 15:45:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

please no merge conflict.

Browse Source
This commit is contained in:
Jovan
2017-03-11 19:21:06 -05:00
parent 48caf853d5
commit 65cb35fbb2
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/spacesuits/miscellaneous.dm
+2 -2
View File
@@ -139,7 +139,7 @@
"Vox" = 'icons/mob/species/vox/helmet.dmi'
)
sprite_sheets_obj = list(
"Vox" = 'icons/obj/clothing/species/vox/hats.dmi',
"Vox" = 'icons/obj/clothing/species/vox/hats.dmi'
)
/obj/item/clothing/suit/space/eva/paramedic
@@ -151,7 +151,7 @@
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
sprite_sheets_obj = list(
"Vox" = 'icons/obj/clothing/species/vox/suits.dmi',
"Vox" = 'icons/obj/clothing/species/vox/suits.dmi'
)
/obj/item/clothing/suit/space/eva
code/modules/research/xenoarchaeology/tools/anomaly_suit.dm
+6 -12
View File
@@ -23,12 +23,9 @@
item_state = "cespace_suit"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100)
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank)
+ sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
sprite_sheets_obj = list(
"Vox" = 'icons/obj/clothing/species/vox/suits.dmi',
)
species_fit = null
sprite_sheets = null
sprite_sheets_obj = null
/obj/item/clothing/head/helmet/space/eva/anomaly
name = "Excavation hood"
@@ -36,9 +33,6 @@
icon_state = "cespace_helmet"
item_state = "cespace_helmet"
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100)
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/helmet.dmi'
)
sprite_sheets_obj = list(
"Vox" = 'icons/obj/clothing/species/vox/hats.dmi',
)
species_fit = null
sprite_sheets = null
sprite_sheets_obj = null