diff --git a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm index 51ba07a3a22..906dc7ec5b6 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm @@ -193,3 +193,35 @@ pulling = null usr.pulledby = null ..() + +/obj/item/wheelchair + name = "wheelchair" + desc = "A folded wheelchair that can be carried around." + icon = 'icons/obj/furniture.dmi' + icon_state = "wheelchair_folded" + item_state = "wheelchair" + w_class = ITEMSIZE_HUGE // Can't be put in backpacks. Oh well. + +/obj/item/wheelchair/attack_self(mob/user) + var/obj/structure/bed/chair/wheelchair/R = new /obj/structure/bed/chair/wheelchair(user.loc) + R.add_fingerprint(user) + R.name = src.name + R.desc = src.desc + R.color = src.color + qdel(src) + +/obj/structure/bed/chair/wheelchair/MouseDrop(over_object, src_location, over_location) + ..() + if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))) + if(!ishuman(usr)) + return FALSE + if(buckled_mob) + return FALSE + visible_message(SPAN_NOTICE("[usr] collapses [src].")) + var/obj/item/wheelchair/R = new(get_turf(src)) + R.name = src.name + R.desc = src.desc + R.color = src.color + usr.put_in_hands(R) + qdel(src) + diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm index 81a8e1806d2..99856f93f7a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_utility.dm +++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm @@ -115,3 +115,12 @@ display_name = "himean voidsuit kit" path = /obj/item/himeo_kit allowed_roles = list("Cargo Technician", "Shaft Miner", "Quartermaster", "Head of Personnel", "Station Engineer", "Atmospheric Technician", "Chief Engineer", "Engineering Apprentice") + +/datum/gear/utility/wheelchair/color + display_name = "wheelchair" + path = /obj/item/wheelchair + cost = 4 + +/datum/gear/utility/wheelchair/color/New() + ..() + gear_tweaks += gear_tweak_free_color_choice diff --git a/html/changelogs/flpfs-wheelchair.yml b/html/changelogs/flpfs-wheelchair.yml new file mode 100644 index 00000000000..488f734225b --- /dev/null +++ b/html/changelogs/flpfs-wheelchair.yml @@ -0,0 +1,5 @@ +author: Flpfs +delete-after: True +changes: + - rscadd: "Ports collapsible wheelchairs from Polaris." + - rscadd: "Wheelchairs are now available in a color-customizable form via the loadout, under utility." \ No newline at end of file diff --git a/icons/mob/items/lefthand.dmi b/icons/mob/items/lefthand.dmi index 993a22bed0e..ebceacffca6 100644 Binary files a/icons/mob/items/lefthand.dmi and b/icons/mob/items/lefthand.dmi differ diff --git a/icons/mob/items/righthand.dmi b/icons/mob/items/righthand.dmi index 2f154fa694f..bea5bd2384e 100644 Binary files a/icons/mob/items/righthand.dmi and b/icons/mob/items/righthand.dmi differ diff --git a/icons/obj/furniture.dmi b/icons/obj/furniture.dmi index 5209e001d7a..f623017dc06 100644 Binary files a/icons/obj/furniture.dmi and b/icons/obj/furniture.dmi differ