Merge pull request #7599 from Poojawa/override-override

Digitigrade Uniforms from Oracle
This commit is contained in:
deathride58
2018-09-29 21:30:12 -04:00
committed by GitHub
26 changed files with 907 additions and 841 deletions
+2 -2
View File
@@ -50,6 +50,8 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/flags_inv //This flag is used to determine when items in someone's inventory cover others. IE helmets making it so you can't see glasses, etc.
var/interaction_flags_item = INTERACT_ITEM_ATTACK_HAND_PICKUP
//Citadel Edit for digitigrade stuff
var/mutantrace_variation = NO_MUTANTRACE_VARIATION //Are there special sprites for specific situations? Don't use this unless you need to.
var/item_color = null //this needs deprecating, soonish
@@ -101,8 +103,6 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/last_force_string_check = 0
var/tip_timer
var/icon_override //CIT CHANGE - adds icon_override var. Will be removed with #4322
var/trigger_guard = TRIGGER_GUARD_NONE
//Grinder vars