cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15080 from Runa-Dacino/hotfixclimbing

Browse Source 
HOTFIX: Climbing fixes
This commit is contained in:
Heroman3003
2023-06-27 04:02:11 +10:00
committed by CHOMPStation2
parent 49516b7467
commit 1e3eec5549
2 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
View File

@@ -261,6 +261,7 @@
a climbable wall. To climbe like so, use the verb 'Climb Down Wall' in IC tab!" a climbable wall. To climbe like so, use the verb 'Climb Down Wall' in IC tab!"
cost = 0 cost = 0
custom_only = FALSE custom_only = FALSE
var_changes = list("can_climb" = TRUE)
allowed_species = list(SPECIES_XENOCHIMERA, SPECIES_CUSTOM) //So that we avoid needless bloat for xenochim allowed_species = list(SPECIES_XENOCHIMERA, SPECIES_CUSTOM) //So that we avoid needless bloat for xenochim
excludes = list(/datum/trait/positive/wall_climber_pro, /datum/trait/positive/wall_climber) excludes = list(/datum/trait/positive/wall_climber_pro, /datum/trait/positive/wall_climber)

29
code/modules/multiz/movement_vr.dm
View File

@@ -186,23 +186,28 @@
climb_time +=3 SECONDS climb_time +=3 SECONDS
if(fall_chance < 30) if(fall_chance < 30)
fall_chance = 30 fall_chance = 30
L.custom_emote(VISIBLE_MESSAGE, "begins to climb up on \The [src]") L.visible_message(message = "<b>[L]</b> begins to climb up on <b>\The [src]</b>", self_message = "You begin to clumb up on <b>\The [src]</b>", \
blind_message = "You hear the sounds of climbing!", runemessage = "Tap Tap")
var/oops_time = world.time var/oops_time = world.time
var/grace_time = 4 SECONDS var/grace_time = 4 SECONDS
to_chat(L, SPAN_WARNING("If you get interrupted after [(grace_time / (1 SECOND))] seconds of climbing, you will fall and hurt yourself, beware!")) to_chat(L, SPAN_WARNING("If you get interrupted after [(grace_time / (1 SECOND))] seconds of climbing, you will fall and hurt yourself, beware!"))
if(do_after(L,climb_time)) if(do_after(L,climb_time))
if(prob(fall_chance)) if(prob(fall_chance))
to_chat(L, SPAN_DANGER("You slipped and fell!"))
L.forceMove(above_mob) L.forceMove(above_mob)
L.visible_message(message = "<b>[L]</b> falls off <b>\The [src]</b>", self_message = SPAN_DANGER("You slipped off <b>\The [src]</b>"), \
blind_message = "you hear a loud thud!", runemessage = "CRASH!")
else else
if(drop_our_held) if(drop_our_held)
L.drop_item(get_turf(L)) L.drop_item(get_turf(L))
L.forceMove(above_wall) L.forceMove(above_wall)
L.visible_message(message = "<b>[L]</b> climbed up on <b>\The [src]</b>", \
self_message = SPAN_NOTICE("You successfully scaled <b>\The [src]</b>"), \
blind_message = "The sounds of climbing cease.", runemessage = "Tap Tap")
L.adjust_nutrition(-nutrition_cost) L.adjust_nutrition(-nutrition_cost)
to_chat(L, SPAN_NOTICE("You clambered up successfully!"))
else if(world.time > (oops_time + grace_time)) else if(world.time > (oops_time + grace_time))
L.forceMove(above_mob) L.forceMove(above_mob)
L.visible_message(message = "<b>[L]</b> falls off <b>\The [src]</b>", self_message = SPAN_DANGER("You slipped off <b>\The [src]</b>"), \
blind_message = "you hear a loud thud!", runemessage = "CRASH!")
/mob/living/verb/climb_down() /mob/living/verb/climb_down()
set name = "Climb down wall" set name = "Climb down wall"
@@ -303,17 +308,27 @@
to_chat(src, SPAN_DANGER("\The [climbing_surface] is not suitable for climbing! Even for a master climber, this is risky!")) to_chat(src, SPAN_DANGER("\The [climbing_surface] is not suitable for climbing! Even for a master climber, this is risky!"))
if(fall_chance < 75 ) if(fall_chance < 75 )
fall_chance = 75 fall_chance = 75
src.custom_emote(VISIBLE_MESSAGE, "begins to climb down along \The [below_wall]") src.visible_message(message = "<b>[src]</b> climb down <b>\The [below_wall]</b>", \
self_message = "You begin to descend <b>\The [below_wall]</b>", \
blind_message = "You hear the sounds of climbing!", runemessage = "Tap Tap")
below_wall.audible_message(message = "You hear something climbing up <b>\The [below_wall]</b>", runemessage= "Tap Tap")
var/oops_time = world.time var/oops_time = world.time
var/grace_time = 3 SECONDS var/grace_time = 3 SECONDS
to_chat(src, SPAN_WARNING("If you get interrupted after [(grace_time / (1 SECOND))] seconds of climbing, you will fall and hurt yourself, beware!")) to_chat(src, SPAN_WARNING("If you get interrupted after [(grace_time / (1 SECOND))] seconds of climbing, you will fall and hurt yourself, beware!"))
if(do_after(src,climb_time)) if(do_after(src,climb_time))
if(prob(fall_chance)) if(prob(fall_chance))
to_chat(src, SPAN_DANGER("You slipped and fell!"))
src.forceMove(front_of_us) src.forceMove(front_of_us)
src.visible_message(message = "<b>[src]</b> falls off <b>\The [below_wall]</b>", \
self_message = SPAN_DANGER("You slipped off <b>\The [below_wall]</b>"), \
blind_message = "you hear a loud thud!", runemessage = "CRASH!")
else else
src.forceMove(destination) src.forceMove(destination)
to_chat(src, SPAN_NOTICE("You descended successfully!")) src.visible_message(message = "<b>[src]</b> climbed down on <b>\The [below_wall]</b>", \
self_message = SPAN_NOTICE("You successfully descended <b>\The [below_wall]</b>"), \
blind_message = "The sounds of climbing cease.", runemessage = "Tap Tap")
adjust_nutrition(-nutrition_cost) adjust_nutrition(-nutrition_cost)
else if(world.time > (oops_time + grace_time)) else if(world.time > (oops_time + grace_time))
src.forceMove(front_of_us) src.forceMove(front_of_us)
src.visible_message(message = "<b>[src]</b> falls off <b>\The [below_wall]</b>", \
self_message = SPAN_DANGER("You slipped off <b>\The [below_wall]</b>"), \
blind_message = "you hear a loud thud!", runemessage = "CRASH!")