From 29d91a799549603abd1e99d96852af7e0149e4e4 Mon Sep 17 00:00:00 2001 From: Markolie Date: Sun, 30 Aug 2015 01:08:40 +0200 Subject: [PATCH 1/3] Allow for the construction of wheel chairs --- code/game/objects/items/stacks/sheets/sheet_types.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index af8ac8cc04f..5c50910f303 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -13,6 +13,7 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \ new/datum/stack_recipe("stool", /obj/structure/stool, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("chair", /obj/structure/stool/bed/chair, one_per_turf = 1, on_floor = 1), \ + new/datum/stack_recipe("wheelchair", /obj/structure/stool/bed/chair/wheelchair, 15, one_per_turf = 1, on_floor = 1), \ new/datum/stack_recipe("bed", /obj/structure/stool/bed, 2, one_per_turf = 1, on_floor = 1), \ null, \ new/datum/stack_recipe_list("office chairs",list( \ From 911bb109579fe3f4b563fc7d843e08ef504d3d73 Mon Sep 17 00:00:00 2001 From: Markolie Date: Sun, 30 Aug 2015 07:48:14 +0200 Subject: [PATCH 2/3] Fix IPC's entering occupied rechargers --- code/game/machinery/rechargestation.dm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 37220d43956..c8e02fb67cd 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -241,8 +241,15 @@ else if(istype(user, /mob/living/carbon/human)) var/mob/living/carbon/human/H = user - if(!isnull(H.internal_organs_by_name["cell"])) - can_accept_user = 1 + + if(H.stat == DEAD) + return + if(occupant) + R << "The cell is already occupied!" + return + if(isnull(H.internal_organs_by_name["cell"])) + return + can_accept_user = 1 if(!can_accept_user) user << "Only non-organics may enter the recharger!" From 8ba68325904e0d066b0b74a17bcbbf4415c340f9 Mon Sep 17 00:00:00 2001 From: Markolie Date: Sun, 30 Aug 2015 07:48:55 +0200 Subject: [PATCH 3/3] Fix reference to mob --- code/game/machinery/rechargestation.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index c8e02fb67cd..7ff7cc466d8 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -245,7 +245,7 @@ if(H.stat == DEAD) return if(occupant) - R << "The cell is already occupied!" + H << "The cell is already occupied!" return if(isnull(H.internal_organs_by_name["cell"])) return