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

stuff (#19462)

Browse Source
This commit is contained in:
SapphicOverload
2023-07-01 22:13:48 -04:00
committed by GitHub
parent 84073e84bf
commit 2d7f9587fe
4 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1079,16 +1079,12 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
//specifically for "suture" type robotic healing items //specifically for "suture" type robotic healing items
//amount is either the fuel of a welding tool, or the number of wires consumed //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 //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)
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)) #define ROBO_LIMB_HEAL_SELF 3 SECONDS
#define ROBO_LIMB_HEAL_OTHER 1 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, (H == user) ? ROBO_LIMB_HEAL_SELF : ROBO_LIMB_HEAL_OTHER, amount, volume, null, TRUE))
if(item_heal_robotic(H, user, brute_heal, burn_heal)) if(item_heal_robotic(H, user, brute_heal, burn_heal))
return heal_robo_limb(I, H, user, brute_heal, burn_heal, amount, volume) return heal_robo_limb(I, H, user, brute_heal, burn_heal, amount, volume)
return TRUE return TRUE

6
code/game/objects/items/tools/weldingtool.dm
View File

@@ -118,7 +118,7 @@
playsound(src, 'sound/items/lighter/light.ogg', 50, 2) playsound(src, 'sound/items/lighter/light.ogg', 50, 2)
return TRUE return TRUE
if(isOn() && user.a_intent == INTENT_HELP && ishuman(M)) if(user.a_intent == INTENT_HELP && ishuman(M))
var/mob/living/carbon/human/H = M var/mob/living/carbon/human/H = M
var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected)) var/obj/item/bodypart/affecting = H.get_bodypart(check_zone(user.zone_selected))
if(affecting?.status == BODYPART_ROBOTIC) if(affecting?.status == BODYPART_ROBOTIC)
@@ -127,9 +127,11 @@
return FALSE return FALSE
if(INTERACTING_WITH(user, H)) if(INTERACTING_WITH(user, H))
return FALSE return FALSE
if(!tool_start_check(user, 1))
return FALSE
user.changeNext_move(CLICK_CD_MELEE) user.changeNext_move(CLICK_CD_MELEE)
user.visible_message(span_notice("[user] starts to fix some of the dents on [M]'s [affecting.name]."), span_notice("You start fixing some of the dents on [M == user ? "your" : "[M]'s"] [affecting.name].")) user.visible_message(span_notice("[user] starts to fix some of the dents on [M]'s [affecting.name]."), span_notice("You start fixing some of the dents on [M == user ? "your" : "[M]'s"] [affecting.name]."))
heal_robo_limb(src, H, user, 15, 0, 1, 50) heal_robo_limb(src, H, user, 10, 0, 1, 50)
user.visible_message(span_notice("[user] fixes some of the dents on [M]'s [affecting.name]."), span_notice("You fix some of the dents on [M == user ? "your" : "[M]'s"] [affecting.name].")) user.visible_message(span_notice("[user] fixes some of the dents on [M]'s [affecting.name]."), span_notice("You fix some of the dents on [M == user ? "your" : "[M]'s"] [affecting.name]."))
return TRUE return TRUE

2
code/modules/power/cable.dm
View File

@@ -557,7 +557,7 @@ By design, d1 is the smallest direction and d2 is the highest
if(INTERACTING_WITH(user, H)) if(INTERACTING_WITH(user, H))
return FALSE return FALSE
user.visible_message(span_notice("[user] starts to fix some of the wires in [H]'s [affecting.name]."), span_notice("You start fixing some of the wires in [H == user ? "your" : "[H]'s"] [affecting.name].")) user.visible_message(span_notice("[user] starts to fix some of the wires in [H]'s [affecting.name]."), span_notice("You start fixing some of the wires in [H == user ? "your" : "[H]'s"] [affecting.name]."))
heal_robo_limb(src, H, user, 0, 15, 1) heal_robo_limb(src, H, user, 0, 10, 1)
user.visible_message(span_notice("[user] fixes the wires in [H]'s [affecting.name]."), span_notice("You fix the wires in [H == user ? "your" : "[H]'s"] [affecting.name].")) user.visible_message(span_notice("[user] fixes the wires in [H]'s [affecting.name]."), span_notice("You fix the wires in [H == user ? "your" : "[H]'s"] [affecting.name]."))
return return
return ..() return ..()

2
yogstation/code/game/objects/items/holotool/holotool.dm
View File

@@ -47,7 +47,7 @@
return FALSE return FALSE
user.changeNext_move(CLICK_CD_MELEE) user.changeNext_move(CLICK_CD_MELEE)
user.visible_message(span_notice("[user] starts to fix some of the dents on [M]'s [affecting.name]."), span_notice("You start fixing some of the dents on [M == user ? "your" : "[M]'s"] [affecting.name].")) user.visible_message(span_notice("[user] starts to fix some of the dents on [M]'s [affecting.name]."), span_notice("You start fixing some of the dents on [M == user ? "your" : "[M]'s"] [affecting.name]."))
heal_robo_limb(src, H, user, 15, 0, 0, 50) heal_robo_limb(src, H, user, 10, 0, 0, 50)
user.visible_message(span_notice("[user] fixes some of the dents on [M]'s [affecting.name]."), span_notice("You fix some of the dents on [M == user ? "your" : "[M]'s"] [affecting.name].")) user.visible_message(span_notice("[user] fixes some of the dents on [M]'s [affecting.name]."), span_notice("You fix some of the dents on [M == user ? "your" : "[M]'s"] [affecting.name]."))
return TRUE return TRUE
. = ..() . = ..()