shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1683 from Citadel-Station-13/upstream-merge-28583

Browse Source 
[MIRROR] Adds framework for equip delays and adds it to the straight jacket
This commit is contained in:
LetterJay
2017-06-20 01:30:32 -05:00
committed by GitHub
parent 49abfbd9a5 989b991b05
commit 35df3ca80e
21 changed files with 72 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/clock_cult/clock_items/clockwork_armor.dm
+2 -2
View File
@@ -116,7 +116,7 @@
item_state = "clockwork_gauntlets"
item_color = null //So they don't wash.
strip_delay = 50
put_on_delay = 30
equip_delay_other = 30
body_parts_covered = ARMS
cold_protection = ARMS
heat_protection = ARMS
@@ -175,7 +175,7 @@
icon_state = "clockwork_treads"
w_class = WEIGHT_CLASS_NORMAL
strip_delay = 50
put_on_delay = 30
equip_delay_other = 30
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/shoes/clockwork/Initialize()
code/game/objects/items.dm
+5 -4
View File
@@ -59,8 +59,9 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/armour_penetration = 0 //percentage of armour effectiveness to remove
var/list/allowed = null //suit storage stuff.
var/obj/item/device/uplink/hidden_uplink = null
var/strip_delay = 40
var/put_on_delay = 20
var/equip_delay_self = 0 //In deciseconds, how long an item takes to equip; counts only for normal clothing slots, not pockets etc.
var/equip_delay_other = 20 //In deciseconds, how long an item takes to put on another person
var/strip_delay = 40 //In deciseconds, how long an item takes to remove from another person
var/breakouttime = 0
var/list/materials
var/origin_tech = null //Used by R&D to determine what research bonuses it grants.
@@ -421,11 +422,11 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
//if this is being done by a mob other than M, it will include the mob equipper, who is trying to equip the item to mob M. equipper will be null otherwise.
//If you are making custom procs but would like to retain partial or complete functionality of this one, include a 'return ..()' to where you want this to happen.
//Set disable_warning to 1 if you wish it to not give you outputs.
/obj/item/proc/mob_can_equip(mob/M, mob/equipper, slot, disable_warning = 0)
/obj/item/proc/mob_can_equip(mob/living/M, mob/living/equipper, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE)
if(!M)
return 0
return M.can_equip(src, slot, disable_warning)
return M.can_equip(src, slot, disable_warning, bypass_equip_delay_self)
/obj/item/verb/verb_pickup()
set src in oview(1)