From e19cc2ebfff1150372c0441b0580e2b3e538953b Mon Sep 17 00:00:00 2001 From: BlackMajor Date: Sat, 20 Aug 2022 19:35:05 +1200 Subject: [PATCH] some fixes --- .../species/station/protean/protean_rig.dm | 44 +++++++++++++------ .../station/protean/protean_rig_tgui.dm | 5 ++- 2 files changed, 34 insertions(+), 15 deletions(-) diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm index 79618a432e..3e7be7feae 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig.dm @@ -27,6 +27,7 @@ //interface_path = "RIGSuit_protean" //ai_interface_path = "RIGSuit_protean" var/sealed = 0 + var/reviving = 0 /obj/item/weapon/rig/protean/relaymove(mob/user, var/direction) if(user.stat || user.stunned) @@ -68,15 +69,15 @@ else to_chat(P,"Your rigsuit can only assimilate a backpack into itself. If you are seeing this message, and you do not have a rigsuit, tell a coder.") -/obj/item/weapon/rig/verb/RemoveBag(var/mob/living/L) +/obj/item/weapon/rig/verb/RemoveBag() set name = "Remove Stored Bag" set category = "Object" if(rig_storage) - L.put_in_hands(rig_storage) + usr.put_in_hands(rig_storage) rig_storage = null else - to_chat(L, "This Rig does not have a bag installed. Use a bag on it to install one.") + to_chat(usr, "This Rig does not have a bag installed. Use a bag on it to install one.") /obj/item/weapon/rig/protean/attack_hand(mob/user as mob) if (src.loc == user) @@ -354,13 +355,17 @@ if(dead) if(istype(W, /obj/item/stack/material/plasteel)) var/obj/item/stack/material/plasteel/PL = W - if(PL.get_amount() < 5) - to_chat(user, "You need five sheets of plasteel to reconstruct this Protean.") - return - if(PL.use(5)) - to_chat(user, "You feed plasteel to the Protean, they will be able to reconstitute now.") - make_alive(myprotean) - return + if(!reviving) + if(PL.get_amount() < 5) + to_chat(user, "You need five sheets of plasteel to reconstruct this Protean.") + return + if(PL.use(5)) + to_chat(user, "You feed plasteel to the Protean, they will be able to reconstitute in a minute from now.") + to_chat(myprotean, "You've been fed the necessary plasteel to reconstitute your form, you will be able to reconstitute in one minute.") + addtimer(CALLBACK(src, .proc/make_alive, myprotean), 600) + return + else + to_chat(user, "This Protean is already reconstituting") if(rig_storage) var/obj/item/weapon/storage/backpack = rig_storage if(backpack.can_be_inserted(W, 1)) @@ -397,7 +402,8 @@ S = H.species S.pseudodead = 0 dead = 0 - to_chat(P, "You've been fed the necessary plasteel to reconstitute your form, you can act again!") + reviving = 0 + to_chat(P, "You have finished reconstituting.") /obj/item/weapon/rig/protean/take_hit(damage, source, is_emp=0) return //We don't do that here @@ -448,7 +454,7 @@ else canremove = 0 -/obj/item/weapon/rig/protean/ai_can_move_suit(var/mob/user) +/obj/item/weapon/rig/protean/ai_can_move_suit(mob/user, check_user_module = 0, check_for_ai = 0) if(offline || !cell || !cell.charge || locked_down) if(user) to_chat(user, "Your host rig is unpowered and unresponsive.") @@ -457,4 +463,16 @@ if(user) to_chat(user, "Your host rig is not being worn.") return 0 - return 1 \ No newline at end of file + return 1 + +/obj/item/weapon/rig/protean/toggle_seals(mob/living/carbon/human/M, instant) + M = src.wearer + ..() + +/obj/item/weapon/rig/protean/toggle_cooling(mob/user) + user = src.wearer + ..() + +/obj/item/weapon/rig/protean/toggle_piece(piece, mob/living/carbon/human/H, deploy_mode, forced) + H = src.wearer + ..() \ No newline at end of file diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig_tgui.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig_tgui.dm index 85b4870c4f..4abad5b966 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig_tgui.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/station/protean/protean_rig_tgui.dm @@ -86,7 +86,7 @@ So here it sits, snowflake code for a single item. data["modules"] = list() return data - +/* /obj/item/weapon/rig/protean/tgui_act(action, params) switch(action) if("toggle_seals") @@ -124,4 +124,5 @@ So here it sits, snowflake code for a single item. . = TRUE if("select_charge_type") module.charge_selected = params["charge_type"] - . = TRUE \ No newline at end of file + . = TRUE +*/ \ No newline at end of file