mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-12 19:22:56 +00:00
Minor tweaks to voidsuits.
Component removal uses a dialogue box instead of removing items in a set order. Renames "Eject Tank" to avoid duplicate verb names. Changes order of components when equipping voidsuits. Two user message changes.
This commit is contained in:
@@ -83,6 +83,10 @@
|
|||||||
if(H.wear_suit != src)
|
if(H.wear_suit != src)
|
||||||
return
|
return
|
||||||
|
|
||||||
|
if(boots)
|
||||||
|
if (H.equip_to_slot_if_possible(boots, slot_shoes))
|
||||||
|
boots.canremove = 0
|
||||||
|
|
||||||
if(helmet)
|
if(helmet)
|
||||||
if(H.head)
|
if(H.head)
|
||||||
M << "You are unable to deploy your suit's helmet as \the [H.head] is in the way."
|
M << "You are unable to deploy your suit's helmet as \the [H.head] is in the way."
|
||||||
@@ -90,10 +94,6 @@
|
|||||||
M << "Your suit's helmet deploys with a hiss."
|
M << "Your suit's helmet deploys with a hiss."
|
||||||
helmet.canremove = 0
|
helmet.canremove = 0
|
||||||
|
|
||||||
if(boots)
|
|
||||||
if (H.equip_to_slot_if_possible(boots, slot_shoes))
|
|
||||||
boots.canremove = 0
|
|
||||||
|
|
||||||
if(tank)
|
if(tank)
|
||||||
if(H.s_store) //In case someone finds a way.
|
if(H.s_store) //In case someone finds a way.
|
||||||
M << "Alarmingly, the valve on your suit's installed tank fails to engage."
|
M << "Alarmingly, the valve on your suit's installed tank fails to engage."
|
||||||
@@ -101,6 +101,7 @@
|
|||||||
M << "The valve on your suit's installed tank safely engages."
|
M << "The valve on your suit's installed tank safely engages."
|
||||||
tank.canremove = 0
|
tank.canremove = 0
|
||||||
|
|
||||||
|
|
||||||
/obj/item/clothing/suit/space/void/dropped()
|
/obj/item/clothing/suit/space/void/dropped()
|
||||||
..()
|
..()
|
||||||
|
|
||||||
@@ -151,7 +152,7 @@
|
|||||||
helmet.loc = src
|
helmet.loc = src
|
||||||
else
|
else
|
||||||
if(H.head)
|
if(H.head)
|
||||||
H << "<span class='danger'>You cannot deploy your helmet while wearing another helmet.</span>"
|
H << "<span class='danger'>You cannot deploy your helmet while wearing \the [H.head].</span>"
|
||||||
return
|
return
|
||||||
if(H.equip_to_slot_if_possible(helmet, slot_head))
|
if(H.equip_to_slot_if_possible(helmet, slot_head))
|
||||||
helmet.pickup(H)
|
helmet.pickup(H)
|
||||||
@@ -161,7 +162,7 @@
|
|||||||
|
|
||||||
/obj/item/clothing/suit/space/void/verb/eject_tank()
|
/obj/item/clothing/suit/space/void/verb/eject_tank()
|
||||||
|
|
||||||
set name = "Eject Tank"
|
set name = "Eject Voidsuit Tank"
|
||||||
set category = "Object"
|
set category = "Object"
|
||||||
set src in usr
|
set src in usr
|
||||||
|
|
||||||
@@ -187,22 +188,26 @@
|
|||||||
if(!istype(user,/mob/living)) return
|
if(!istype(user,/mob/living)) return
|
||||||
|
|
||||||
if(istype(src.loc,/mob/living))
|
if(istype(src.loc,/mob/living))
|
||||||
user << "<span class='danger'>How do you propose to modify a hardsuit while it is being worn?</span>"
|
user << "<span class='danger'>How do you propose to modify a voidsuit while it is being worn?</span>"
|
||||||
return
|
return
|
||||||
|
|
||||||
if(istype(W,/obj/item/weapon/screwdriver))
|
if(istype(W,/obj/item/weapon/screwdriver))
|
||||||
if(tank)
|
if(helmet || boots || tank)
|
||||||
user << "You pop \the [tank] out of \the [src]'s storage compartment."
|
var/choice = input("What component would you like to remove?") as null|anything in list(helmet,boots,tank)
|
||||||
tank.loc = get_turf(src)
|
if(!choice) return
|
||||||
src.tank = null
|
|
||||||
else if(helmet)
|
if(choice == tank) //No, a switch doesn't work here. Sorry. ~Techhead
|
||||||
user << "You detatch \the [helmet] from \the [src]'s helmet mount."
|
user << "You pop \the [tank] out of \the [src]'s storage compartment."
|
||||||
helmet.loc = get_turf(src)
|
tank.loc = get_turf(src)
|
||||||
src.helmet = null
|
src.tank = null
|
||||||
else if (boots)
|
else if(choice == helmet)
|
||||||
user << "You detatch \the [boots] from \the [src]'s boot mounts."
|
user << "You detatch \the [helmet] from \the [src]'s helmet mount."
|
||||||
boots.loc = get_turf(src)
|
helmet.loc = get_turf(src)
|
||||||
src.boots = null
|
src.helmet = null
|
||||||
|
else if(choice == boots)
|
||||||
|
user << "You detatch \the [boots] from \the [src]'s boot mounts."
|
||||||
|
boots.loc = get_turf(src)
|
||||||
|
src.boots = null
|
||||||
else
|
else
|
||||||
user << "\The [src] does not have anything installed."
|
user << "\The [src] does not have anything installed."
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user