From 7d83324a270fba59d5e149440304aa37c6fbbab4 Mon Sep 17 00:00:00 2001 From: BurgerLUA Date: Sat, 17 Mar 2018 15:50:46 -0700 Subject: [PATCH] Miscellaneous Tweaks (#4362) Overview This is just a misc fix PR to minor annoyances I encountered while playing on the server. This fixes the following: Resisting from a chair unrestrained no longer adds a cooldown to activating objects. Action figures are no longer massive, and only take up 1 slot in your inventory. Boxing gloves can now be worn by any race. The ore summoner can only move up to 10 ore at a time. --- code/game/objects/items/toys.dm | 40 +++++++++++++----------- code/modules/clothing/gloves/boxing.dm | 1 + code/modules/mining/mine_items.dm | 5 ++- code/modules/mob/living/carbon/resist.dm | 14 ++++----- html/changelogs/burgerbb-simplefixes.yml | 9 ++++++ 5 files changed, 42 insertions(+), 27 deletions(-) create mode 100644 html/changelogs/burgerbb-simplefixes.yml diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index d359b8becc1..8ee515dc2b3 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -98,7 +98,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "syndballoon" item_state = "syndballoon" - w_class = 4.0 + w_class = ITEMSIZE_LARGE /obj/item/toy/nanotrasenballoon name = "criminal balloon" @@ -110,7 +110,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "ntballoon" item_state = "ntballoon" - w_class = 4.0 + w_class = ITEMSIZE_LARGE /* * Fake telebeacon @@ -145,7 +145,7 @@ icon_l_hand = 'icons/mob/items/lefthand_guns.dmi', icon_r_hand = 'icons/mob/items/righthand_guns.dmi' ) - w_class = 2.0 + w_class = ITEMSIZE_SMALL attack_verb = list("attacked", "struck", "hit") var/bullets = 5 @@ -238,7 +238,7 @@ desc = "It's nerf or nothing! Ages 8 and up." icon = 'icons/obj/toy.dmi' icon_state = "foamdart" - w_class = 1.0 + w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS /obj/effect/foam_dart_dummy @@ -261,7 +261,7 @@ item_state = "sword0" var/active = 0.0 var/colorvar = "blue" - w_class = 2.0 + w_class = ITEMSIZE_SMALL attack_verb = list("attacked", "struck", "hit") attack_self(mob/user as mob) src.active = !( src.active ) @@ -270,13 +270,13 @@ playsound(user, 'sound/weapons/saberon.ogg', 50, 1) src.icon_state = "sword[colorvar]" src.item_state = "sword[colorvar]" - src.w_class = 4 + src.w_class = ITEMSIZE_LARGE else user << "You push the plastic blade back down into the handle." playsound(user, 'sound/weapons/saberoff.ogg', 50, 1) src.icon_state = "sword0" src.item_state = "sword0" - src.w_class = 2 + src.w_class = ITEMSIZE_SMALL if(istype(user,/mob/living/carbon/human)) var/mob/living/carbon/human/H = user @@ -301,7 +301,7 @@ slot_flags = SLOT_BELT | SLOT_BACK force = 5 throwforce = 5 - w_class = 3 + w_class = ITEMSIZE_NORMAL attack_verb = list("attacked", "slashed", "stabbed", "sliced") /* @@ -312,7 +312,7 @@ desc = "Wow!" icon = 'icons/obj/toy.dmi' icon_state = "snappop" - w_class = 1 + w_class = ITEMSIZE_TINY throw_impact(atom/hit_atom) ..() @@ -412,7 +412,7 @@ icon = 'icons/obj/toy.dmi' icon_state = "bosunwhistle" var/cooldown = 0 - w_class = 1 + w_class = ITEMSIZE_TINY slot_flags = SLOT_EARS /obj/item/toy/bosunwhistle/attack_self(mob/user as mob) @@ -428,6 +428,7 @@ icon = 'icons/obj/toy.dmi' icon_state = "ripleytoy" var/cooldown = 0 + w_class = ITEMSIZE_SMALL //all credit to skasi for toy mech fun ideas /obj/item/toy/prize/attack_self(mob/user as mob) @@ -508,6 +509,7 @@ desc = "A \"Space Life\" brand... wait, what the hell is this thing? It seems to be requesting the sweet release of death." icon_state = "assistant" icon = 'icons/obj/toy.dmi' + w_class = ITEMSIZE_TINY /obj/item/toy/figure/cmo name = "Chief Medical Officer action figure" @@ -705,7 +707,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "therapyred" item_state = "egg4" // It's the red egg in items_left/righthand - w_class = 1 + w_class = ITEMSIZE_TINY /obj/item/toy/therapy_purple name = "purple therapy doll" @@ -713,7 +715,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "therapypurple" item_state = "egg1" // It's the magenta egg in items_left/righthand - w_class = 1 + w_class = ITEMSIZE_TINY /obj/item/toy/therapy_blue name = "blue therapy doll" @@ -721,7 +723,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "therapyblue" item_state = "egg2" // It's the blue egg in items_left/righthand - w_class = 1 + w_class = ITEMSIZE_TINY /obj/item/toy/therapy_yellow name = "yellow therapy doll" @@ -729,7 +731,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "therapyyellow" item_state = "egg5" // It's the yellow egg in items_left/righthand - w_class = 1 + w_class = ITEMSIZE_TINY /obj/item/toy/therapy_orange name = "orange therapy doll" @@ -737,7 +739,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "therapyorange" item_state = "egg4" // It's the red one again, lacking an orange item_state and making a new one is pointless - w_class = 1 + w_class = ITEMSIZE_TINY /obj/item/toy/therapy_green name = "green therapy doll" @@ -745,7 +747,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "therapygreen" item_state = "egg3" // It's the green egg in items_left/righthand - w_class = 1 + w_class = ITEMSIZE_TINY /* * Plushies @@ -856,7 +858,7 @@ icon = 'icons/obj/weapons.dmi' icon_state = "cultblade" item_state = "cultblade" - w_class = 4 + w_class = ITEMSIZE_LARGE attack_verb = list("attacked", "slashed", "stabbed", "poked") /* NYET. @@ -865,7 +867,7 @@ name = "toddler" desc = "This baby looks almost real. Wait, did it just burp?" force = 5 - w_class = 4.0 + w_class = ITEMSIZE_LARGE slot_flags = SLOT_BACK */ @@ -884,6 +886,6 @@ desc = "Now with 99% less pine needles." icon = 'icons/obj/toy.dmi' icon_state = "tinyxmastree" - w_class = 1 + w_class = ITEMSIZE_TINY force = 1 throwforce = 1 diff --git a/code/modules/clothing/gloves/boxing.dm b/code/modules/clothing/gloves/boxing.dm index b965ca9a558..ada83ce6eee 100644 --- a/code/modules/clothing/gloves/boxing.dm +++ b/code/modules/clothing/gloves/boxing.dm @@ -3,6 +3,7 @@ desc = "Because you really needed another excuse to punch your crewmates." icon_state = "boxing" item_state = "boxing" + species_restricted = list() /obj/item/clothing/gloves/boxing/attackby(obj/item/weapon/W, mob/user) if(iswirecutter(W) || istype(W, /obj/item/weapon/scalpel)) diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index e8ad1e4bb7b..f7a2984e2d5 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -1127,10 +1127,13 @@ var/list/total_extraction_beacons = list() /obj/item/weapon/oreportal/attack_self(mob/user) user << "You pulse the ore summoner." + var/limit = 10 for(var/obj/item/weapon/ore/O in orange(7,user)) + if(limit <= 0) + break single_spark(O.loc) do_teleport(O, user, 0) - + limit -= 1 CHECK_TICK /******************************Sculpting*******************************/ diff --git a/code/modules/mob/living/carbon/resist.dm b/code/modules/mob/living/carbon/resist.dm index e2b93d0fd48..746a2f94ae9 100644 --- a/code/modules/mob/living/carbon/resist.dm +++ b/code/modules/mob/living/carbon/resist.dm @@ -21,15 +21,14 @@ ..() - if(handcuffed) - spawn() escape_handcuffs() - else if(legcuffed) - spawn() escape_legcuffs() + if (handcuffed) + INVOKE_ASYNC(src, .proc/escape_handcuffs) + else if (legcuffed) + INVOKE_ASYNC(src, .proc/escape_legcuffs) /mob/living/carbon/human/process_resist() if (istype(wear_suit, /obj/item/clothing/suit/straight_jacket)) - spawn - escape_jacket() + INVOKE_ASYNC(src, .proc/escape_jacket) return ..() @@ -200,12 +199,13 @@ return ..() /mob/living/carbon/escape_buckle() - setClickCooldown(100) + if(!buckled) return if(!restrained()) ..() else + setClickCooldown(100) visible_message( "[usr] attempts to unbuckle themself!", "You attempt to unbuckle yourself. (This will take around 2 minutes and you need to stand still)" diff --git a/html/changelogs/burgerbb-simplefixes.yml b/html/changelogs/burgerbb-simplefixes.yml new file mode 100644 index 00000000000..4972bb1f837 --- /dev/null +++ b/html/changelogs/burgerbb-simplefixes.yml @@ -0,0 +1,9 @@ +author: BurgerBB + +delete-after: True + +changes: + - bugfix: "Resisting from a chair unrestrained no longer adds a cooldown to activating objects." + - bugfix: "Action figures are no longer massive, and only take up 1 slot in your inventory." + - bugfix: "Boxing gloves can now be worn by any race." + - tweak: "The ore summoner can only move up to 10 ore at a time."