cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes two bugs

Browse Source 
- Voidsuits now properly have their species restrictions initially set.
- You can no longer get perma invisibility from deadringer.
This commit is contained in:
Unknown
2020-04-08 15:05:10 -04:00
parent 675462d608
commit 9320b2c641
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/artifice/deadringer.dm
View File

@@ -19,13 +19,13 @@
START_PROCESSING(SSobj, src)
/obj/item/weapon/deadringer/Destroy() //just in case some smartass tries to stay invisible by destroying the watch
uncloak()
reveal()
STOP_PROCESSING(SSobj, src)
..()
/obj/item/weapon/deadringer/dropped()
if(timer > 20)
uncloak()
reveal()
watchowner = null
return

4
code/modules/clothing/spacesuits/void/void.dm
View File

@@ -13,7 +13,7 @@
// flags_inv = HIDEEARS|BLOCKHAIR
//Species-specific stuff.
species_restricted = list(SPECIES_HUMAN, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA) //VOREStation Edit
species_restricted = list("Human", "Promethean")
sprite_sheets_refit = list(
SPECIES_UNATHI = 'icons/mob/species/unathi/helmet.dmi',
SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi',
@@ -42,7 +42,7 @@
min_pressure_protection = 0 * ONE_ATMOSPHERE
max_pressure_protection = 10 * ONE_ATMOSPHERE
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA) //VOREStation Edit
species_restricted = list("Human", SPECIES_SKRELL, "Promethean")
sprite_sheets_refit = list(
SPECIES_UNATHI = 'icons/mob/species/unathi/suit.dmi',
SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi',

6
code/modules/clothing/spacesuits/void/void_vr.dm
View File

@@ -6,6 +6,7 @@
//
/obj/item/clothing/head/helmet/space/void
species_restricted = list(SPECIES_HUMAN, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
sprite_sheets = list(
SPECIES_TAJ = 'icons/mob/species/tajaran/helmet.dmi',
SPECIES_SKRELL = 'icons/mob/species/skrell/helmet.dmi',
@@ -18,7 +19,6 @@
SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/helmet.dmi',
SPECIES_FENNEC = 'icons/mob/species/vulpkanin/helmet.dmi'
)
sprite_sheets_obj = list(
SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/hats.dmi', // Copied from void.dm
SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/hats.dmi', // Copied from void.dm
@@ -33,6 +33,7 @@
)
/obj/item/clothing/suit/space/void
species_restricted = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_NEVREAN, SPECIES_RAPALA, SPECIES_VASILISSAN, SPECIES_ALRAUNE, SPECIES_PROMETHEAN, SPECIES_XENOCHIMERA)
sprite_sheets = list(
SPECIES_TAJ = 'icons/mob/species/tajaran/suit.dmi',
SPECIES_SKRELL = 'icons/mob/species/skrell/suit.dmi',
@@ -45,9 +46,6 @@
SPECIES_ZORREN_HIGH = 'icons/mob/species/vulpkanin/suit.dmi',
SPECIES_FENNEC = 'icons/mob/species/vulpkanin/suit.dmi'
)
sprite_sheets_obj = list(
SPECIES_TAJ = 'icons/obj/clothing/species/tajaran/suits.dmi', // Copied from void.dm
SPECIES_SKRELL = 'icons/obj/clothing/species/skrell/suits.dmi', // Copied from void.dm