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

Merge pull request #11466 from Markolie/bundles

Browse Source 
Species chameleon fix
This commit is contained in:
variableundefined
2019-05-28 10:53:17 +08:00
committed by GitHub
parent 3dae8eded3 ec70c2512d
commit 3acf995a76
41 changed files with 675 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+26 -2
View File
@@ -89,7 +89,6 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
var/list/sprite_sheets = null
var/icon_override = null //Used to override hardcoded clothing dmis in human clothing proc.
var/sprite_sheets_obj = null //Used to override hardcoded clothing inventory object dmis in human clothing proc.
var/list/species_fit = null //This object has a different appearance when worn by these species
var/trip_verb = TV_TRIP
var/trip_chance = 0
@@ -605,4 +604,29 @@ var/global/image/fire_overlay = image("icon" = 'icons/goonstation/effects/fire.d
if(!ismob(loc))
return
var/mob/owner = loc
owner.regenerate_icons()
var/flags = slot_flags
if(flags & SLOT_OCLOTHING)
owner.update_inv_wear_suit()
if(flags & SLOT_ICLOTHING)
owner.update_inv_w_uniform()
if(flags & SLOT_GLOVES)
owner.update_inv_gloves()
if(flags & SLOT_EYES)
owner.update_inv_glasses()
if(flags & SLOT_EARS)
owner.update_inv_ears()
if(flags & SLOT_MASK)
owner.update_inv_wear_mask()
if(flags & SLOT_HEAD)
owner.update_inv_head()
if(flags & SLOT_FEET)
owner.update_inv_shoes()
if(flags & SLOT_ID)
owner.update_inv_wear_id()
if(flags & SLOT_BELT)
owner.update_inv_belt()
if(flags & SLOT_BACK)
owner.update_inv_back()
if(flags & SLOT_PDA)
owner.update_inv_wear_pda()
code/game/objects/items/weapons/cigs.dm
-1
View File
@@ -31,7 +31,6 @@ LIGHTERS ARE IN LIGHTERS.DM
var/lastHolder = null
var/smoketime = 300
var/chem_volume = 30
species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin", "Grey")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
"Unathi" = 'icons/mob/species/unathi/mask.dmi',
code/game/objects/items/weapons/defib.dm
-1
View File
@@ -11,7 +11,6 @@
w_class = WEIGHT_CLASS_BULKY
origin_tech = "biotech=4"
actions_types = list(/datum/action/item_action/toggle_paddles)
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/back.dmi'
)
code/game/objects/items/weapons/storage/backpack.dm
-1
View File
@@ -17,7 +17,6 @@
storage_slots = 21
burn_state = FLAMMABLE
burntime = 20
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/back.dmi'
)