diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 93b01f3951f..d6daf0f4516 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -57,8 +57,8 @@ return 1 /obj/machinery/recharge_station/Bumped(var/mob/AM) - move_inside(AM) - + move_inside(AM) + /obj/machinery/recharge_station/allow_drop() return 0 @@ -145,7 +145,7 @@ // ^ makes sinle list of active (R.contents) and inactive modules (R.module.modules) for(var/obj/O in um) // Engineering - if(istype(O,/obj/item/stack/sheet/metal) || istype(O,/obj/item/stack/sheet/rglass) || istype(O,/obj/item/stack/cable_coil)) + if(istype(O,/obj/item/stack/sheet)) var/obj/item/stack/sheet/S = O if(S.amount < 50) S.amount += 1 * coeff @@ -210,14 +210,14 @@ /obj/machinery/recharge_station/verb/move_inside(var/mob/user = usr) set category = "Object" set src in oview(1) - + if(!user) return - + if (panel_open) usr << "Close the maintenance panel first." - return - + return + var/can_accept_user if(isrobot(user)) var/mob/living/silicon/robot/R = user @@ -232,16 +232,16 @@ R << "Without a power cell, you can't be recharged." //Make sure they actually HAVE a cell, now that they can get in while powerless. --NEO return - can_accept_user = 1 - + can_accept_user = 1 + else if(istype(user, /mob/living/carbon/human)) var/mob/living/carbon/human/H = user - + if(H.stat == DEAD) - return + return if(occupant) H << "The cell is already occupied!" - return + return if(isnull(H.internal_organs_by_name["cell"])) return can_accept_user = 1 @@ -261,4 +261,3 @@ build_icon() update_use_power(1) return - \ No newline at end of file diff --git a/code/modules/examine/descriptions/stacks.dm b/code/modules/examine/descriptions/stacks.dm index 431e5c37b9a..6b47c1ab421 100644 --- a/code/modules/examine/descriptions/stacks.dm +++ b/code/modules/examine/descriptions/stacks.dm @@ -9,10 +9,10 @@ description_info = "Use in your hand to build a window. Can be upgraded to reinforced glass by adding metal rods, which are made from metal sheets.
\ As a synthetic, you can acquire more sheets of glass by recharging." -/obj/item/stack/sheet/glass/reinforced +/obj/item/stack/sheet/rglass description_info = "Use in your hand to build a window. Reinforced glass is much stronger against damage." -/obj/item/stack/sheet/glass/reinforced/cyborg +/obj/item/stack/sheet/rglass/cyborg description_info = "Use in your hand to build a window. Reinforced glass is much stronger against damage.
\ As a synthetic, you can gain more reinforced glass by recharging."