Revert "12/21 modernizations from TG live"
This commit is contained in:
@@ -5,11 +5,10 @@
|
||||
desc = "A glowing bluespace crystal, not much is known about how they work. It looks very delicate."
|
||||
icon = 'icons/obj/telescience.dmi'
|
||||
icon_state = "bluespace_crystal"
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
w_class = 1
|
||||
origin_tech = "bluespace=6;materials=3"
|
||||
points = 50
|
||||
var/blink_range = 8 // The teleport range when crushed/thrown at someone.
|
||||
refined_type = /obj/item/stack/sheet/bluespace_crystal
|
||||
|
||||
/obj/item/weapon/ore/bluespace_crystal/New()
|
||||
..()
|
||||
@@ -45,33 +44,3 @@
|
||||
origin_tech = "bluespace=3;plasmatech=4"
|
||||
blink_range = 4 // Not as good as the organic stuff!
|
||||
points = 0 // nice try
|
||||
refined_type = null
|
||||
|
||||
// Polycrystals, aka stacks
|
||||
|
||||
/obj/item/stack/sheet/bluespace_crystal
|
||||
name = "bluespace polycrystal"
|
||||
icon = 'icons/obj/telescience.dmi'
|
||||
icon_state = "polycrystal"
|
||||
desc = "A stable polycrystal, made of fused-together bluespace crystals. You could probably break one off."
|
||||
origin_tech = "bluespace=6;materials=3"
|
||||
attack_verb = list("bluespace polybashed", "bluespace polybattered", "bluespace polybludgeoned", "bluespace polythrashed", "bluespace polysmashed")
|
||||
|
||||
/obj/item/stack/sheet/bluespace_crystal/attack_self(mob/user) // to prevent the construction menu from ever happening
|
||||
user << "<span class='warning'>You cannot crush the polycrystal in-hand, try breaking one off.</span>"
|
||||
return
|
||||
|
||||
/obj/item/stack/sheet/bluespace_crystal/attack_hand(mob/user)
|
||||
if (user.get_inactive_held_item() == src)
|
||||
if(zero_amount()) // in this case, a sanity check
|
||||
return
|
||||
var/obj/item/weapon/ore/bluespace_crystal/BC = new(src)
|
||||
user.put_in_hands(BC)
|
||||
amount--
|
||||
if (amount == 0)
|
||||
qdel(src)
|
||||
user << "<span class='notice'>You break the final crystal off.</span>"
|
||||
else user << "<span class='notice'>You break off a crystal.</span>"
|
||||
else
|
||||
..()
|
||||
return
|
||||
@@ -4,7 +4,7 @@ var/list/GPS_list = list()
|
||||
desc = "Helping lost spacemen find their way through the planets since 2016. Alt+click to toggle power."
|
||||
icon = 'icons/obj/telescience.dmi'
|
||||
icon_state = "gps-c"
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
w_class = 2
|
||||
slot_flags = SLOT_BELT
|
||||
origin_tech = "materials=2;magnets=1;bluespace=2"
|
||||
var/gpstag = "COM0"
|
||||
@@ -119,10 +119,6 @@ var/list/GPS_list = list()
|
||||
gpstag = "MINER"
|
||||
desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life."
|
||||
|
||||
/obj/item/device/gps/internal/base
|
||||
gpstag = "NT_AUX"
|
||||
desc = "A homing signal from Nanotrasen's mining base."
|
||||
|
||||
/obj/item/device/gps/visible_debug
|
||||
name = "visible GPS"
|
||||
gpstag = "ADMIN"
|
||||
|
||||
@@ -75,11 +75,11 @@
|
||||
user << "<span class='caution'>\The [src] is now secured.</span>"
|
||||
else if(istype(W, /obj/item/weapon/screwdriver))
|
||||
if(stage == 0)
|
||||
playsound(src, W.usesound, 50, 1)
|
||||
playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
|
||||
user << "<span class='caution'>You unscrew the telepad's tracking beacon.</span>"
|
||||
stage = 1
|
||||
else if(stage == 1)
|
||||
playsound(src, W.usesound, 50, 1)
|
||||
playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
|
||||
user << "<span class='caution'>You screw in the telepad's tracking beacon.</span>"
|
||||
stage = 0
|
||||
else if(istype(W, /obj/item/weapon/weldingtool) && stage == 1)
|
||||
@@ -87,7 +87,7 @@
|
||||
if(WT.remove_fuel(0,user))
|
||||
playsound(src.loc, 'sound/items/Welder2.ogg', 100, 1)
|
||||
user << "<span class='notice'>You start disassembling [src]...</span>"
|
||||
if(do_after(user,20*WT.toolspeed, target = src))
|
||||
if(do_after(user,20/WT.toolspeed, target = src))
|
||||
if(!WT.isOn())
|
||||
return
|
||||
user << "<span class='notice'>You disassemble [src].</span>"
|
||||
|
||||
Reference in New Issue
Block a user