cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed the CONDUCT flag.

Browse Source 
Use Siemens, you dolts.
This is the start of completely redoing the flag system, but it starts with removing these oldcode flags.
This commit is contained in:
ComicIronic
2014-12-26 18:13:52 +00:00
parent 755d8456ce
commit 5e5bbf03fd
104 changed files with 343 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/WorkInProgress/Cael_Aislinn/Rust/fuel_assembly_port_construction.dm
View File

@@ -6,7 +6,8 @@
icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi' icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
icon_state = "port2" icon_state = "port2"
w_class = 4 w_class = 4
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
/obj/item/rust_fuel_assembly_port_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/rust_fuel_assembly_port_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/wrench)) if (istype(W, /obj/item/weapon/wrench))

3
code/WorkInProgress/Cael_Aislinn/Rust/fuel_compressor_construction.dm
View File

@@ -6,7 +6,8 @@
icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi' icon = 'code/WorkInProgress/Cael_Aislinn/Rust/rust.dmi'
icon_state = "fuel_compressor0" icon_state = "fuel_compressor0"
w_class = 4 w_class = 4
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
/obj/item/rust_fuel_compressor_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/rust_fuel_compressor_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
if (istype(W, /obj/item/weapon/wrench)) if (istype(W, /obj/item/weapon/wrench))

3
code/WorkInProgress/autopsy.dm
View File

@@ -7,7 +7,8 @@
desc = "Extracts information on wounds." desc = "Extracts information on wounds."
icon = 'icons/obj/autopsy_scanner.dmi' icon = 'icons/obj/autopsy_scanner.dmi'
icon_state = "" icon_state = ""
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
w_class = 1.0 w_class = 1.0
origin_tech = "materials=1;biotech=1" origin_tech = "materials=1;biotech=1"
var/list/datum/autopsy_data_scanner/wdata = list() var/list/datum/autopsy_data_scanner/wdata = list()

6
code/WorkInProgress/pomf/spacepods/parts.dm
View File

@@ -5,13 +5,15 @@
/obj/item/pod_parts/core /obj/item/pod_parts/core
name="Space Pod Core" name="Space Pod Core"
icon_state = "core" icon_state = "core"
flags = FPRINT | CONDUCT flags = FPRINT
siemens_coefficient = 1
origin_tech = "materials=4;plasma=3;bluespace=2;engineering=3" origin_tech = "materials=4;plasma=3;bluespace=2;engineering=3"
/obj/item/pod_parts/pod_frame /obj/item/pod_parts/pod_frame
name = "Space Pod Frame" name = "Space Pod Frame"
icon_state = "" icon_state = ""
flags = CONDUCT flags = 0
siemens_coefficient = 1
density = 0 density = 0
anchored = 0 anchored = 0
var/link_to = null var/link_to = null

6
code/datums/diseases/magnitis.dm
View File

@@ -19,7 +19,7 @@
affected_mob << "\red You feel a slight shock course through your body." affected_mob << "\red You feel a slight shock course through your body."
if(prob(2)) if(prob(2))
for(var/obj/M in orange(2,affected_mob)) for(var/obj/M in orange(2,affected_mob))
if(!M.anchored && (M.flags & CONDUCT)) if(!M.anchored && (M.is_conductor()))
step_towards(M,affected_mob) step_towards(M,affected_mob)
for(var/mob/living/silicon/S in orange(2,affected_mob)) for(var/mob/living/silicon/S in orange(2,affected_mob))
if(istype(S, /mob/living/silicon/ai)) continue if(istype(S, /mob/living/silicon/ai)) continue
@@ -41,7 +41,7 @@
affected_mob << "\red You feel like clowning around." affected_mob << "\red You feel like clowning around."
if(prob(4)) if(prob(4))
for(var/obj/M in orange(4,affected_mob)) for(var/obj/M in orange(4,affected_mob))
if(!M.anchored && (M.flags & CONDUCT)) if(!M.anchored && (M.is_conductor()))
var/i var/i
var/iter = rand(1,2) var/iter = rand(1,2)
for(i=0,i<iter,i++) for(i=0,i<iter,i++)
@@ -69,7 +69,7 @@
affected_mob << "\red You query upon the nature of miracles." affected_mob << "\red You query upon the nature of miracles."
if(prob(8)) if(prob(8))
for(var/obj/M in orange(6,affected_mob)) for(var/obj/M in orange(6,affected_mob))
if(!M.anchored && (M.flags & CONDUCT)) if(!M.anchored && (M.is_conductor()))
var/i var/i
var/iter = rand(1,3) var/iter = rand(1,3)
for(i=0,i<iter,i++) for(i=0,i<iter,i++)

10
code/defines/obj.dm
View File

@@ -341,10 +341,12 @@ var/global/list/PDA_Manifest = list()
throwforce = 0.0 throwforce = 0.0
throw_speed = 1 throw_speed = 1
throw_range = 20 throw_range = 20
flags = FPRINT | USEDELAY | TABLEPASS | CONDUCT flags = FPRINT | USEDELAY | TABLEPASS
afterattack(atom/target as mob|obj|turf|area, mob/user as mob) siemens_coefficient = 1
user.drop_item()
src.throw_at(target, throw_range, throw_speed) /obj/item/weapon/beach_ball/afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
user.drop_item()
src.throw_at(target, throw_range, throw_speed)
/obj/effect/stop /obj/effect/stop
var/victim = null var/victim = null

33
code/defines/obj/weapon.dm
View File

@@ -3,7 +3,8 @@
desc = "Should anything ever go wrong..." desc = "Should anything ever go wrong..."
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "red_phone" icon_state = "red_phone"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 3.0 force = 3.0
throwforce = 2.0 throwforce = 2.0
throw_speed = 1 throw_speed = 1
@@ -108,7 +109,8 @@
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "cane" icon_state = "cane"
item_state = "stick" item_state = "stick"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 5.0 force = 5.0
throwforce = 7.0 throwforce = 7.0
w_class = 2.0 w_class = 2.0
@@ -161,7 +163,8 @@
gender = PLURAL gender = PLURAL
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "handcuff" icon_state = "handcuff"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
throwforce = 0 throwforce = 0
w_class = 3.0 w_class = 3.0
origin_tech = "materials=1" origin_tech = "materials=1"
@@ -173,7 +176,8 @@
gender = NEUTER gender = NEUTER
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "bolas" icon_state = "bolas"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throwforce = 2 throwforce = 2
w_class = 2 w_class = 2
@@ -491,7 +495,8 @@
desc = "Parts of a rack." desc = "Parts of a rack."
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "rack_parts" icon_state = "rack_parts"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
m_amt = 3750 m_amt = 3750
w_type = RECYK_METAL w_type = RECYK_METAL
melt_temperature=MELTPOINT_STEEL melt_temperature=MELTPOINT_STEEL
@@ -574,7 +579,8 @@
var/selfdestruct = 0.0 var/selfdestruct = 0.0
var/traitor_frequency = 0.0 var/traitor_frequency = 0.0
var/obj/item/device/radio/origradio = null var/obj/item/device/radio/origradio = null
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
item_state = "radio" item_state = "radio"
throwforce = 5 throwforce = 5
@@ -627,7 +633,8 @@
m_amt = 3750 m_amt = 3750
w_type = RECYK_METAL w_type = RECYK_METAL
melt_temperature=MELTPOINT_STEEL melt_temperature=MELTPOINT_STEEL
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
attack_verb = list("slammed", "bashed", "battered", "bludgeoned", "thrashed", "whacked") attack_verb = list("slammed", "bashed", "battered", "bludgeoned", "thrashed", "whacked")
/obj/item/weapon/table_parts/cultify() /obj/item/weapon/table_parts/cultify()
@@ -642,7 +649,8 @@
m_amt = 7500 m_amt = 7500
w_type = RECYK_METAL w_type = RECYK_METAL
melt_temperature=MELTPOINT_STEEL melt_temperature=MELTPOINT_STEEL
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
/obj/item/weapon/table_parts/wood /obj/item/weapon/table_parts/wood
name = "wooden table parts" name = "wooden table parts"
@@ -675,7 +683,8 @@
icon_state = "std_module" icon_state = "std_module"
w_class = 2.0 w_class = 2.0
item_state = "electronic" item_state = "electronic"
flags = FPRINT|TABLEPASS|CONDUCT flags = FPRINT|TABLEPASS
siemens_coefficient = 1
var/mtype = 1 // 1=electronic 2=hardware var/mtype = 1 // 1=electronic 2=hardware
/obj/item/weapon/module/card_reader /obj/item/weapon/module/card_reader
@@ -708,7 +717,8 @@
desc = "Meat that appears...strange..." desc = "Meat that appears...strange..."
icon = 'icons/obj/food.dmi' icon = 'icons/obj/food.dmi'
icon_state = "meat" icon_state = "meat"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
w_class = 1.0 w_class = 1.0
origin_tech = "biotech=2" origin_tech = "biotech=2"
@@ -717,7 +727,8 @@
desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood." desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "hatchet" icon_state = "hatchet"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 12.0 force = 12.0
w_class = 2.0 w_class = 2.0
throwforce = 15.0 throwforce = 15.0

3
code/game/gamemodes/nuclear/pinpointer.dm
View File

@@ -2,7 +2,8 @@
name = "pinpointer" name = "pinpointer"
icon = 'icons/obj/device.dmi' icon = 'icons/obj/device.dmi'
icon_state = "pinoff" icon_state = "pinoff"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
w_class = 2.0 w_class = 2.0
item_state = "electronic" item_state = "electronic"

6
code/game/machinery/airlock_control.dm
View File

