cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes robotic healing more in line with sutures/mesh (#19380)

Browse Source 
* Update items.dm

* Update medical.dm
This commit is contained in:
ynot01
2023-06-27 20:18:59 -04:00
committed by GitHub
parent cd15433e09
commit 90fdacfb45
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/game/objects/items.dm
View File

@@ -15,7 +15,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
///Icon file for right inhand overlays
var/righthand_file = 'icons/mob/inhands/items_righthand.dmi'
///Icon file for mob worn overlays.
///Icon file for mob worn overlays.
///no var for state because it should *always* be the same as icon_state
var/icon/mob_overlay_icon
//Forced mob worn layer instead of the standard preferred ssize.
@@ -34,7 +34,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
obj_flags = NONE
var/item_flags = NONE
var/hitsound
var/usesound
///Used when yate into a mob
@@ -45,7 +45,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/pickup_sound
///Sound uses when dropping the item, or when its thrown.
var/drop_sound
var/w_class = WEIGHT_CLASS_NORMAL
var/slot_flags = 0 //This is used to determine on which slots an item can fit.
pass_flags = PASSTABLE
@@ -1079,9 +1079,16 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
//specifically for "suture" type robotic healing items
//amount is either the fuel of a welding tool, or the number of wires consumed
//volume is how loud the sound of the item is
#define ROBO_LIMB_HEAL_SELF 6 SECONDS
#define ROBO_LIMB_HEAL_OTHER 2 SECONDS
/obj/item/proc/heal_robo_limb(obj/item/I, mob/living/carbon/human/H, mob/user, brute_heal = 0, burn_heal = 0, amount = 0, volume = 0)
if(I.use_tool(H, user, 2 SECONDS, amount, volume, null, H != user))
var/used_delay
if(H != user)
used_delay = ROBO_LIMB_HEAL_OTHER
else
used_delay = ROBO_LIMB_HEAL_SELF
if(I.use_tool(H, user, used_delay, amount, volume, null, TRUE))
if(item_heal_robotic(H, user, brute_heal, burn_heal))
return heal_robo_limb(I, H, user, brute_heal, burn_heal, amount, volume)
return TRUE

5
code/game/objects/items/stacks/medical.dm
View File

@@ -177,7 +177,10 @@
playsound(src, 'sound/effects/rip2.ogg', 25)
if(!do_after(user, (user == M ? self_delay : other_delay), M))
/// Use other_delay if healing someone else (usually 1 second)
/// Use self_delay if healing yourself (usually 3 seconds)
/// Reduce delay by 20% if medical
if(!do_after(user, (user == M ? self_delay : other_delay) * (IS_MEDICAL(user) ? 0.8 : 1), M))
return
playsound(src, 'sound/effects/rip1.ogg', 25)