cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates wheelchair code for the new chair-lennium. (#12813)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2021-12-07 13:52:58 -03:00
committed by GitHub
parent 95793597a0
commit 527698d6a8
28 changed files with 222 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/abstract/new_player/new_player.dm
+1 -1
View File
@@ -274,7 +274,7 @@ INITIALIZE_IMMEDIATE(/mob/abstract/new_player)
character.lastarea = get_area(loc)
// Moving wheelchair if they have one
if(character.buckled_to && istype(character.buckled_to, /obj/structure/bed/stool/chair/wheelchair))
if(character.buckled_to && istype(character.buckled_to, /obj/structure/bed/stool/chair/office/wheelchair))
character.buckled_to.forceMove(character.loc)
character.buckled_to.set_dir(character.dir)
code/modules/mob/living/carbon/human/species/species.dm
+1 -1
View File
@@ -733,7 +733,7 @@
/datum/species/proc/handle_movement_tally(var/mob/living/carbon/human/H)
var/tally = 0
if(istype(H.buckled_to, /obj/structure/bed/stool/chair/wheelchair))
if(istype(H.buckled_to, /obj/structure/bed/stool/chair/office/wheelchair))
for(var/organ_name in list(BP_L_HAND,BP_R_HAND,BP_L_ARM,BP_R_ARM))
var/obj/item/organ/external/E = H.get_organ(organ_name)
if(!E || E.is_stump())
code/modules/mob/living/carbon/human/species/station/golem.dm
+1 -1
View File
@@ -908,7 +908,7 @@ var/global/list/golem_types = list(SPECIES_GOLEM_COAL,
/datum/species/golem/technomancer/handle_movement_tally(var/mob/living/carbon/human/H)
var/tally = 0
if(istype(H.buckled_to, /obj/structure/bed/stool/chair/wheelchair))
if(istype(H.buckled_to, /obj/structure/bed/stool/chair/office/wheelchair))
for(var/organ_name in list(BP_L_HAND,BP_R_HAND,BP_L_ARM,BP_R_ARM))
var/obj/item/organ/external/E = H.get_organ(organ_name)
if(!E || E.is_stump())
code/modules/mob/mob_helpers.dm
+1 -1
View File
@@ -1166,7 +1166,7 @@ proc/is_blind(A)
return species.handle_stance_damage(src, TRUE) >= 4
/mob/living/carbon/human/proc/equip_wheelchair()
var/obj/structure/bed/stool/chair/wheelchair/W = new(get_turf(src))
var/obj/structure/bed/stool/chair/office/wheelchair/W = new(get_turf(src))
if(isturf(loc))
buckled_to = W
update_canmove()
code/modules/mob/mob_movement.dm
+2 -2
View File
@@ -280,7 +280,7 @@
//TODO: Fuck wheelchairs.
//Toss away all this snowflake code here, and rewrite wheelchairs as a vehicle.
else if(istype(mob.buckled_to, /obj/structure/bed/stool/chair/wheelchair))
else if(istype(mob.buckled_to, /obj/structure/bed/stool/chair/office/wheelchair))
var/min_move_delay = 0
if(ishuman(mob.buckled_to))
var/mob/living/carbon/human/driver = mob.buckled_to
@@ -325,7 +325,7 @@
//Wheelchair pushing goes here for now.
//TODO: Fuck wheelchairs.
if(istype(mob.pulledby, /obj/structure/bed/stool/chair/wheelchair) || istype(mob.pulledby, /obj/structure/janitorialcart))
if(istype(mob.pulledby, /obj/structure/bed/stool/chair/office/wheelchair) || istype(mob.pulledby, /obj/structure/janitorialcart))
move_delay += 1
return mob.pulledby.relaymove(mob, direct)