@@ -124,7 +124,8 @@ obj/machinery/door/airlock/New()
desc = "Used for repairing or building airlock sensors" desc = "Used for repairing or building airlock sensors"
icon = 'icons/obj/airlock_machines.dmi' icon = 'icons/obj/airlock_machines.dmi'
icon_state = "airlock_sensor_off" icon_state = "airlock_sensor_off"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
/obj/item/airlock_sensor_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/airlock_sensor_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
..() ..()
@@ -289,7 +290,8 @@ obj/machinery/airlock_sensor/attackby(var/obj/item/W, var/mob/user)
desc = "Used for repairing or building airlock access buttons" desc = "Used for repairing or building airlock access buttons"
icon = 'icons/obj/airlock_machines.dmi' icon = 'icons/obj/airlock_machines.dmi'
icon_state = "access_button_build" icon_state = "access_button_build"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
/obj/item/access_button_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/access_button_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
..() ..()

6
code/game/machinery/alarm.dm
View File

@@ -925,7 +925,8 @@ Code shamelessly copied from apc_frame
desc = "Used for building Air Alarms" desc = "Used for building Air Alarms"
icon = 'icons/obj/monitors.dmi' icon = 'icons/obj/monitors.dmi'
icon_state = "alarm_bitem" icon_state = "alarm_bitem"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
m_amt = 2*CC_PER_SHEET_METAL m_amt = 2*CC_PER_SHEET_METAL
melt_temperature = MELTPOINT_STEEL melt_temperature = MELTPOINT_STEEL
w_type = RECYK_METAL w_type = RECYK_METAL
@@ -1239,7 +1240,8 @@ Code shamelessly copied from apc_frame
desc = "Used for building Fire Alarms" desc = "Used for building Fire Alarms"
icon = 'icons/obj/monitors.dmi' icon = 'icons/obj/monitors.dmi'
icon_state = "fire_bitem" icon_state = "fire_bitem"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
m_amt=2*CC_PER_SHEET_METAL m_amt=2*CC_PER_SHEET_METAL
melt_temperature = MELTPOINT_STEEL melt_temperature = MELTPOINT_STEEL
w_type = RECYK_METAL w_type = RECYK_METAL

3
code/game/machinery/atmoalter/canister.dm
View File

@@ -4,7 +4,8 @@
icon_state = "yellow" icon_state = "yellow"
density = 1 density = 1
var/health = 100.0 var/health = 100.0
flags = FPRINT | CONDUCT flags = FPRINT
siemens_coefficient = 1
var/valve_open = 0 var/valve_open = 0
var/release_pressure = ONE_ATMOSPHERE var/release_pressure = ONE_ATMOSPHERE

2
code/game/machinery/magnet.dm
View File

@@ -178,7 +178,7 @@
center = locate(x+center_x, y+center_y, z) center = locate(x+center_x, y+center_y, z)
if(center) if(center)
for(var/obj/M in orange(magnetic_field, center)) for(var/obj/M in orange(magnetic_field, center))
if(!M.anchored && (M.flags & CONDUCT)) if(!M.anchored && (M.is_conductor()))
step_towards(M, center) step_towards(M, center)
for(var/mob/living/silicon/S in orange(magnetic_field, center)) for(var/mob/living/silicon/S in orange(magnetic_field, center))

5
code/game/machinery/shieldgen.dm
View File

@@ -233,7 +233,7 @@
/obj/machinery/shieldgen/attack_ghost(mob/user) /obj/machinery/shieldgen/attack_ghost(mob/user)
if(isAdminGhost(user)) src.attack_hand(user) if(isAdminGhost(user)) src.attack_hand(user)
return return
/obj/machinery/shieldgen/attack_hand(mob/user as mob) /obj/machinery/shieldgen/attack_hand(mob/user as mob)
if(locked) if(locked)
user << "The machine is locked, you are unable to use it." user << "The machine is locked, you are unable to use it."
@@ -330,7 +330,8 @@
// var/maxshieldload = 200 // var/maxshieldload = 200
var/obj/structure/cable/attached // the attached cable var/obj/structure/cable/attached // the attached cable
var/storedpower = 0 var/storedpower = 0
flags = FPRINT | CONDUCT flags = FPRINT
siemens_coefficient = 1
use_power = 0 use_power = 0
machine_flags = WRENCHMOVE | FIXED2WORK machine_flags = WRENCHMOVE | FIXED2WORK

3
code/game/machinery/vending.dm
View File

@@ -872,7 +872,8 @@
desc = "Wall-mounted Medical Equipment dispenser." desc = "Wall-mounted Medical Equipment dispenser."
icon = 'icons/obj/vending.dmi' icon = 'icons/obj/vending.dmi'
icon_state = "wallmed_frame0" icon_state = "wallmed_frame0"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
/obj/item/wallmed_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/wallmed_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
..() ..()

9
code/game/mecha/mecha_parts.dm
View File

@@ -7,7 +7,8 @@
icon = 'icons/mecha/mech_construct.dmi' icon = 'icons/mecha/mech_construct.dmi'
icon_state = "blank" icon_state = "blank"
w_class = 20 w_class = 20
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
origin_tech = "programming=2;materials=2" origin_tech = "programming=2;materials=2"
@@ -15,7 +16,8 @@
name="Mecha Chassis" name="Mecha Chassis"
icon_state = "backbone" icon_state = "backbone"
var/datum/construction/construct var/datum/construction/construct
flags = FPRINT | CONDUCT flags = FPRINT
siemens_coefficient = 1
attackby(obj/item/W as obj, mob/user as mob) attackby(obj/item/W as obj, mob/user as mob)
if(!construct || !construct.action(W, user)) if(!construct || !construct.action(W, user))
@@ -329,7 +331,8 @@
icon_state = "std_mod" icon_state = "std_mod"
item_state = "circuitboard" item_state = "circuitboard"
board_type = "other" board_type = "other"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 5.0 force = 5.0
w_class = 2.0 w_class = 2.0
throwforce = 5.0 throwforce = 5.0

2
code/game/objects/items.dm
View File

@@ -30,7 +30,7 @@
//var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible //var/heat_transfer_coefficient = 1 //0 prevents all transfers, 1 is invisible
var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets) var/gas_transfer_coefficient = 1 // for leaking gas from turf to mask and vice-versa (for masks right now, but at some point, i'd like to include space helmets)
var/permeability_coefficient = 1 // for chemicals/diseases var/permeability_coefficient = 1 // for chemicals/diseases
var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit) siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit) - 0 is not conductive, 1 is conductive - this is a range, not binary
var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up var/slowdown = 0 // How much clothing is slowing you down. Negative values speeds you up
var/canremove = 1 //Mostly for Ninja code at this point but basically will not allow the item to be removed if set to 0. /N var/canremove = 1 //Mostly for Ninja code at this point but basically will not allow the item to be removed if set to 0. /N
var/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0) var/armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)

3
code/game/objects/items/airlock_control_frame.dm
View File

@@ -5,7 +5,8 @@
desc = "Used for repairing or building airlock controllers" desc = "Used for repairing or building airlock controllers"
icon = 'icons/obj/airlock_machines.dmi' icon = 'icons/obj/airlock_machines.dmi'
icon_state = "airlock_control_build0" icon_state = "airlock_control_build0"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
/obj/item/airlock_controller_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/airlock_controller_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
..() ..()

6
code/game/objects/items/apc_frame.dm
View File

@@ -5,7 +5,8 @@
desc = "Used for repairing or building APCs" desc = "Used for repairing or building APCs"
icon = 'icons/obj/apc_repair.dmi' icon = 'icons/obj/apc_repair.dmi'
icon_state = "apc_frame" icon_state = "apc_frame"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
w_type=RECYK_METAL w_type=RECYK_METAL
/obj/item/apc_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/apc_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -53,7 +54,8 @@
desc = "Used for repairing or building intercoms" desc = "Used for repairing or building intercoms"
icon = 'icons/obj/radio.dmi' icon = 'icons/obj/radio.dmi'
icon_state = "intercom_frame" icon_state = "intercom_frame"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
w_type=RECYK_METAL w_type=RECYK_METAL
/obj/item/intercom_frame/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/intercom_frame/attackby(obj/item/weapon/W as obj, mob/user as mob)

3
code/game/objects/items/devices/chameleonproj.dm
View File

@@ -1,7 +1,8 @@
/obj/item/device/chameleon /obj/item/device/chameleon
name = "chameleon-projector" name = "chameleon-projector"
icon_state = "shield0" icon_state = "shield0"
flags = FPRINT | TABLEPASS| CONDUCT | USEDELAY flags = FPRINT | TABLEPASS| USEDELAY
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
item_state = "electronic" item_state = "electronic"
throwforce = 5.0 throwforce = 5.0

3
code/game/objects/items/devices/codebreaker.dm
View File

@@ -3,7 +3,8 @@
desc = "Can be used to decipher a Nuclear Bomb's activation code" desc = "Can be used to decipher a Nuclear Bomb's activation code"
icon_state = "codebreaker" icon_state = "codebreaker"
item_state = "electronic" item_state = "electronic"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 5.0 force = 5.0
w_class = 2.0 w_class = 2.0
throwforce = 5.0 throwforce = 5.0

3
code/game/objects/items/devices/debugger.dm
View File

@@ -9,7 +9,8 @@
name = "debugger" name = "debugger"
desc = "Used to debug electronic equipment." desc = "Used to debug electronic equipment."
icon_state = "hacktool-g" icon_state = "hacktool-g"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 5.0 force = 5.0
w_class = 2.0 w_class = 2.0
throwforce = 5.0 throwforce = 5.0

6
code/game/objects/items/devices/deskbell.dm
View File

