mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 21:19:00 +01:00
Updates a couple of /obj/item variables (#29829)
* compiles checkpoint * fix some * updatepaths * fix * rrr * linters * fiexs * icon fixes * plasmemes * fix * fix * fix bit more * fix * well * cleanup * fix glasses layer * conflict * fuck gun code * fixes * fix * fixes to energy guns * review * conflict * support that 1 unathi pixel * fix
This commit is contained in:
@@ -37,8 +37,8 @@
|
||||
var/parent_stack = FALSE
|
||||
|
||||
/obj/item/stack/Initialize(mapload, new_amount, merge = TRUE)
|
||||
if(dynamic_icon_state) //If we have a dynamic icon state, we don't want item states to follow the same pattern.
|
||||
item_state = initial(icon_state)
|
||||
if(dynamic_icon_state && isnull(inhand_icon_state)) //If we have a dynamic icon state, we don't want inhand icon states to follow the same pattern.
|
||||
inhand_icon_state = initial(icon_state)
|
||||
|
||||
if(new_amount != null)
|
||||
amount = new_amount
|
||||
|
||||
Reference in New Issue
Block a user