Items are now assumed to be conductive, rather than the opposite

This commit is contained in:
Anewbe
2019-03-02 20:34:49 -06:00
parent 85d332e94b
commit aade8c356f
89 changed files with 27 additions and 133 deletions
-2
View File
@@ -3,7 +3,6 @@
desc = "A bullet casing."
icon = 'icons/obj/ammo.dmi'
icon_state = "s-casing"
flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_EARS
throwforce = 1
w_class = ITEMSIZE_TINY
@@ -66,7 +65,6 @@
desc = "A magazine for some kind of gun."
icon_state = ".357"
icon = 'icons/obj/ammo.dmi'
flags = CONDUCT
slot_flags = SLOT_BELT
item_state = "syringe_kit"
matter = list(DEFAULT_WALL_MATERIAL = 500)
-1
View File
@@ -38,7 +38,6 @@
)
icon_state = "detective"
item_state = "gun"
flags = CONDUCT
slot_flags = SLOT_BELT|SLOT_HOLSTER
matter = list(DEFAULT_WALL_MATERIAL = 2000)
w_class = ITEMSIZE_NORMAL
@@ -7,7 +7,6 @@
origin_tech = list(TECH_COMBAT = 2, TECH_MAGNET = 4)
w_class = ITEMSIZE_LARGE
force = 10
flags = CONDUCT
slot_flags = SLOT_BACK
projectile_type = /obj/item/projectile/ion
@@ -127,7 +126,6 @@
icon = 'icons/obj/gun.dmi'
item_icons = null
icon_state = "staffofchange"
flags = CONDUCT
slot_flags = SLOT_BACK
w_class = ITEMSIZE_LARGE
charge_cost = 480
@@ -2,7 +2,6 @@
name = "launcher"
desc = "A device that launches things."
w_class = ITEMSIZE_HUGE
flags = CONDUCT
slot_flags = SLOT_BACK
var/release_force = 0
@@ -5,7 +5,6 @@
item_state = "pneumatic"
slot_flags = SLOT_BELT
w_class = ITEMSIZE_HUGE
flags = CONDUCT
fire_sound_text = "a loud whoosh of moving air"
fire_delay = 50
fire_sound = 'sound/weapons/grenade_launcher.ogg' // Formerly tablehit1.ogg but I like this better -Ace
@@ -7,7 +7,6 @@
throw_speed = 2
throw_range = 10
force = 5.0
flags = CONDUCT
slot_flags = 0
origin_tech = list(TECH_COMBAT = 8, TECH_MATERIAL = 5)
fire_sound = 'sound/weapons/rpg.ogg'
@@ -5,7 +5,6 @@
icon_state = "syringe-cartridge"
var/icon_flight = "syringe-cartridge-flight" //so it doesn't look so weird when shot
matter = list(DEFAULT_WALL_MATERIAL = 125, "glass" = 375)
flags = CONDUCT
slot_flags = SLOT_BELT | SLOT_EARS
throwforce = 3
force = 3
@@ -6,7 +6,6 @@
max_shells = 4
w_class = ITEMSIZE_LARGE
force = 10
flags = CONDUCT
slot_flags = SLOT_BACK
caliber = "12g"
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2)
@@ -41,14 +40,14 @@
loaded -= AC //Remove casing from loaded list.
chambered = AC
if(animated_pump)//This affects all bolt action and shotguns.
if(animated_pump)//This affects all bolt action and shotguns.
flick("[icon_state]-cycling", src)//This plays any pumping
update_icon()
/obj/item/weapon/gun/projectile/shotgun/pump/update_icon()//This adds empty sprite capability for shotguns.
..()
if(!empty_sprite)//Just a dirty check
if(!empty_sprite)//Just a dirty check
return
if((loaded.len) || (chambered))
icon_state = "[icon_state]"
@@ -80,7 +79,6 @@
max_shells = 2
w_class = ITEMSIZE_LARGE
force = 10
flags = CONDUCT
slot_flags = SLOT_BACK
caliber = "12g"
origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 1)