@@ -9,7 +9,8 @@
w_class = 2.0 w_class = 2.0
throw_speed = 4 throw_speed = 4
throw_range = 10 throw_range = 10
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
attack_verb = list("rang") attack_verb = list("rang")
hitsound = 'sound/machines/ding2.ogg' hitsound = 'sound/machines/ding2.ogg'
m_amt = 3750 m_amt = 3750
@@ -234,7 +235,8 @@
w_class = 2.0 w_class = 2.0
throw_speed = 4 throw_speed = 4
throw_range = 10 throw_range = 10
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
m_amt = 3750 m_amt = 3750
w_type = RECYK_METAL w_type = RECYK_METAL
melt_temperature=MELTPOINT_STEEL melt_temperature=MELTPOINT_STEEL

3
code/game/objects/items/devices/flash.dm
View File

@@ -7,7 +7,8 @@
w_class = 1.0 w_class = 1.0
throw_speed = 4 throw_speed = 4
throw_range = 10 throw_range = 10
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
origin_tech = "magnets=2;combat=1" origin_tech = "magnets=2;combat=1"
var/times_used = 0 //Number of times it's been used. var/times_used = 0 //Number of times it's been used.

9
code/game/objects/items/devices/flashlight.dm
View File

@@ -5,7 +5,8 @@
icon_state = "flashlight" icon_state = "flashlight"
item_state = "flashlight" item_state = "flashlight"
w_class = 2 w_class = 2
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
m_amt = 50 m_amt = 50
g_amt = 20 g_amt = 20
@@ -107,7 +108,8 @@
desc = "A pen-sized light, used by medical staff." desc = "A pen-sized light, used by medical staff."
icon_state = "penlight" icon_state = "penlight"
item_state = "" item_state = ""
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
brightness_on = 2 brightness_on = 2
@@ -119,7 +121,8 @@
item_state = "lamp" item_state = "lamp"
brightness_on = 5 brightness_on = 5
w_class = 4 w_class = 4
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
m_amt = 0 m_amt = 0
g_amt = 0 g_amt = 0
on = 1 on = 1

3
code/game/objects/items/devices/lightreplacer.dm
View File

@@ -47,7 +47,8 @@
icon_state = "lightreplacer0" icon_state = "lightreplacer0"
item_state = "electronic" item_state = "electronic"
flags = FPRINT | CONDUCT flags = FPRINT
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
origin_tech = "magnets=3;materials=2" origin_tech = "magnets=3;materials=2"

3
code/game/objects/items/devices/maracas.dm
View File

@@ -5,7 +5,8 @@
icon_state = "maracas" icon_state = "maracas"
item_state = "maracas" item_state = "maracas"
w_class = 1.0 w_class = 1.0
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
var/emagged = 0//our maracas are different - Deity Link var/emagged = 0//our maracas are different - Deity Link

3
code/game/objects/items/devices/mat_synth.dm
View File

@@ -11,7 +11,8 @@
icon = 'icons/obj/device.dmi' icon = 'icons/obj/device.dmi'
icon_state = "mat_synthoff" icon_state = "mat_synthoff"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
w_class = 3.0 w_class = 3.0
origin_tech = "engineering=4;materials=5;power=3" origin_tech = "engineering=4;materials=5;power=3"

6
code/game/objects/items/devices/megaphone.dm
View File

@@ -4,7 +4,8 @@
icon_state = "megaphone" icon_state = "megaphone"
item_state = "radio" item_state = "radio"
w_class = 1.0 w_class = 1.0
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
var/spamcheck = 0 var/spamcheck = 0
var/emagged = 0 var/emagged = 0
@@ -71,7 +72,8 @@
icon_state = "soundsynth" icon_state = "soundsynth"
item_state = "radio" item_state = "radio"
w_class = 1.0 w_class = 1.0
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
var/spam_flag = 0 //To prevent mashing the button to cause annoyance like a huge idiot. var/spam_flag = 0 //To prevent mashing the button to cause annoyance like a huge idiot.
var/sound_flag = 1 var/sound_flag = 1

43
code/game/objects/items/devices/multitool.dm
View File

@@ -1,18 +1,19 @@
// Multitool -- A multitool is used for hacking electronic devices. // Multitool -- A multitool is used for hacking electronic devices.
#define DETECT_TICKER_PERIOD 10 //in deciseconds #define DETECT_TICKER_PERIOD 10 //in deciseconds
#define DETECT_AI 1 #define DETECT_AI 1
#define DETECT_PAI 2 #define DETECT_PAI 2
#define DETECT_RECORDER 4 #define DETECT_RECORDER 4
#define DETECT_ANALYZER 8 #define DETECT_ANALYZER 8
////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////
/obj/item/device/multitool /obj/item/device/multitool
name = "multitool" name = "multitool"
desc = "Used for pulsing wires to test which to cut. Not recommended by doctors." desc = "Used for pulsing wires to test which to cut. Not recommended by doctors."
icon_state = "multitool" icon_state = "multitool"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 5.0 force = 5.0
w_class = 2.0 w_class = 2.0
throwforce = 5.0 throwforce = 5.0
@@ -35,10 +36,10 @@
/obj/item/device/multitool/ai_detect /obj/item/device/multitool/ai_detect
var/detected = 0 //bitflags var/detected = 0 //bitflags
/obj/item/device/multitool/ai_detect/New() /obj/item/device/multitool/ai_detect/New()
spawn() src.ticker() spawn() src.ticker()
/obj/item/device/multitool/ai_detect/proc/ticker() /obj/item/device/multitool/ai_detect/proc/ticker()
var/mob/M var/mob/M
var/range var/range
@@ -48,7 +49,7 @@
detected = 0 detected = 0
our_turf = get_turf(src) our_turf = get_turf(src)
range = range(8,our_turf) range = range(8,our_turf)
//Search for AIs and people looking through sec cams //Search for AIs and people looking through sec cams
if(cameranet.chunkGenerated(our_turf.x, our_turf.y, our_turf.z)) if(cameranet.chunkGenerated(our_turf.x, our_turf.y, our_turf.z))
var/datum/camerachunk/chunk = cameranet.getCameraChunk(our_turf.x, our_turf.y, our_turf.z) var/datum/camerachunk/chunk = cameranet.getCameraChunk(our_turf.x, our_turf.y, our_turf.z)
@@ -57,32 +58,32 @@
if(get_dist(src,M) < 8) if(get_dist(src,M) < 8)
src.detected |= DETECT_AI src.detected |= DETECT_AI
break break
for(T in range) //Search for pAIs for(T in range) //Search for pAIs
if(src.findItem(/mob/living/silicon/pai,T)) if(src.findItem(/mob/living/silicon/pai,T))
src.detected |= DETECT_PAI src.detected |= DETECT_PAI
break break
for(T in range) //Search for recorders for(T in range) //Search for recorders
if(src.findItem(/obj/item/device/taperecorder,T)) if(src.findItem(/obj/item/device/taperecorder,T))
src.detected |= DETECT_RECORDER src.detected |= DETECT_RECORDER
break break
for(T in range) //Search for analyzers for(T in range) //Search for analyzers
if(src.findComponent(/obj/item/device/assembly/voice,T)) if(src.findComponent(/obj/item/device/assembly/voice,T))
src.detected |= DETECT_ANALYZER src.detected |= DETECT_ANALYZER
break break
src.update_icon() src.update_icon()
sleep(DETECT_TICKER_PERIOD) sleep(DETECT_TICKER_PERIOD)
return return
/obj/item/device/multitool/ai_detect/proc/findItem(pathToFind,atom/thingToSearch) /obj/item/device/multitool/ai_detect/proc/findItem(pathToFind,atom/thingToSearch)
if(locate(pathToFind) in thingToSearch.contents) return 1 if(locate(pathToFind) in thingToSearch.contents) return 1
for(var/mob/living/carbon/mob in thingToSearch) for(var/mob/living/carbon/mob in thingToSearch)
if(.(pathToFind,mob)) return 1 if(.(pathToFind,mob)) return 1
return 0 return 0
/obj/item/device/multitool/ai_detect/proc/findComponent(pathToFind,atom/thingToSearch) /obj/item/device/multitool/ai_detect/proc/findComponent(pathToFind,atom/thingToSearch)
if(locate(pathToFind) in thingToSearch.contents) return 1 if(locate(pathToFind) in thingToSearch.contents) return 1
for(var/obj/item/device/assembly_holder/assembly in thingToSearch) for(var/obj/item/device/assembly_holder/assembly in thingToSearch)
@@ -92,20 +93,20 @@
for(var/mob/living/carbon/mob in thingToSearch) for(var/mob/living/carbon/mob in thingToSearch)
if(.(pathToFind,mob)) return 1 if(.(pathToFind,mob)) return 1
return 0 return 0
obj/item/device/multitool/ai_detect/update_icon() obj/item/device/multitool/ai_detect/update_icon()
if(src.detected) if(src.detected)
if(src.detected & DETECT_AI) if(src.detected & DETECT_AI)
src.icon_state = "[initial(src.icon_state)]_red" src.icon_state = "[initial(src.icon_state)]_red"
else if(src.detected & DETECT_PAI) else if(src.detected & DETECT_PAI)
src.icon_state = "[initial(src.icon_state)]_orange" src.icon_state = "[initial(src.icon_state)]_orange"
else if(src.detected & DETECT_RECORDER) else if(src.detected & DETECT_RECORDER)
src.icon_state = "[initial(src.icon_state)]_yellow" src.icon_state = "[initial(src.icon_state)]_yellow"
else if(src.detected & DETECT_ANALYZER) else if(src.detected & DETECT_ANALYZER)
src.icon_state = "[initial(src.icon_state)]_blue" src.icon_state = "[initial(src.icon_state)]_blue"
else src.icon_state = initial(src.icon_state) else src.icon_state = initial(src.icon_state)
return return
obj/item/device/multitool/ai_detect/examine() obj/item/device/multitool/ai_detect/examine()
..() ..()
if(src.detected) usr << "The screen displays:" if(src.detected) usr << "The screen displays:"
@@ -113,7 +114,7 @@ obj/item/device/multitool/ai_detect/examine()
if(src.detected & DETECT_PAI) usr << "pAI detected" if(src.detected & DETECT_PAI) usr << "pAI detected"
if(src.detected & DETECT_RECORDER) usr << "Tape recorder detected" if(src.detected & DETECT_RECORDER) usr << "Tape recorder detected"
if(src.detected & DETECT_ANALYZER) usr << "Voice analyzer detected" if(src.detected & DETECT_ANALYZER) usr << "Voice analyzer detected"
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
#undef DETECT_TICKER_PERIOD #undef DETECT_TICKER_PERIOD
#undef DETECT_AI #undef DETECT_AI

