makes several stuffs better

This commit is contained in:
SandPoot
2021-02-23 17:48:06 -03:00
parent 5fbfe083d1
commit 2be2d68df9
5 changed files with 15 additions and 15 deletions
@@ -5,7 +5,7 @@
desc = "Transmits gas across large distances of space. Developed using bluespace technology. Use a multitool on it to set its network."
/obj/item/pipe/bluespace/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/multitool))
if(W.tool_behaviour == TOOL_MULTITOOL)
var/new_name = input(user, "Enter identifier for bluespace pipe network", "bluespace pipe", bluespace_network_name) as text|null
if(!isnull(new_name))
bluespace_network_name = new_name
@@ -1,4 +1,3 @@
/obj/item/airlock_painter/decal/proc/check_menu(mob/living/user)
if(!istype(user))
return FALSE
@@ -35,9 +35,9 @@
var/mob/living/silicon/robot/user // needed for process()
var/animation_playing = FALSE
var/list/borgmodels = list(
"(Standard) Default",
"(Standard) Default",
"(Standard) Heavy",
"(Standard) Sleek",
"(Standard) Sleek",
"(Standard) Marina",
"(Standard) Robot",
"(Standard) Eyebot",
@@ -107,8 +107,8 @@
return TRUE
/obj/item/borg_shapeshifter/attack_self(mob/living/silicon/robot/user)
if (user && user.cell && user.cell.charge > activationCost)
if (isturf(user.loc))
if(user && user.cell && user.cell.charge > activationCost)
if(isturf(user.loc))
toggle(user)
else
to_chat(user, "<span class='warning'>You can't use [src] while inside something!</span>")
@@ -17,8 +17,8 @@
materials = null
return ..()
/obj/machinery/mineral/bluespace_miner/multitool_act(mob/living/user, obj/item/multitool/M)
if(istype(M))
/obj/machinery/mineral/bluespace_miner/multitool_act(mob/living/user, obj/item/M)
if(M.tool_behaviour == TOOL_MULTITOOL)
if(!M.buffer || !istype(M.buffer, /obj/machinery/ore_silo))
to_chat(user, "<span class='warning'>You need to multitool the ore silo first.</span>")
return FALSE
@@ -71,11 +71,13 @@
. = ..()
if(default_deconstruction_crowbar(I, FALSE))
return TRUE
/obj/machinery/mineral/bluespace_miner/screwdriver_act(mob/living/user, obj/item/screwdriver/I)
/obj/machinery/mineral/bluespace_miner/screwdriver_act(mob/living/user, obj/item/I)
. = TRUE
if(..())
return
if(!I.tool_behaviour == TOOL_SCREWDRIVER)
return
if(!state_open)
if(powered())
if(default_deconstruction_screwdriver(user, "bsminer-maintenance", "bsminer", I))
@@ -73,11 +73,10 @@
return
inserted_gps = W
user.visible_message("[user] inserts [W] into \the [src]'s GPS device slot.", "<span class='notice'>You insert [W] into \the [src]'s GPS device slot.</span>")
else if(istype(W, /obj/item/multitool))
var/obj/item/multitool/M = W
if(M.buffer && istype(M.buffer, /obj/machinery/telepad))
telepad = M.buffer
M.buffer = null
else if(W.tool_behaviour == TOOL_MULTITOOL)
if(W.buffer && istype(W.buffer, /obj/machinery/telepad))
telepad = W.buffer
W.buffer = null
to_chat(user, "<span class='caution'>You upload the data from the [W.name]'s buffer.</span>")
else
return ..()