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

Also allows people to take their wheelchairs with them instead of leaving them behind, and fixes a runtime with wheelchair users who are missing hands or arms.

Browse Source
This commit is contained in:
PrismaticGynoid
2017-08-09 18:43:13 -07:00
parent 1f1f537e1c
commit b5ccfbd328
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/game/machinery/cryopod.dm
View File

@@ -430,6 +430,10 @@
else else
W.forceMove(src.loc) W.forceMove(src.loc)
for(var/obj/structure/B in items)
if(istype(B,/obj/structure/bed))
qdel(B)
//Update any existing objectives involving this mob. //Update any existing objectives involving this mob.
for(var/datum/objective/O in all_objectives) for(var/datum/objective/O in all_objectives)
// We don't want revs to get objectives that aren't for heads of staff. Letting // We don't want revs to get objectives that aren't for heads of staff. Letting
@@ -521,6 +525,9 @@
for(var/obj/item/W in items) for(var/obj/item/W in items)
W.forceMove(get_turf(src)) W.forceMove(get_turf(src))
for(var/obj/structure/bed/S in src.contents)
S.forceMove(get_turf(src))
go_out() go_out()
add_fingerprint(usr) add_fingerprint(usr)
@@ -563,6 +570,8 @@
if(ishuman(usr) && applies_stasis) if(ishuman(usr) && applies_stasis)
var/mob/living/carbon/human/H = occupant var/mob/living/carbon/human/H = occupant
H.Stasis(1000) H.Stasis(1000)
if(usr.buckled && istype(usr.buckled, /obj/structure/bed/chair/wheelchair))
usr.buckled.loc = usr.loc
icon_state = occupied_icon_state icon_state = occupied_icon_state
@@ -660,6 +669,8 @@
if(ishuman(M) && applies_stasis) if(ishuman(M) && applies_stasis)
var/mob/living/carbon/human/H = M var/mob/living/carbon/human/H = M
H.Stasis(1000) H.Stasis(1000)
if(M.buckled && istype(M.buckled, /obj/structure/bed/chair/wheelchair))
M.buckled.loc = M.loc
// Book keeping! // Book keeping!
var/turf/location = get_turf(src) var/turf/location = get_turf(src)

2
code/modules/mob/living/carbon/human/human_movement.dm
View File

@@ -35,7 +35,7 @@
var/obj/item/organ/external/E = get_organ(organ_name) var/obj/item/organ/external/E = get_organ(organ_name)
if(!E || E.is_stump()) if(!E || E.is_stump())
tally += 4 tally += 4
if(E.splinted) else if(E.splinted)
tally += 0.5 tally += 0.5
else if(E.status & ORGAN_BROKEN) else if(E.status & ORGAN_BROKEN)
tally += 1.5 tally += 1.5

1
html/changelogs/PrismaticGynoid-wheelchairs.yml
View File

@@ -3,3 +3,4 @@ delete-after: True
changes: changes:
- rscadd: "Wheelchairs can now be collapsed like rollerbeds for ease of storage and movement. Too big to put in backpacks though." - rscadd: "Wheelchairs can now be collapsed like rollerbeds for ease of storage and movement. Too big to put in backpacks though."
- rscadd: "Wheelchairs are now available in a color-customizable form via the loadout, under utility. Now you can ride in style, and keep your feet too." - rscadd: "Wheelchairs are now available in a color-customizable form via the loadout, under utility. Now you can ride in style, and keep your feet too."
- bugfix: "Wheelchair users can now enter the gateway and residential elevator without being forced to leave behind their mobility aid."