3
code/game/objects/items/devices/powersink.dm
View File

@@ -6,7 +6,8 @@
icon_state = "powersink0" icon_state = "powersink0"
item_state = "electronic" item_state = "electronic"
w_class = 4.0 w_class = 4.0
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
throwforce = 5 throwforce = 5
throw_speed = 1 throw_speed = 1
throw_range = 2 throw_range = 2

3
code/game/objects/items/devices/radio/electropack.dm
View File

@@ -4,7 +4,8 @@
icon_state = "electropack0" icon_state = "electropack0"
item_state = "electropack" item_state = "electropack"
frequency = 1449 frequency = 1449
flags = FPRINT | CONDUCT | TABLEPASS flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
w_class = 5.0 w_class = 5.0
g_amt = 2500 g_amt = 2500

3
code/game/objects/items/devices/radio/radio.dm
View File

@@ -26,7 +26,8 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
var/syndie = 0//Holder to see if it's a syndicate encrpyed radio var/syndie = 0//Holder to see if it's a syndicate encrpyed radio
var/maxf = 1499 var/maxf = 1499
// "Example" = FREQ_LISTENING|FREQ_BROADCASTING // "Example" = FREQ_LISTENING|FREQ_BROADCASTING
flags = FPRINT | CONDUCT | TABLEPASS flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throw_speed = 2 throw_speed = 2
throw_range = 9 throw_range = 9

12
code/game/objects/items/devices/scanners.dm
View File

@@ -79,7 +79,8 @@ REAGENT SCANNER
icon_state = "health" icon_state = "health"
item_state = "analyzer" item_state = "analyzer"
desc = "A hand-held body scanner able to distinguish vital signs of the subject." desc = "A hand-held body scanner able to distinguish vital signs of the subject."
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throwforce = 3 throwforce = 3
w_class = 1.0 w_class = 1.0
@@ -233,7 +234,8 @@ REAGENT SCANNER
icon_state = "atmos" icon_state = "atmos"
item_state = "analyzer" item_state = "analyzer"
w_class = 2.0 w_class = 2.0
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throwforce = 5 throwforce = 5
throw_speed = 4 throw_speed = 4
@@ -305,7 +307,8 @@ REAGENT SCANNER
icon_state = "spectrometer" icon_state = "spectrometer"
item_state = "analyzer" item_state = "analyzer"
w_class = 2.0 w_class = 2.0
flags = FPRINT | TABLEPASS| CONDUCT | OPENCONTAINER flags = FPRINT | TABLEPASS| OPENCONTAINER
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throwforce = 5 throwforce = 5
throw_speed = 4 throw_speed = 4
@@ -377,7 +380,8 @@ REAGENT SCANNER
icon_state = "spectrometer" icon_state = "spectrometer"
item_state = "analyzer" item_state = "analyzer"
w_class = 2.0 w_class = 2.0
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throwforce = 5 throwforce = 5
throw_speed = 4 throw_speed = 4

3
code/game/objects/items/devices/taperecorder.dm
View File

@@ -16,7 +16,8 @@
var/list/storedinfo = new/list() var/list/storedinfo = new/list()
var/list/timestamp = new/list() var/list/timestamp = new/list()
var/canprint = 1 var/canprint = 1
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
throwforce = 2 throwforce = 2
throw_speed = 4 throw_speed = 4
throw_range = 20 throw_range = 20

3
code/game/objects/items/devices/traitordevices.dm
View File

@@ -22,7 +22,8 @@ effective or pretty fucking useless.
w_class = 1.0 w_class = 1.0
throw_speed = 4 throw_speed = 4
throw_range = 10 throw_range = 10
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
item_state = "electronic" item_state = "electronic"
origin_tech = "magnets=3;combat=3;syndicate=3" origin_tech = "magnets=3;combat=3;syndicate=3"

3
code/game/objects/items/devices/whistle.dm
View File

@@ -4,7 +4,8 @@
icon_state = "voice0" icon_state = "voice0"
item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang) item_state = "flashbang" //looks exactly like a flash (and nothing like a flashbang)
w_class = 1.0 w_class = 1.0
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
var/spamcheck = 0 var/spamcheck = 0
var/emagged = 0 var/emagged = 0

3
code/game/objects/items/robot/robot_parts.dm
View File

@@ -3,7 +3,8 @@
icon = 'icons/obj/robot_parts.dmi' icon = 'icons/obj/robot_parts.dmi'
item_state = "buildpipe" item_state = "buildpipe"
icon_state = "blank" icon_state = "blank"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
w_type=RECYK_ELECTRONIC w_type=RECYK_ELECTRONIC
var/list/part = null var/list/part = null

3
code/game/objects/items/stacks/rods.dm
View File

@@ -3,7 +3,8 @@
desc = "Some rods. Can be used for building, or something." desc = "Some rods. Can be used for building, or something."
singular_name = "metal rod" singular_name = "metal rod"
icon_state = "rods" icon_state = "rods"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
w_class = 3.0 w_class = 3.0
force = 9.0 force = 9.0
throwforce = 15.0 throwforce = 15.0

3
code/game/objects/items/stacks/sheets/light.dm
View File

@@ -8,7 +8,8 @@
throwforce = 5.0 throwforce = 5.0
throw_speed = 5 throw_speed = 5
throw_range = 20 throw_range = 20
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
max_amount = 60 max_amount = 60
/obj/item/stack/light_w/attackby(var/obj/item/O as obj, var/mob/user as mob) /obj/item/stack/light_w/attackby(var/obj/item/O as obj, var/mob/user as mob)

3
code/game/objects/items/stacks/sheets/mineral.dm
View File

@@ -214,7 +214,8 @@ var/global/list/datum/stack_recipe/phazon_recipes = list()
perunit = 1500 perunit = 1500
melt_temperature = MELTPOINT_PLASTIC melt_temperature = MELTPOINT_PLASTIC
throwforce = 15.0 throwforce = 15.0
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
origin_tech = "materials=9" origin_tech = "materials=9"
/obj/item/stack/sheet/mineral/phazon/New(var/loc, var/amount=null) /obj/item/stack/sheet/mineral/phazon/New(var/loc, var/amount=null)

6
code/game/objects/items/stacks/sheets/sheet_types.dm
View File

@@ -87,7 +87,8 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
m_amt = 3750 m_amt = 3750
w_type = RECYK_METAL w_type = RECYK_METAL
throwforce = 14.0 throwforce = 14.0
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
origin_tech = "materials=1" origin_tech = "materials=1"
melt_temperature = MELTPOINT_STEEL melt_temperature = MELTPOINT_STEEL
@@ -123,7 +124,8 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
m_amt = 3750 // Was 7500, which doesn't make any fucking sense m_amt = 3750 // Was 7500, which doesn't make any fucking sense
perunit = 2875 //average of plasma and metal perunit = 2875 //average of plasma and metal
throwforce = 15.0 throwforce = 15.0
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
origin_tech = "materials=2" origin_tech = "materials=2"
w_type = RECYK_METAL w_type = RECYK_METAL
melt_temperature = MELTPOINT_STEEL+500 melt_temperature = MELTPOINT_STEEL+500

3
code/game/objects/items/stacks/tiles/light.dm
View File

@@ -8,7 +8,8 @@
throwforce = 5.0 throwforce = 5.0
throw_speed = 5 throw_speed = 5
throw_range = 20 throw_range = 20
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
max_amount = 60 max_amount = 60
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed") attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
var/on = 1 var/on = 1

3
code/game/objects/items/stacks/tiles/plasteel.dm
View File

@@ -11,7 +11,8 @@
throwforce = 15.0 throwforce = 15.0
throw_speed = 5 throw_speed = 5
throw_range = 20 throw_range = 20
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
max_amount = 60 max_amount = 60
/obj/item/stack/tile/plasteel/New() /obj/item/stack/tile/plasteel/New()

9
code/game/objects/items/stacks/tiles/tile_types.dm
View File

