This commit is contained in:
Fox-McCloud
2015-09-04 05:18:48 -04:00
parent 7c29e59784
commit a019934e9e
80 changed files with 254 additions and 329 deletions
+1 -2
View File
@@ -16,8 +16,7 @@
throw_range = 15
throw_speed = 3
desc = "You can use this on airlocks or APCs to try to hack them without cutting wires."
m_amt = 50
g_amt = 20
materials = list(MAT_METAL=50, MAT_GLASS=20)
origin_tech = "magnets=1;engineering=1"
var/obj/machinery/telecomms/buffer // simple machine buffer for device linkage
@@ -7,8 +7,7 @@
w_class = 2
flags = CONDUCT
slot_flags = SLOT_BELT
m_amt = 50
g_amt = 20
materials = list(MAT_METAL=50, MAT_GLASS=20)
action_button_name = "Flashlight"
var/on = 0
var/brightness_on = 4 //luminosity when on
@@ -119,8 +118,7 @@
brightness_on = 5
w_class = 4
flags = CONDUCT
m_amt = 0
g_amt = 0
materials = list()
on = 1
@@ -214,6 +212,7 @@ obj/item/device/flashlight/lamp/bananalamp
w_class = 1
brightness_on = 6
light_color = "#FFBF00"
materials = list()
on = 1 //Bio-luminesence has one setting, on.
/obj/item/device/flashlight/slime/New()
@@ -7,8 +7,7 @@
var/pointer_icon_state
flags = CONDUCT
slot_flags = SLOT_BELT
m_amt = 500
g_amt = 500
materials = list(MAT_METAL=500, MAT_GLASS=500)
w_class = 2 //Increased to 2, because diodes are w_class 2. Conservation of matter.
origin_tech = "combat=1"
origin_tech = "magnets=2"
+1 -2
View File
@@ -15,8 +15,7 @@
throw_range = 15
throw_speed = 3
desc = "You can use this on airlocks or APCs to try to hack them without cutting wires."
m_amt = 50
g_amt = 20
materials = list(MAT_METAL=50, MAT_GLASS=20)
origin_tech = "magnets=1;engineering=1"
var/obj/machinery/buffer // simple machine buffer for device linkage
+1 -2
View File
@@ -10,8 +10,7 @@
throwforce = 5
throw_speed = 1
throw_range = 2
m_amt = 750
w_amt = 750
materials = list(MAT_METAL=750)
origin_tech = "powerstorage=3;syndicate=5"
var/drain_rate = 1500000 // amount of power to drain per tick
var/apc_drain_rate = 5000 // Max. amount drained from single APC. In Watts.
@@ -7,8 +7,7 @@
flags = CONDUCT
slot_flags = SLOT_BACK
w_class = 5.0
g_amt = 2500
m_amt = 10000
materials = list(MAT_METAL=10000, MAT_GLASS=2500)
var/code = 2
/obj/item/device/radio/electropack/attack_hand(mob/user as mob)
@@ -4,7 +4,7 @@
var/radio_desc = ""
icon_state = "headset"
item_state = "headset"
m_amt = 75
materials = list(MAT_METAL=75)
subspace_transmission = 1
canhear_range = 0 // can't hear headsets from very far away
@@ -39,7 +39,7 @@
add_fingerprint(user)
spawn(0)
attack_self(user)
/obj/item/device/radio/intercom/attack_ghost(mob/user as mob)
spawn(0)
attack_self(user)
@@ -160,5 +160,4 @@
icon_state = "door_electronics"
desc = "Looks like a circuit. Probably is."
w_class = 2.0
m_amt = 50
g_amt = 50
materials = list(MAT_METAL=50, MAT_GLASS=50)
@@ -26,8 +26,8 @@
throw_range = 9
w_class = 2
m_amt = 75
g_amt = 25
materials = list(MAT_METAL=75)
var/const/FREQ_LISTENING = 1
var/prison_radio = 0
var/atom/follow_target // Custom follow target for autosay-using bots
+6 -10
View File
@@ -16,7 +16,7 @@ REAGENT SCANNER
slot_flags = SLOT_BELT
w_class = 2
item_state = "electronic"
m_amt = 150
materials = list(MAT_METAL=150)
origin_tech = "magnets=1;engineering=1"
var/scan_range = 1
var/pulse_duration = 10
@@ -121,7 +121,7 @@ REAGENT SCANNER
w_class = 1.0
throw_speed = 5
throw_range = 10
m_amt = 200
materials = list(MAT_METAL=200)
origin_tech = "magnets=1;biotech=1"
var/upgraded = 0
var/mode = 1;
@@ -296,8 +296,7 @@ REAGENT SCANNER
throwforce = 0
throw_speed = 3
throw_range = 7
m_amt = 30
g_amt = 20
materials = list(MAT_METAL=30, MAT_GLASS=20)
origin_tech = "magnets=1;engineering=1"
/obj/item/device/analyzer/attack_self(mob/user as mob)
@@ -363,8 +362,7 @@ REAGENT SCANNER
throwforce = 5
throw_speed = 4
throw_range = 20
m_amt = 30
g_amt = 20
materials = list(MAT_METAL=30, MAT_GLASS=20)
origin_tech = "magnets=2;biotech=2"
var/details = 0
var/recent_fail = 0
@@ -436,8 +434,7 @@ REAGENT SCANNER
throwforce = 5
throw_speed = 4
throw_range = 20
m_amt = 30
g_amt = 20
materials = list(MAT_METAL=30, MAT_GLASS=20)
origin_tech = "magnets=2;biotech=2"
var/details = 0
var/recent_fail = 0
@@ -493,8 +490,7 @@ REAGENT SCANNER
throwforce = 0
throw_speed = 3
throw_range = 7
m_amt = 30
g_amt = 20
materials = list(MAT_METAL=30, MAT_GLASS=20)
/obj/item/device/slime_scanner/attack(mob/living/M as mob, mob/living/user as mob)
if (!isslime(M))
@@ -5,8 +5,7 @@
item_state = "analyzer"
w_class = 2
slot_flags = SLOT_BELT
m_amt = 60
g_amt = 30
materials = list(MAT_METAL=60, MAT_GLASS=30)
force = 2
throwforce = 0
var/recording = 0
@@ -262,8 +261,7 @@
icon_state = "tape_white"
item_state = "analyzer"
w_class = 1
m_amt = 20
g_amt = 5
materials = list(MAT_METAL=20, MAT_GLASS=5)
force = 1
throwforce = 0
var/max_capacity = 600
@@ -85,7 +85,7 @@ effective or pretty fucking useless.
w_class = 1.0
throw_speed = 5
throw_range = 10
m_amt = 200
materials = list(MAT_METAL=400)
origin_tech = "magnets=3;biotech=5;syndicate=3"
var/intensity = 5 // how much damage the radiation does
var/wavelength = 10 // time it takes for the radiation to kick in, in seconds