mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-11 07:58:57 +01:00
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
This commit is contained in:
@@ -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)
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -580,7 +580,7 @@
|
||||
to_chat(src, "<span class='danger'>You cannot charge in your current state!</span>")
|
||||
return
|
||||
|
||||
last_special = world.time + 200
|
||||
last_special = world.time + 100
|
||||
|
||||
src.visible_message("<span class='warning'>\The [src] takes a step backwards and rears up.</span>",
|
||||
"<span class='notice'>You take a step backwards and then...</span>")
|
||||
@@ -673,7 +673,7 @@
|
||||
to_chat(src, "<span class='danger'>You cannot screech in your current state!</span>")
|
||||
return
|
||||
|
||||
last_special = world.time + 200
|
||||
last_special = world.time + 100
|
||||
|
||||
visible_message("<span class='danger'>[src.name] lets out an ear piercing shriek!</span>",
|
||||
"<span class='danger'>You let out an ear-shattering shriek!</span>",
|
||||
@@ -720,7 +720,7 @@
|
||||
to_chat(src,"<span class='notice'>You cannot spray napalm in your current state.</span>")
|
||||
return
|
||||
|
||||
last_special = world.time + 200
|
||||
last_special = world.time + 100
|
||||
playsound(loc, 'sound/species/shadow/grue_screech.ogg', 100, 1)
|
||||
visible_message("<span class='danger'>\The [src] unleashes a torrent of raging flame!</span>",
|
||||
"<span class='danger'>You unleash a gust of fire!</span>",
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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."
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |
Reference in New Issue
Block a user