@@ -18,7 +18,8 @@
throwforce = 1.0 throwforce = 1.0
throw_speed = 5 throw_speed = 5
throw_range = 20 throw_range = 20
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
max_amount = 60 max_amount = 60
origin_tech = "biotech=1" origin_tech = "biotech=1"
@@ -35,7 +36,8 @@
throwforce = 1.0 throwforce = 1.0
throw_speed = 5 throw_speed = 5
throw_range = 20 throw_range = 20
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
max_amount = 60 max_amount = 60
/* /*
@@ -51,5 +53,6 @@
throwforce = 1.0 throwforce = 1.0
throw_speed = 5 throw_speed = 5
throw_range = 20 throw_range = 20
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
max_amount = 60 max_amount = 60

15
code/game/objects/items/toys.dm
View File

@@ -126,7 +126,8 @@
icon = 'icons/obj/gun.dmi' icon = 'icons/obj/gun.dmi'
icon_state = "revolver" icon_state = "revolver"
item_state = "gun" item_state = "gun"
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY flags = FPRINT | TABLEPASS | USEDELAY
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
w_class = 3.0 w_class = 3.0
g_amt = 10 g_amt = 10
@@ -185,7 +186,8 @@
desc = "There are 7 caps left! Make sure to recyle the box in an autolathe when it gets empty." desc = "There are 7 caps left! Make sure to recyle the box in an autolathe when it gets empty."
icon = 'icons/obj/ammo.dmi' icon = 'icons/obj/ammo.dmi'
icon_state = "357-7" icon_state = "357-7"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
w_class = 1.0 w_class = 1.0
g_amt = 10 g_amt = 10
m_amt = 10 m_amt = 10
@@ -353,7 +355,8 @@
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "katana" icon_state = "katana"
item_state = "katana" item_state = "katana"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT | SLOT_BACK slot_flags = SLOT_BELT | SLOT_BACK
force = 5 force = 5
throwforce = 5 throwforce = 5
@@ -613,7 +616,8 @@
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "katana" icon_state = "katana"
item_state = "katana" item_state = "katana"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT | SLOT_BACK slot_flags = SLOT_BELT | SLOT_BACK
force = 5 force = 5
throwforce = 5 throwforce = 5
@@ -650,7 +654,8 @@
icon_state = "megaphone" icon_state = "megaphone"
item_state = "radio" item_state = "radio"
w_class = 1.0 w_class = 1.0
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
var/spamcheck = 0 var/spamcheck = 0

3
code/game/objects/items/weapons/RCD.dm
View File

@@ -12,7 +12,8 @@ RCD
opacity = 0 opacity = 0
density = 0 density = 0
anchored = 0.0 anchored = 0.0
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 10.0 force = 10.0
throwforce = 10.0 throwforce = 10.0
throw_speed = 1 throw_speed = 1

3
code/game/objects/items/weapons/RPD.dm
View File

@@ -135,7 +135,8 @@ var/global/list/RPD_recipes=list(
opacity = 0 opacity = 0
density = 0 density = 0
anchored = 0.0 anchored = 0.0
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 10.0 force = 10.0
throwforce = 10.0 throwforce = 10.0
throw_speed = 1 throw_speed = 1

3
code/game/objects/items/weapons/ai_modules/AI_modules.dm
View File

@@ -12,7 +12,8 @@ Refactored AI modules by N3X15
icon_state = "std_mod" icon_state = "std_mod"
item_state = "circuitboard" item_state = "circuitboard"
desc = "An AI Module for transmitting encrypted instructions to the AI." desc = "An AI Module for transmitting encrypted instructions to the AI."
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 5.0 force = 5.0
w_class = 2.0 w_class = 2.0
throwforce = 5.0 throwforce = 5.0

3
code/game/objects/items/weapons/ai_modules/planning_frame.dm
View File

@@ -11,7 +11,8 @@
/obj/item/weapon/planning_frame /obj/item/weapon/planning_frame
name = "planning frame" name = "planning frame"
desc = "A large circuit board with slots for AI modules. Used for planning a law set." desc = "A large circuit board with slots for AI modules. Used for planning a law set."
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 5.0 force = 5.0
w_class = 2.0 w_class = 2.0
throwforce = 5.0 throwforce = 5.0

3
code/game/objects/items/weapons/airlock_painter.dm
View File

@@ -12,7 +12,8 @@
w_type = RECYK_ELECTRONIC w_type = RECYK_ELECTRONIC
origin_tech = "engineering=1" origin_tech = "engineering=1"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
var/obj/item/device/toner/ink = null var/obj/item/device/toner/ink = null

3
code/game/objects/items/weapons/chisel.dm
View File

@@ -7,7 +7,8 @@
m_amt = 120 m_amt = 120
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
var/use_name var/use_name

3
code/game/objects/items/weapons/cigs_lighters.dm
View File

@@ -479,7 +479,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
var/icon_off = "lighter-g" var/icon_off = "lighter-g"
w_class = 1 w_class = 1
throwforce = 4 throwforce = 4
flags = TABLEPASS | CONDUCT flags = TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
attack_verb = list("burnt", "singed") attack_verb = list("burnt", "singed")
var/lit = 0 var/lit = 0

3
code/game/objects/items/weapons/extinguisher.dm
View File

@@ -6,7 +6,8 @@
icon_state = "fire_extinguisher0" icon_state = "fire_extinguisher0"
item_state = "fire_extinguisher" item_state = "fire_extinguisher"
hitsound = 'sound/weapons/smash.ogg' hitsound = 'sound/weapons/smash.ogg'
flags = FPRINT | USEDELAY | TABLEPASS | CONDUCT flags = FPRINT | USEDELAY | TABLEPASS
siemens_coefficient = 1
throwforce = 10 throwforce = 10
w_class = 3.0 w_class = 3.0
throw_speed = 2 throw_speed = 2

3
code/game/objects/items/weapons/flamethrower.dm
View File

@@ -4,7 +4,8 @@
icon = 'icons/obj/flamethrower.dmi' icon = 'icons/obj/flamethrower.dmi'
icon_state = "flamethrowerbase" icon_state = "flamethrowerbase"
item_state = "flamethrower_0" item_state = "flamethrower_0"
flags = FPRINT | TABLEPASS| CONDUCT | USEDELAY // USEDELAY flag needed in order to use afterattack() for things that are not in reach. I.E: Shooting flames. flags = FPRINT | TABLEPASS| USEDELAY // USEDELAY flag needed in order to use afterattack() for things that are not in reach. I.E: Shooting flames.
siemens_coefficient = 1
force = 3.0 force = 3.0
throwforce = 10.0 throwforce = 10.0
throw_speed = 1 throw_speed = 1

3
code/game/objects/items/weapons/grenades/ghettobomb.dm
View File

@@ -23,7 +23,8 @@
item_state = "flashbang" item_state = "flashbang"
throw_speed = 4 throw_speed = 4
throw_range = 20 throw_range = 20
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
var/assembled = 0 var/assembled = 0
active = 1 active = 1

3
code/game/objects/items/weapons/grenades/grenade.dm
View File

@@ -7,7 +7,8 @@
item_state = "flashbang" item_state = "flashbang"
throw_speed = 4 throw_speed = 4
throw_range = 20 throw_range = 20
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
var/active = 0 var/active = 0
var/det_time = 50 var/det_time = 50

3
code/game/objects/items/weapons/handcuffs.dm
View File

@@ -4,7 +4,8 @@
gender = PLURAL gender = PLURAL
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "handcuff" icon_state = "handcuff"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throwforce = 5 throwforce = 5
w_class = 2.0 w_class = 2.0

12
code/game/objects/items/weapons/kitchen.dm
View File

@@ -22,7 +22,8 @@
throwforce = 5.0 throwforce = 5.0
throw_speed = 3 throw_speed = 3
throw_range = 5 throw_range = 5
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
origin_tech = "materials=1" origin_tech = "materials=1"
attack_verb = list("attacked", "stabbed", "poked") attack_verb = list("attacked", "stabbed", "poked")
@@ -159,7 +160,8 @@
icon = 'icons/obj/kitchen.dmi' icon = 'icons/obj/kitchen.dmi'
icon_state = "knife" icon_state = "knife"
desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come." desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 10.0 force = 10.0
w_class = 3.0 w_class = 3.0
throwforce = 6.0 throwforce = 6.0
@@ -192,7 +194,8 @@
icon_state = "butch" icon_state = "butch"
hitsound = "sound/weapons/rapidslice.ogg" hitsound = "sound/weapons/rapidslice.ogg"
desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products." desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products."
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 15.0 force = 15.0
w_class = 2.0 w_class = 2.0
throwforce = 8.0 throwforce = 8.0
@@ -291,7 +294,8 @@
throw_speed = 1 throw_speed = 1
throw_range = 5 throw_range = 5
w_class = 3.0 w_class = 3.0
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
m_amt = 3000 m_amt = 3000
w_type = RECYK_METAL w_type = RECYK_METAL
melt_temperature = MELTPOINT_STEEL melt_temperature = MELTPOINT_STEEL

3
code/game/objects/items/weapons/melee/energy.dm
View File

@@ -15,7 +15,8 @@
throw_speed = 1 throw_speed = 1
throw_range = 5 throw_range = 5
w_class = 3.0 w_class = 3.0
flags = FPRINT | CONDUCT | NOSHIELD | TABLEPASS flags = FPRINT | NOSHIELD | TABLEPASS
siemens_coefficient = 1
origin_tech = "combat=3" origin_tech = "combat=3"
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut") attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")

3
code/game/objects/items/weapons/melee/misc.dm
View File

@@ -4,7 +4,8 @@
icon_state = "chain" icon_state = "chain"
item_state = "chain" item_state = "chain"
hitsound = "sound/weapons/whip.ogg" hitsound = "sound/weapons/whip.ogg"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 10 force = 10
throwforce = 7 throwforce = 7

9
code/game/objects/items/weapons/shields.dm
View File

@@ -6,7 +6,8 @@
desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder." desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "riot" icon_state = "riot"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
force = 5.0 force = 5.0
throwforce = 5.0 throwforce = 5.0
@@ -60,7 +61,8 @@
desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere." desc = "A shield capable of stopping most projectile and melee attacks. It can be retracted, expanded, and stored anywhere."
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "eshield0" // eshield1 for expanded icon_state = "eshield0" // eshield1 for expanded
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 3.0 force = 3.0
throwforce = 5.0 throwforce = 5.0
throw_speed = 1 throw_speed = 1
@@ -81,7 +83,8 @@
icon = 'icons/obj/device.dmi' icon = 'icons/obj/device.dmi'
icon_state = "shield0" icon_state = "shield0"
var/active = 0.0 var/active = 0.0
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
item_state = "electronic" item_state = "electronic"
throwforce = 10.0 throwforce = 10.0
throw_speed = 2 throw_speed = 2

5
code/game/objects/items/weapons/storage/briefcase.dm
View File

@@ -2,14 +2,15 @@
name = "briefcase" name = "briefcase"
desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional." desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
icon_state = "briefcase" icon_state = "briefcase"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 8.0 force = 8.0
throw_speed = 1 throw_speed = 1
throw_range = 4 throw_range = 4
w_class = 4.0 w_class = 4.0
max_w_class = 3 max_w_class = 3
max_combined_w_class = 16 max_combined_w_class = 16
suicide_act(mob/user) suicide_act(mob/user)
viewers(user) << "\red <b>[user] is smashing \his head inside the [src.name]! It looks like \he's trying to commit suicide!</b>" viewers(user) << "\red <b>[user] is smashing \his head inside the [src.name]! It looks like \he's trying to commit suicide!</b>"
return (BRUTELOSS) return (BRUTELOSS)

3
code/game/objects/items/weapons/storage/toolbox.dm
View File

@@ -4,7 +4,8 @@
icon = 'icons/obj/storage.dmi' icon = 'icons/obj/storage.dmi'
icon_state = "red" icon_state = "red"
item_state = "toolbox_red" item_state = "toolbox_red"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 5.0 force = 5.0
throwforce = 10.0 throwforce = 10.0
throw_speed = 1 throw_speed = 1

18
code/game/objects/items/weapons/surgery_tools.dm
View File

@@ -20,7 +20,8 @@
g_amt = 5000 // OH COME ON, WHERE THE FUCK IS THERE ANY GLASS IN A GODDAMN RETRACTOR g_amt = 5000 // OH COME ON, WHERE THE FUCK IS THERE ANY GLASS IN A GODDAMN RETRACTOR
melt_temperature = MELTPOINT_STEEL melt_temperature = MELTPOINT_STEEL
w_type = RECYK_METAL w_type = RECYK_METAL
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
w_class = 1.0 w_class = 1.0
origin_tech = "materials=1;biotech=1" origin_tech = "materials=1;biotech=1"
@@ -140,7 +141,8 @@ LOOK FOR SURGERY.DM*/
m_amt = 5000 m_amt = 5000
g_amt = 2500 g_amt = 2500
w_type = RECYK_METAL w_type = RECYK_METAL
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
w_class = 1.0 w_class = 1.0
origin_tech = "materials=1;biotech=1" origin_tech = "materials=1;biotech=1"
attack_verb = list("attacked", "pinched") attack_verb = list("attacked", "pinched")
@@ -281,7 +283,8 @@ LOOK FOR SURGERY.DM*/
m_amt = 5000 m_amt = 5000
g_amt = 2500 g_amt = 2500
w_type = RECYK_ELECTRONIC w_type = RECYK_ELECTRONIC
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
w_class = 1.0 w_class = 1.0
origin_tech = "materials=1;biotech=1" origin_tech = "materials=1;biotech=1"
attack_verb = list("burnt") attack_verb = list("burnt")
@@ -377,7 +380,8 @@ LOOK FOR SURGERY.DM*/
m_amt = 15000 m_amt = 15000
g_amt = 10000 g_amt = 10000
w_type = RECYK_ELECTRONIC w_type = RECYK_ELECTRONIC
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 15.0 force = 15.0
w_class = 1.0 w_class = 1.0
origin_tech = "materials=1;biotech=1" origin_tech = "materials=1;biotech=1"
@@ -397,7 +401,8 @@ LOOK FOR SURGERY.DM*/
icon = 'icons/obj/surgery.dmi' icon = 'icons/obj/surgery.dmi'
icon_state = "scalpel" icon_state = "scalpel"
hitsound = "sound/weapons/bladeslice.ogg" hitsound = "sound/weapons/bladeslice.ogg"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 10.0 force = 10.0
w_class = 1.0 w_class = 1.0
throwforce = 5.0 throwforce = 5.0
@@ -681,7 +686,8 @@ LOOK FOR SURGERY.DM*/
icon = 'icons/obj/surgery.dmi' icon = 'icons/obj/surgery.dmi'
icon_state = "saw3" icon_state = "saw3"
hitsound = 'sound/weapons/circsawhit.ogg' hitsound = 'sound/weapons/circsawhit.ogg'
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 15.0 force = 15.0
w_class = 1.0 w_class = 1.0
throwforce = 9.0 throwforce = 9.0

