From cb561ff456c3dbacd9b576afd8a377813b4b88af Mon Sep 17 00:00:00 2001 From: QuoteFox <49098813+quotefox@users.noreply.github.com> Date: Tue, 3 Mar 2020 13:16:25 +0000 Subject: [PATCH] fix for plushie reward --- code/game/objects/items/stacks/medical.dm | 7 ++++--- hyperstation/code/obj/plushes.dm | 1 - modular_citadel/code/modules/client/loadout/__donator.dm | 8 +++++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 794e3e76..af6f02cd 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -95,8 +95,9 @@ if(affecting.heal_damage(heal_brute, heal_burn)) C.update_damage_overlays() if (fix_bone) //Fix broken bones on targeted limb - affecting.broken = 0 - affecting.disabled = 0 + if(affecting.broken == 1) + affecting.broken = 0 + affecting.disabled = 0 else to_chat(user, "Medicine won't work on a robotic limb!") else @@ -108,7 +109,7 @@ name = "plaster gauze" gender = PLURAL singular_name = "plaster gauze" - desc = "A roll of plaster of paris that is extremely effective at aiding bone fratcutres, but does not heal wounds." + desc = "A roll of plaster of paris that is extremely effective at aiding bone fractures, but does not heal wounds." icon_state = "pgauze" self_delay = 300 max_amount = 10 diff --git a/hyperstation/code/obj/plushes.dm b/hyperstation/code/obj/plushes.dm index 6332fc9f..ad6af38f 100644 --- a/hyperstation/code/obj/plushes.dm +++ b/hyperstation/code/obj/plushes.dm @@ -8,7 +8,6 @@ /obj/item/toy/plush/mammal/marilyn desc = "A cute stuffed fox toy. Now, about that sponge bath..." icon = 'hyperstation/icons/obj/plushes.dmi' - attack_verb = list("hugged", "cuddled", "embraced") icon_state = "marilyn" item_state = "marilyn" diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm index 7fdbe278..393be9c7 100644 --- a/modular_citadel/code/modules/client/loadout/__donator.dm +++ b/modular_citadel/code/modules/client/loadout/__donator.dm @@ -13,11 +13,17 @@ path = /obj/item/bikehorn geargroupID = list("DONORTEST") //This is a list mainly for the sake of testing, but geargroupID works just fine with ordinary strings +/datum/gear/quotestestitem + name = "Will Plushy" + category = SLOT_IN_BACKPACK + path = /obj/item/toy/plush/mammal/winterbloo + ckeywhitelist = list("quotefox") + /datum/gear/winterblooplush name = "Will Plush" category = SLOT_IN_BACKPACK path = /obj/item/toy/plush/mammal/winterbloo - ckeywhitelist = list("wolfy_wolf967") + ckeywhitelist = list("wolfy wolf967") /datum/gear/helioplush name = "Chris Plushie"