From f8d51270789ded9eff9286c0ed079c087470d08b Mon Sep 17 00:00:00 2001 From: mwerezak Date: Sun, 21 Jun 2015 01:20:39 -0400 Subject: [PATCH] Adds SLOT_EARS to various items --- code/game/objects/items/devices/flashlight.dm | 1 + code/game/objects/items/devices/radio/encryptionkey.dm | 1 + code/game/objects/items/devices/spy_bug.dm | 1 + code/game/objects/items/toys.dm | 3 +++ code/game/objects/items/weapons/cigs_lighters.dm | 3 +++ code/game/objects/items/weapons/cosmetics.dm | 2 ++ code/game/objects/items/weapons/dna_injector.dm | 1 + code/game/objects/items/weapons/surgery_tools.dm | 1 + code/game/objects/items/weapons/tools.dm | 2 +- code/modules/detectivework/evidence.dm | 1 + code/modules/mining/coins.dm | 1 + .../living/carbon/human/species/xenomorphs/alien_facehugger.dm | 2 +- code/modules/mob/living/simple_animal/constructs/soulstone.dm | 2 +- code/modules/paperwork/paper_bundle.dm | 2 +- code/modules/projectiles/ammunition.dm | 2 +- code/modules/projectiles/guns/launcher/syringe_gun.dm | 2 +- code/modules/reagents/reagent_containers/dropper.dm | 1 + code/modules/reagents/reagent_containers/pill.dm | 1 + code/modules/reagents/reagent_containers/syringes.dm | 1 + code/modules/spells/spellbook.dm | 2 +- 20 files changed, 25 insertions(+), 7 deletions(-) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 29bcbc4332..2b0f5920ce 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -87,6 +87,7 @@ icon_state = "penlight" item_state = "" flags = CONDUCT + slot_flags = SLOT_EARS brightness_on = 2 w_class = 1 diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 823940a53c..3056ce5275 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -6,6 +6,7 @@ icon_state = "cypherkey" item_state = "" w_class = 1 + slot_flags = SLOT_EARS var/translate_binary = 0 var/translate_hive = 0 var/syndie = 0 diff --git a/code/game/objects/items/devices/spy_bug.dm b/code/game/objects/items/devices/spy_bug.dm index 2ad3df7ae5..b283ed889c 100644 --- a/code/game/objects/items/devices/spy_bug.dm +++ b/code/game/objects/items/devices/spy_bug.dm @@ -9,6 +9,7 @@ flags = CONDUCT force = 5.0 w_class = 1.0 + slot_flags = SLOT_EARS throwforce = 5.0 throw_range = 15 throw_speed = 3 diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index dcb12f2a5d..9632e66564 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -314,6 +314,7 @@ icon = 'icons/obj/toy.dmi' icon_state = "foamdart" w_class = 1.0 + slot_flags = SLOT_EARS /obj/effect/foam_dart_dummy name = "" @@ -486,6 +487,8 @@ icon = 'icons/obj/toy.dmi' icon_state = "bosunwhistle" var/cooldown = 0 + w_class = 1 + slot_flags = SLOT_EARS /obj/item/toy/bosunwhistle/attack_self(mob/user as mob) if(cooldown < world.time - 35) diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index da22352a72..2cd16fd561 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -38,6 +38,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM var/burnt = 0 var/smoketime = 5 w_class = 1.0 + slot_flags = SLOT_EARS origin_tech = "materials=1" attack_verb = list("burnt", "singed") @@ -210,6 +211,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM throw_speed = 0.5 item_state = "cigoff" w_class = 1 + slot_flags = SLOT_EARS attack_verb = list("burnt", "singed") icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi icon_off = "cigoff" @@ -294,6 +296,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM icon = 'icons/obj/clothing/masks.dmi' icon_state = "cigbutt" w_class = 1 + slot_flags = SLOT_EARS throwforce = 1 /obj/item/weapon/cigbutt/New() diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm index 437daa86bb..0f0f850ca0 100644 --- a/code/game/objects/items/weapons/cosmetics.dm +++ b/code/game/objects/items/weapons/cosmetics.dm @@ -5,6 +5,7 @@ icon = 'icons/obj/items.dmi' icon_state = "lipstick" w_class = 1.0 + slot_flags = SLOT_EARS var/colour = "red" var/open = 0 @@ -71,6 +72,7 @@ name = "purple comb" desc = "A pristine purple comb made from flexible plastic." w_class = 1.0 + slot_flags = SLOT_EARS icon = 'icons/obj/items.dmi' icon_state = "purplecomb" item_state = "purplecomb" diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index b94fd2d360..7c685a9e1d 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -9,6 +9,7 @@ throw_speed = 1 throw_range = 5 w_class = 1.0 + slot_flags = SLOT_EARS var/uses = 1 var/nofail var/is_bullet = 0 diff --git a/code/game/objects/items/weapons/surgery_tools.dm b/code/game/objects/items/weapons/surgery_tools.dm index d15441b032..786b90329a 100644 --- a/code/game/objects/items/weapons/surgery_tools.dm +++ b/code/game/objects/items/weapons/surgery_tools.dm @@ -83,6 +83,7 @@ sharp = 1 edge = 1 w_class = 1 + slot_flags = SLOT_EARS throwforce = 5.0 throw_speed = 3 throw_range = 5 diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index fad3035563..5f83f32581 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -38,7 +38,7 @@ icon = 'icons/obj/items.dmi' icon_state = "screwdriver" flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_BELT | SLOT_EARS force = 5.0 w_class = 1.0 throwforce = 5.0 diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index f115d9f9a9..898dbbaf1d 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -119,6 +119,7 @@ item_state = "paper" throwforce = 1 w_class = 1.0 + slot_flags = SLOT_EARS throw_speed = 3 throw_range = 5 diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index 6ddf02609a..7491bf668d 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -8,6 +8,7 @@ force = 0.0 throwforce = 0.0 w_class = 1.0 + slot_flags = SLOT_EARS var/string_attached var/sides = 2 diff --git a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm index 68e106ee1d..d6767fbbc4 100644 --- a/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm +++ b/code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm @@ -14,7 +14,7 @@ var/const/MAX_ACTIVE_TIME = 400 icon = 'icons/mob/alien.dmi' icon_state = "facehugger" item_state = "facehugger" - w_class = 1 //note: can be picked up by aliens unlike most other items of w_class below 4 + w_class = 3 //note: can be picked up by aliens unlike most other items of w_class below 4 flags = MASKCOVERSMOUTH | MASKCOVERSEYES | AIRTIGHT body_parts_covered = FACE|EYES throw_range = 5 diff --git a/code/modules/mob/living/simple_animal/constructs/soulstone.dm b/code/modules/mob/living/simple_animal/constructs/soulstone.dm index 2fa81f08c8..5859969d03 100644 --- a/code/modules/mob/living/simple_animal/constructs/soulstone.dm +++ b/code/modules/mob/living/simple_animal/constructs/soulstone.dm @@ -7,7 +7,7 @@ icon_state = "soulstone" item_state = "electronic" desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefacts power." - w_class = 1.0 + w_class = 2 slot_flags = SLOT_BELT origin_tech = "bluespace=4;materials=4" var/imprinted = "empty" diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index 409dd3e5f0..c99edc57b9 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -5,7 +5,7 @@ icon_state = "paper" item_state = "paper" throwforce = 0 - w_class = 1.0 + w_class = 2 throw_range = 2 throw_speed = 1 layer = 4 diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm index 52ca04e655..bb23b9c3ee 100644 --- a/code/modules/projectiles/ammunition.dm +++ b/code/modules/projectiles/ammunition.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/ammo.dmi' icon_state = "s-casing" flags = CONDUCT - slot_flags = SLOT_BELT + slot_flags = SLOT_BELT | SLOT_EARS throwforce = 1 w_class = 1 var/caliber = "" //Which kind of guns it can be loaded into diff --git a/code/modules/projectiles/guns/launcher/syringe_gun.dm b/code/modules/projectiles/guns/launcher/syringe_gun.dm index 8acbcce8b2..07cb48d784 100644 --- a/code/modules/projectiles/guns/launcher/syringe_gun.dm +++ b/code/modules/projectiles/guns/launcher/syringe_gun.dm @@ -6,7 +6,7 @@ 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_flags = SLOT_BELT | SLOT_EARS throwforce = 3 force = 3 w_class = 1 diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm index 44fd6b1a49..e6e6f3ac29 100644 --- a/code/modules/reagents/reagent_containers/dropper.dm +++ b/code/modules/reagents/reagent_containers/dropper.dm @@ -9,6 +9,7 @@ amount_per_transfer_from_this = 5 possible_transfer_amounts = list(1,2,3,4,5) w_class = 1 + slot_flags = SLOT_EARS volume = 5 afterattack(var/obj/target, var/mob/user, var/flag) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index bb405828ee..bab7fc5be6 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -9,6 +9,7 @@ item_state = "pill" possible_transfer_amounts = null w_class = 1 + slot_flags = SLOT_EARS volume = 60 New() diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index a221c31b10..0f3076fdb6 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -16,6 +16,7 @@ possible_transfer_amounts = null volume = 15 w_class = 1 + slot_flags = SLOT_EARS sharp = 1 var/mode = SYRINGE_DRAW var/image/filling //holds a reference to the current filling overlay diff --git a/code/modules/spells/spellbook.dm b/code/modules/spells/spellbook.dm index 169d750944..70d92f0183 100644 --- a/code/modules/spells/spellbook.dm +++ b/code/modules/spells/spellbook.dm @@ -5,7 +5,7 @@ icon_state ="spellbook" throw_speed = 1 throw_range = 5 - w_class = 1.0 + w_class = 2 var/uses = 5 var/temp = null var/max_uses = 5