4
code/game/objects/items/weapons/tanks/tank_types.dm
View File

@@ -77,7 +77,7 @@
name = "plasma tank" name = "plasma tank"
desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable." desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
icon_state = "plasma" icon_state = "plasma"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
slot_flags = null //they have no straps! slot_flags = null //they have no straps!
/obj/item/weapon/tank/plasma/New() /obj/item/weapon/tank/plasma/New()
@@ -114,7 +114,7 @@
name = "emergency oxygen tank" name = "emergency oxygen tank"
desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it." desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it."
icon_state = "emergency" icon_state = "emergency"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
w_class = 2.0 w_class = 2.0
force = 4.0 force = 4.0

3
code/game/objects/items/weapons/tanks/tanks.dm
View File

@@ -4,7 +4,8 @@
/obj/item/weapon/tank /obj/item/weapon/tank
name = "tank" name = "tank"
icon = 'icons/obj/tank.dmi' icon = 'icons/obj/tank.dmi'
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
pressure_resistance = ONE_ATMOSPHERE*5 pressure_resistance = ONE_ATMOSPHERE*5

3
code/game/objects/items/weapons/teleportation.dm
View File

@@ -16,7 +16,8 @@
var/frequency = 1451 var/frequency = 1451
var/broadcasting = null var/broadcasting = null
var/listening = 1.0 var/listening = 1.0
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
w_class = 2.0 w_class = 2.0
item_state = "electronic" item_state = "electronic"
throw_speed = 4 throw_speed = 4

3
code/game/objects/items/weapons/tile_painter.dm
View File

