From 0b2ea5f78ae6a37040ba75cac873756f4e4e5b8a Mon Sep 17 00:00:00 2001 From: Alberyk Date: Sat, 28 Jul 2018 20:31:33 -0300 Subject: [PATCH] July update: vaurca and mining fixes (#5047) -fixes #5046 -fixes #5037 -fixes #5036 -changes that you can only climb walls by being in the grab intent, to avoid falls by accident when clicking a wall -changes the cooldown of the warform at bygone's request --- code/game/turfs/simulated/wall_attacks.dm | 2 +- code/modules/clothing/spacesuits/void/void.dm | 6 ++++-- code/modules/mining/mine_turfs.dm | 5 +---- .../mob/living/carbon/human/human_powers.dm | 6 +++--- code/modules/multiz/turfs/open_space.dm | 2 +- html/changelogs/alberyk-climbing.yml | 6 ++++++ icons/obj/clothing/species/vaurca/hats.dmi | Bin 0 -> 2181 bytes icons/obj/clothing/species/vaurca/suits.dmi | Bin 0 -> 2233 bytes icons/obj/rig_modules.dmi | Bin 26501 -> 26851 bytes 9 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 html/changelogs/alberyk-climbing.yml create mode 100644 icons/obj/clothing/species/vaurca/hats.dmi create mode 100644 icons/obj/clothing/species/vaurca/suits.dmi diff --git a/code/game/turfs/simulated/wall_attacks.dm b/code/game/turfs/simulated/wall_attacks.dm index 45bb772376f..b5ea2a37a41 100644 --- a/code/game/turfs/simulated/wall_attacks.dm +++ b/code/game/turfs/simulated/wall_attacks.dm @@ -71,7 +71,7 @@ fail_smash(user, 2) return 1 - if(ishuman(user)) + if(ishuman(user) && user.a_intent == I_GRAB) var/mob/living/carbon/human/H = user var/turf/destination = GetAbove(H) diff --git a/code/modules/clothing/spacesuits/void/void.dm b/code/modules/clothing/spacesuits/void/void.dm index 24939fcf64f..730539f48fd 100644 --- a/code/modules/clothing/spacesuits/void/void.dm +++ b/code/modules/clothing/spacesuits/void/void.dm @@ -20,7 +20,8 @@ sprite_sheets_obj = list( "Unathi" = 'icons/obj/clothing/species/unathi/hats.dmi', "Tajara" = 'icons/obj/clothing/species/tajaran/hats.dmi', - "Skrell" = 'icons/obj/clothing/species/skrell/hats.dmi' + "Skrell" = 'icons/obj/clothing/species/skrell/hats.dmi', + "Vaurca" = 'icons/obj/clothing/species/vaurca/hats.dmi' ) light_overlay = "helmet_light" @@ -47,7 +48,8 @@ sprite_sheets_obj = list( "Unathi" = 'icons/obj/clothing/species/unathi/suits.dmi', "Tajara" = 'icons/obj/clothing/species/tajaran/suits.dmi', - "Skrell" = 'icons/obj/clothing/species/skrell/suits.dmi' + "Skrell" = 'icons/obj/clothing/species/skrell/suits.dmi', + "Vaurca" = 'icons/obj/clothing/species/vaurca/suits.dmi' ) //Breach thresholds, should ideally be inherited by most (if not all) voidsuits. diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index 672321a21b3..8319d5d40b8 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -342,9 +342,6 @@ var/list/mineral_can_smooth_with = list( new /obj/structure/sculpting_block(src) GetDrilled(1) - else - return attack_hand(user) - /turf/simulated/mineral/proc/clear_ore_effects() if (my_mineral) qdel(my_mineral) @@ -517,7 +514,7 @@ var/list/mineral_can_smooth_with = list( add_fingerprint(user) user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) - if(ishuman(user)) + if(ishuman(user) && user.a_intent == I_GRAB) var/mob/living/carbon/human/H = user var/turf/destination = GetAbove(H) diff --git a/code/modules/mob/living/carbon/human/human_powers.dm b/code/modules/mob/living/carbon/human/human_powers.dm index 2906bd6f29e..a439cd5ed1c 100644 --- a/code/modules/mob/living/carbon/human/human_powers.dm +++ b/code/modules/mob/living/carbon/human/human_powers.dm @@ -580,7 +580,7 @@ to_chat(src, "You cannot charge in your current state!") return - last_special = world.time + 200 + last_special = world.time + 100 src.visible_message("\The [src] takes a step backwards and rears up.", "You take a step backwards and then...") @@ -673,7 +673,7 @@ to_chat(src, "You cannot screech in your current state!") return - last_special = world.time + 200 + last_special = world.time + 100 visible_message("[src.name] lets out an ear piercing shriek!", "You let out an ear-shattering shriek!", @@ -720,7 +720,7 @@ to_chat(src,"You cannot spray napalm in your current state.") return - last_special = world.time + 200 + last_special = world.time + 100 playsound(loc, 'sound/species/shadow/grue_screech.ogg', 100, 1) visible_message("\The [src] unleashes a torrent of raging flame!", "You unleash a gust of fire!", diff --git a/code/modules/multiz/turfs/open_space.dm b/code/modules/multiz/turfs/open_space.dm index c9c18ff20bd..b1750e990d2 100644 --- a/code/modules/multiz/turfs/open_space.dm +++ b/code/modules/multiz/turfs/open_space.dm @@ -208,7 +208,7 @@ /turf/simulated/open/attack_hand(var/mob/user) - if(ishuman(user)) + if(ishuman(user) && user.a_intent == I_GRAB) var/mob/living/carbon/human/H = user var/turf/climbing_wall = GetBelow(H) var/climb_bonus = 0 diff --git a/html/changelogs/alberyk-climbing.yml b/html/changelogs/alberyk-climbing.yml new file mode 100644 index 00000000000..76f2fbd7d6c --- /dev/null +++ b/html/changelogs/alberyk-climbing.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - tweak: "You now need to be in the grab intent to climb up walls and climb down open spaces." diff --git a/icons/obj/clothing/species/vaurca/hats.dmi b/icons/obj/clothing/species/vaurca/hats.dmi new file mode 100644 index 0000000000000000000000000000000000000000..532097457f66f1f95e115368c1e858648c465076 GIT binary patch literal 2181 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 Hu0mjfPSnwA literal 0 HcmV?d00001 diff --git a/icons/obj/rig_modules.dmi b/icons/obj/rig_modules.dmi index 3aace212773607fc60ca7bbd0c15d90ad81f1345..abb537967308e8fff94942a825c8e48980ee7d8b 100644 GIT binary patch delta 8082 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 b+cj4omm5g|psfZB2=FB(E-zLoYUuwzF4i;1 delta 7729 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