@@ -300,7 +300,8 @@ var/global/list/paint_variants = list(
opacity = 0 opacity = 0
density = 0 density = 0
anchored = 0.0 anchored = 0.0
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 10.0 force = 10.0
throwforce = 10.0 throwforce = 10.0
throw_speed = 1 throw_speed = 1

18
code/game/objects/items/weapons/tools.dm
View File

@@ -21,7 +21,8 @@
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "wrench" icon_state = "wrench"
hitsound = "sound/weapons/smash.ogg" hitsound = "sound/weapons/smash.ogg"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 5.0 force = 5.0
throwforce = 7.0 throwforce = 7.0
@@ -48,7 +49,8 @@
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "screwdriver" icon_state = "screwdriver"
hitsound = 'sound/weapons/toolhit.ogg' hitsound = 'sound/weapons/toolhit.ogg'
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 5.0 force = 5.0
w_class = 1.0 w_class = 1.0
@@ -133,7 +135,8 @@
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "cutters" icon_state = "cutters"
hitsound = 'sound/weapons/toolhit.ogg' hitsound = 'sound/weapons/toolhit.ogg'
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 6.0 force = 6.0
throw_speed = 2 throw_speed = 2
@@ -172,7 +175,8 @@
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "welder" icon_state = "welder"
hitsound = 'sound/weapons/toolhit.ogg' hitsound = 'sound/weapons/toolhit.ogg'
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
//Amount of OUCH when it's thrown //Amount of OUCH when it's thrown
@@ -482,7 +486,8 @@
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "crowbar" icon_state = "crowbar"
hitsound = "sound/weapons/toolhit.ogg" hitsound = "sound/weapons/toolhit.ogg"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 5.0 force = 5.0
throwforce = 7.0 throwforce = 7.0
@@ -535,7 +540,8 @@
desc = "A professional conversion kit used to convert any knock off revolver into the real deal capable of shooting lethal .357 rounds without the possibility of catastrophic failure" desc = "A professional conversion kit used to convert any knock off revolver into the real deal capable of shooting lethal .357 rounds without the possibility of catastrophic failure"
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "kit" icon_state = "kit"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
w_class = 2.0 w_class = 2.0
w_type = RECYK_MISC w_type = RECYK_MISC
origin_tech = "combat=2" origin_tech = "combat=2"

9
code/game/objects/items/weapons/weaponry.dm
View File

@@ -92,7 +92,8 @@
icon_state = "claymore" icon_state = "claymore"
item_state = "claymore" item_state = "claymore"
hitsound = "sound/weapons/bloodyslice.ogg" hitsound = "sound/weapons/bloodyslice.ogg"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 40 force = 40
throwforce = 10 throwforce = 10
@@ -120,7 +121,8 @@
icon_state = "katana" icon_state = "katana"
item_state = "katana" item_state = "katana"
hitsound = "sound/weapons/bloodyslice.ogg" hitsound = "sound/weapons/bloodyslice.ogg"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT | SLOT_BACK slot_flags = SLOT_BELT | SLOT_BACK
force = 40 force = 40
throwforce = 10 throwforce = 10
@@ -156,7 +158,8 @@ obj/item/weapon/wirerod
desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit." desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit."
icon_state = "wiredrod" icon_state = "wiredrod"
item_state = "rods" item_state = "rods"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 9 force = 9
throwforce = 10 throwforce = 10
w_class = 3 w_class = 3

6
code/game/objects/objs.dm
View File

@@ -5,6 +5,7 @@
var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj. var/unacidable = 0 //universal "unacidabliness" var, here so you can use it in any obj.
animate_movement = 2 animate_movement = 2
var/throwforce = 1 var/throwforce = 1
var/siemens_coefficient = 0 // for electrical admittance/conductance (electrocution checks and shit) - 0 is not conductive, 1 is conductive - this is a range, not binary
var/sharp = 0 // whether this object cuts var/sharp = 0 // whether this object cuts
var/edge = 0 var/edge = 0
@@ -51,6 +52,11 @@
slag = new(get_turf(src)) slag = new(get_turf(src))
slag.slaggify(src) slag.slaggify(src)
/obj/proc/is_conductor(var/siemens_min = 0.5)
if(src.siemens_coefficient >= siemens_min)
return 1
return
/obj/proc/process() /obj/proc/process()
processing_objects.Remove(src) processing_objects.Remove(src)

5
code/game/objects/structures/grille.dm
View File

@@ -5,7 +5,8 @@
icon_state = "grille" icon_state = "grille"
density = 1 density = 1
anchored = 1 anchored = 1
flags = FPRINT | CONDUCT flags = FPRINT
siemens_coefficient = 1
pressure_resistance = 5*ONE_ATMOSPHERE pressure_resistance = 5*ONE_ATMOSPHERE
layer = 2.9 layer = 2.9
explosion_resistance = 5 explosion_resistance = 5
@@ -160,7 +161,7 @@
if(WINDOW.dir == dir_to_set)//checking this for a 2nd time to check if a window was made while we were waiting. if(WINDOW.dir == dir_to_set)//checking this for a 2nd time to check if a window was made while we were waiting.
user << "<span class='notice'>There is already a window facing this way there.</span>" user << "<span class='notice'>There is already a window facing this way there.</span>"
return return
var/obj/structure/window/WD var/obj/structure/window/WD
if(istype(W,/obj/item/stack/sheet/glass)) //Creates anything under glass tree if(istype(W,/obj/item/stack/sheet/glass)) //Creates anything under glass tree
var/obj/item/stack/sheet/glass/G = W var/obj/item/stack/sheet/glass/G = W
if(!ispath(G.created_window)) if(!ispath(G.created_window))

3
code/game/objects/structures/support_rail.dm
View File

@@ -5,7 +5,8 @@
icon_state = "rail" icon_state = "rail"
density = 0 density = 0
anchored = 1 anchored = 1
flags = FPRINT | CONDUCT flags = FPRINT
siemens_coefficient = 1
pressure_resistance = 5*ONE_ATMOSPHERE pressure_resistance = 5*ONE_ATMOSPHERE
layer = 2.1 layer = 2.1
explosion_resistance = 5 explosion_resistance = 5

3
code/game/objects/structures/target_stake.dm
View File

@@ -5,7 +5,8 @@
icon = 'icons/obj/objects.dmi' icon = 'icons/obj/objects.dmi'
icon_state = "target_stake" icon_state = "target_stake"
density = 1 density = 1
flags = CONDUCT flags = 0
siemens_coefficient = 1
var/obj/item/target/pinned_target // the current pinned target var/obj/item/target/pinned_target // the current pinned target
Move() Move()

3
code/modules/assembly/assembly.dm
View File

@@ -3,7 +3,8 @@
desc = "A small electronic device that should never exist." desc = "A small electronic device that should never exist."
icon = 'icons/obj/assemblies/new_assemblies.dmi' icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = "" icon_state = ""
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
w_class = 2.0 w_class = 2.0
m_amt = 100 m_amt = 100
g_amt = 0 g_amt = 0

3
code/modules/assembly/bomb.dm
View File

@@ -6,7 +6,8 @@
w_class = 3.0 w_class = 3.0
throw_speed = 2 throw_speed = 2
throw_range = 4 throw_range = 4
flags = FPRINT | TABLEPASS| CONDUCT //Copied this from old code, so this may or may not be necessary flags = FPRINT | TABLEPASS //Copied this from old code, so this may or may not be necessary
siemens_coefficient = 1
var/status = 0 //0 - not readied //1 - bomb finished with welder var/status = 0 //0 - not readied //1 - bomb finished with welder
var/obj/item/device/assembly_holder/bombassembly = null //The first part of the bomb is an assembly holder, holding an igniter+some device var/obj/item/device/assembly_holder/bombassembly = null //The first part of the bomb is an assembly holder, holding an igniter+some device
var/obj/item/weapon/tank/bombtank = null //the second part of the bomb is a plasma tank var/obj/item/weapon/tank/bombtank = null //the second part of the bomb is a plasma tank

3
code/modules/assembly/holder.dm
View File

@@ -3,7 +3,8 @@
icon = 'icons/obj/assemblies/new_assemblies.dmi' icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = "holder" icon_state = "holder"
item_state = "assembly" item_state = "assembly"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
throwforce = 5 throwforce = 5
w_class = 2.0 w_class = 2.0
throw_speed = 3 throw_speed = 3

3
code/modules/assembly/shock_kit.dm
View File

@@ -6,7 +6,8 @@
var/obj/item/device/radio/electropack/part2 = null var/obj/item/device/radio/electropack/part2 = null
var/status = 0 var/status = 0
w_class = 5.0 w_class = 5.0
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
/obj/item/assembly/shock_kit/Destroy() /obj/item/assembly/shock_kit/Destroy()
del(part1) del(part1)

3
code/modules/clothing/suits/miscellaneous.dm
View File

@@ -55,7 +55,8 @@
desc = "Suit for a cyborg costume." desc = "Suit for a cyborg costume."
icon_state = "death" icon_state = "death"
item_state = "death" item_state = "death"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
fire_resist = T0C+5200 fire_resist = T0C+5200
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT

3
code/modules/detectivework/detective_scanner.dm
View File

@@ -9,7 +9,8 @@
var/list/stored = list() var/list/stored = list()
w_class = 3.0 w_class = 3.0
item_state = "electronic" item_state = "electronic"
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY flags = FPRINT | TABLEPASS | USEDELAY
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
attackby(obj/item/weapon/f_card/W as obj, mob/user as mob) attackby(obj/item/weapon/f_card/W as obj, mob/user as mob)

6
code/modules/hydroponics/hydro_tools.dm
View File

@@ -220,7 +220,8 @@
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "hoe" icon_state = "hoe"
item_state = "hoe" item_state = "hoe"
flags = FPRINT | TABLEPASS | CONDUCT | NOBLUDGEON flags = FPRINT | TABLEPASS | NOBLUDGEON
siemens_coefficient = 1
force = 5.0 force = 5.0
throwforce = 7.0 throwforce = 7.0
w_class = 2.0 w_class = 2.0
@@ -313,7 +314,8 @@
desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood." desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
icon = 'icons/obj/weapons.dmi' icon = 'icons/obj/weapons.dmi'
icon_state = "hatchet" icon_state = "hatchet"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 12.0 force = 12.0
w_class = 2.0 w_class = 2.0
throwforce = 15.0 throwforce = 15.0

3
code/modules/mining/equipment_locker.dm
View File

@@ -819,7 +819,8 @@
icon_state = "mining" icon_state = "mining"
item_state = "analyzer" item_state = "analyzer"
w_class = 2.0 w_class = 2.0
flags = CONDUCT flags = 0
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
var/cooldown = 0 var/cooldown = 0

3
code/modules/mining/mine_items.dm
View File

@@ -188,7 +188,8 @@ proc/move_mining_shuttle()
name = "pickaxe" name = "pickaxe"
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
icon_state = "pickaxe" icon_state = "pickaxe"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
force = 15.0 force = 15.0
throwforce = 4.0 throwforce = 4.0

3
code/modules/mining/money_bag.dm
View File

@@ -4,7 +4,8 @@
icon = 'icons/obj/storage.dmi' icon = 'icons/obj/storage.dmi'
name = "Money bag" name = "Money bag"
icon_state = "moneybag" icon_state = "moneybag"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 10.0 force = 10.0
throwforce = 2.0 throwforce = 2.0
w_class = 4.0 w_class = 4.0

3
code/modules/mining/ores_coins.dm
View File

@@ -291,7 +291,8 @@
icon = 'icons/obj/items.dmi' icon = 'icons/obj/items.dmi'
name = "Coin" name = "Coin"
icon_state = "coin" icon_state = "coin"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
force = 0.0 force = 0.0
throwforce = 0.0 throwforce = 0.0
w_class = 1.0 w_class = 1.0

3
code/modules/mob/living/silicon/robot/component.dm
View File

@@ -164,7 +164,8 @@
icon_state = "robotanalyzer" icon_state = "robotanalyzer"
item_state = "analyzer" item_state = "analyzer"
desc = "A hand-held scanner able to diagnose robotic injuries." desc = "A hand-held scanner able to diagnose robotic injuries."
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throwforce = 3 throwforce = 3
w_class = 1.0 w_class = 1.0

3
code/modules/mob/living/silicon/robot/robot_modules.dm
View File

@@ -4,7 +4,8 @@
icon_state = "std_module" icon_state = "std_module"
w_class = 100.0 w_class = 100.0
item_state = "electronic" item_state = "electronic"
flags = FPRINT|TABLEPASS | CONDUCT flags = FPRINT|TABLEPASS
siemens_coefficient = 1
var/list/modules = list() var/list/modules = list()
var/obj/item/emag = null var/obj/item/emag = null

3
code/modules/paperwork/photography.dm
View File

@@ -102,7 +102,8 @@
icon_state = "polaroid" icon_state = "polaroid"
item_state = "polaroid" item_state = "polaroid"
w_class = 2.0 w_class = 2.0
flags = FPRINT | CONDUCT | USEDELAY | TABLEPASS flags = FPRINT | USEDELAY | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
m_amt = 2000 m_amt = 2000
w_type = RECYK_ELECTRONIC w_type = RECYK_ELECTRONIC

3
code/modules/power/antimatter/shielding.dm
View File

@@ -234,7 +234,8 @@ proc/cardinalrange(var/center)
icon_state = "box" icon_state = "box"
item_state = "electronic" item_state = "electronic"
w_class = 4.0 w_class = 4.0
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
throwforce = 5 throwforce = 5
throw_speed = 1 throw_speed = 1
throw_range = 2 throw_range = 2

5
code/modules/power/cable.dm
View File

@@ -139,7 +139,7 @@
shock(user, 5, 0.2) shock(user, 5, 0.2)
else else
if (W.flags & CONDUCT) if (W.is_conductor())
shock(user, 50, 0.7) shock(user, 50, 0.7)
src.add_fingerprint(user) src.add_fingerprint(user)
@@ -187,7 +187,8 @@
throw_range = 5 throw_range = 5
m_amt = CC_PER_SHEET_METAL m_amt = CC_PER_SHEET_METAL
w_type = RECYK_METAL w_type = RECYK_METAL
flags = TABLEPASS | USEDELAY | FPRINT | CONDUCT flags = TABLEPASS | USEDELAY | FPRINT
siemens_coefficient = 1.5 //extra conducting
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
item_state = "coil_red" item_state = "coil_red"
attack_verb = list("whipped", "lashed", "disciplined", "flogged") attack_verb = list("whipped", "lashed", "disciplined", "flogged")

10
code/modules/power/lighting.dm
View File

@@ -17,7 +17,8 @@
desc = "Used for building lights." desc = "Used for building lights."
icon = 'icons/obj/lighting.dmi' icon = 'icons/obj/lighting.dmi'
icon_state = "tube-construct-item" icon_state = "tube-construct-item"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
var/fixture_type = "tube" var/fixture_type = "tube"
var/obj/machinery/light/newlight = null var/obj/machinery/light/newlight = null
var/sheets_refunded = 2 var/sheets_refunded = 2
@@ -64,7 +65,8 @@
desc = "Used for building small lights." desc = "Used for building small lights."
icon = 'icons/obj/lighting.dmi' icon = 'icons/obj/lighting.dmi'
icon_state = "bulb-construct-item" icon_state = "bulb-construct-item"
flags = FPRINT | TABLEPASS| CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
fixture_type = "bulb" fixture_type = "bulb"
sheets_refunded = 1 sheets_refunded = 1
@@ -393,7 +395,7 @@
if(M == user) if(M == user)
continue continue
M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2) M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2)
if(on && (W.flags & CONDUCT)) if(on && (W.is_conductor()))
//if(!user.mutations & M_RESIST_COLD) //if(!user.mutations & M_RESIST_COLD)
if (prob(12)) if (prob(12))
electrocute_mob(user, get_area(src), src, 0.3) electrocute_mob(user, get_area(src), src, 0.3)
@@ -425,7 +427,7 @@
return return
user << "You stick \the [W] into the light socket!" user << "You stick \the [W] into the light socket!"
if(has_power() && (W.flags & CONDUCT)) if(has_power() && (W.is_conductor()))
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
s.set_up(3, 1, src) s.set_up(3, 1, src)
s.start() s.start()

6
code/modules/projectiles/ammunition.dm
View File

@@ -3,7 +3,8 @@
desc = "A bullet casing." desc = "A bullet casing."
icon = 'icons/obj/ammo.dmi' icon = 'icons/obj/ammo.dmi'
icon_state = "s-casing" icon_state = "s-casing"
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
throwforce = 1 throwforce = 1
w_class = 1.0 w_class = 1.0
@@ -32,7 +33,8 @@
desc = "A box of ammo." desc = "A box of ammo."
icon_state = "357" icon_state = "357"
icon = 'icons/obj/ammo.dmi' icon = 'icons/obj/ammo.dmi'
flags = FPRINT | TABLEPASS | CONDUCT flags = FPRINT | TABLEPASS
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
item_state = "syringe_kit" item_state = "syringe_kit"
m_amt = 50000 m_amt = 50000

3
code/modules/projectiles/gun.dm
View File

@@ -4,7 +4,8 @@
icon = 'icons/obj/gun.dmi' icon = 'icons/obj/gun.dmi'
icon_state = "detective" icon_state = "detective"
item_state = "gun" item_state = "gun"
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY flags = FPRINT | TABLEPASS | USEDELAY
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
m_amt = 2000 m_amt = 2000
w_type = RECYK_METAL w_type = RECYK_METAL

6
code/modules/projectiles/guns/energy/special.dm
View File

@@ -5,7 +5,8 @@
fire_sound = 'sound/weapons/ion.ogg' fire_sound = 'sound/weapons/ion.ogg'
origin_tech = "combat=2;magnets=4" origin_tech = "combat=2;magnets=4"
w_class = 4.0 w_class = 4.0
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY flags = FPRINT | TABLEPASS | USEDELAY
siemens_coefficient = 1
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
charge_cost = 100 charge_cost = 100
projectile_type = "/obj/item/projectile/ion" projectile_type = "/obj/item/projectile/ion"
@@ -36,7 +37,8 @@ var/available_staff_transforms=list("monkey","robot","slime","xeno","human","clu
icon_state = "staffofchange" icon_state = "staffofchange"
item_state = "staffofchange" item_state = "staffofchange"
fire_sound = 'sound/weapons/radgun.ogg' fire_sound = 'sound/weapons/radgun.ogg'
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY flags = FPRINT | TABLEPASS | USEDELAY
siemens_coefficient = 1
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
w_class = 4.0 w_class = 4.0
charge_cost = 200 charge_cost = 200

3
code/modules/projectiles/guns/projectile/bow.dm
View File

@@ -43,7 +43,8 @@
icon_state = "crossbow" icon_state = "crossbow"
item_state = "crossbow-solid" item_state = "crossbow-solid"
w_class = 5.0 w_class = 5.0
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY flags = FPRINT | TABLEPASS | USEDELAY
siemens_coefficient = 1
slot_flags = SLOT_BELT | SLOT_BACK slot_flags = SLOT_BELT | SLOT_BACK
w_class = 3.0 w_class = 3.0

3
code/modules/projectiles/guns/projectile/flare.dm
View File

@@ -15,7 +15,8 @@
force = 4 force = 4
recoil = 1 recoil = 1
fire_delay = 10 fire_delay = 10
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY flags = FPRINT | TABLEPASS | USEDELAY
siemens_coefficient = 1
caliber = list("flare" = 1) caliber = list("flare" = 1)
origin_tech = "combat=2;materials=2" origin_tech = "combat=2;materials=2"
ammo_type = "/obj/item/ammo_casing/shotgun/flare" ammo_type = "/obj/item/ammo_casing/shotgun/flare"

3
code/modules/projectiles/guns/projectile/pneumatic.dm
View File

@@ -5,7 +5,8 @@
icon_state = "pneumatic" icon_state = "pneumatic"
item_state = "pneumatic" item_state = "pneumatic"
w_class = 5.0 w_class = 5.0
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY flags = FPRINT | TABLEPASS | USEDELAY
siemens_coefficient = 1
slot_flags = SLOT_BELT slot_flags = SLOT_BELT
max_w_class = 3 max_w_class = 3
max_combined_w_class = 20 max_combined_w_class = 20

3
code/modules/projectiles/guns/projectile/rocketlauncher.dm
View File

@@ -13,7 +13,8 @@
throw_speed = 4 throw_speed = 4
throw_range = 3 throw_range = 3
fire_delay = 5 fire_delay = 5
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY flags = FPRINT | TABLEPASS | USEDELAY
siemens_coefficient = 1
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
caliber = list("rpg" = 1) caliber = list("rpg" = 1)
origin_tech = "combat=4;materials=2;syndicate=2" origin_tech = "combat=4;materials=2;syndicate=2"

6
code/modules/projectiles/guns/projectile/shotgun.dm
View File

@@ -7,7 +7,8 @@
max_shells = 4 max_shells = 4
w_class = 4.0 w_class = 4.0
force = 10 force = 10
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY flags = FPRINT | TABLEPASS | USEDELAY
siemens_coefficient = 1
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
caliber = list("shotgun" = 1, "flare" = 1) //flare shells are still shells caliber = list("shotgun" = 1, "flare" = 1) //flare shells are still shells
origin_tech = "combat=4;materials=2" origin_tech = "combat=4;materials=2"
@@ -73,7 +74,8 @@
max_shells = 2 max_shells = 2
w_class = 4.0 w_class = 4.0
force = 10 force = 10
flags = FPRINT | TABLEPASS | CONDUCT | USEDELAY flags = FPRINT | TABLEPASS | USEDELAY
siemens_coefficient = 1
slot_flags = SLOT_BACK slot_flags = SLOT_BACK
caliber = list("shotgun" = 1, "flare" = 1) caliber = list("shotgun" = 1, "flare" = 1)
origin_tech = "combat=3;materials=1" origin_tech = "combat=3;materials=1"

3
code/modules/reagents/reagent_containers/food/drinks.dm
View File

@@ -275,7 +275,8 @@
amount_per_transfer_from_this = 20 amount_per_transfer_from_this = 20
possible_transfer_amounts = null possible_transfer_amounts = null
volume = 150 volume = 150
flags = FPRINT | CONDUCT | TABLEPASS | OPENCONTAINER flags = FPRINT | TABLEPASS | OPENCONTAINER
siemens_coefficient = 1
/obj/item/weapon/reagent_containers/food/drinks/golden_cup/tournament_26_06_2011 /obj/item/weapon/reagent_containers/food/drinks/golden_cup/tournament_26_06_2011
desc = "A golden cup. It will be presented to a winner of tournament 26 june and name of the winner will be graved on it." desc = "A golden cup. It will be presented to a winner of tournament 26 june and name of the winner will be graved on it."

Some files were not shown because too many files have changed in this diff Show More