Removes .0 at the end of w_class numbers

This commit is contained in:
monster860
2016-07-08 12:26:34 -04:00
parent 1bdc353dff
commit 3df85518e1
156 changed files with 249 additions and 249 deletions
@@ -14,7 +14,7 @@ AI MODULES
desc = "An AI Module for transmitting encrypted instructions to the AI."
flags = CONDUCT
force = 5.0
w_class = 2.0
w_class = 2
throwforce = 5.0
throw_speed = 3
throw_range = 15
+1 -1
View File
@@ -17,7 +17,7 @@ RCD
throwforce = 10.0
throw_speed = 3
throw_range = 5
w_class = 3.0
w_class = 3
materials = list(MAT_METAL=100000)
origin_tech = "engineering=4;materials=2"
var/datum/effect/system/spark_spread/spark_system
+1 -1
View File
@@ -13,7 +13,7 @@ RSF
anchored = 0.0
var/matter = 0
var/mode = 1
w_class = 3.0
w_class = 3
/obj/item/weapon/rsf/New()
desc = "A RSF. It currently holds [matter]/30 fabrication-units."
+1 -1
View File
@@ -15,7 +15,7 @@
name = "card"
desc = "A card."
icon = 'icons/obj/card.dmi'
w_class = 1.0
w_class = 1
var/associated_account_number = 0
var/list/files = list( )
+1 -1
View File
@@ -22,7 +22,7 @@ var/global/list/moneytypes=list(
throwforce = 1.0
throw_speed = 1
throw_range = 2
w_class = 1.0
w_class = 1
var/access = list()
access = access_crate_cash
var/worth = 1 // Per chip
+1 -1
View File
@@ -7,7 +7,7 @@
throwforce = 3.0
throw_speed = 1
throw_range = 5
w_class = 2.0
w_class = 2
attack_verb = list("warned", "cautioned", "smashed")
proximity_sign
@@ -6,7 +6,7 @@
icon = 'icons/obj/chronos.dmi'
icon_state = "chronobackpack"
item_state = "backpack"
w_class = 4.0
w_class = 4
slot_flags = SLOT_BACK
slowdown = 1
action_button_name = "Equip/Unequip TED Gun"
@@ -15,7 +15,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "banana_peel"
item_state = "banana_peel"
w_class = 1.0
w_class = 1
throwforce = 0
throw_speed = 4
throw_range = 20
@@ -77,7 +77,7 @@
item_state = "bike_horn"
hitsound = null
throwforce = 3
w_class = 1.0
w_class = 1
throw_speed = 3
throw_range = 15
attack_verb = list("HONKED")
+2 -2
View File
@@ -3,7 +3,7 @@
desc = "A generic brand of lipstick."
icon = 'icons/obj/items.dmi'
icon_state = "lipstick"
w_class = 1.0
w_class = 1
var/colour = "red"
var/open = 0
@@ -86,7 +86,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "razor"
flags = CONDUCT
w_class = 1.0
w_class = 1
/obj/item/weapon/razor/attack(mob/living/carbon/M as mob, mob/user as mob)
if(ishuman(M))
+2 -2
View File
@@ -9,7 +9,7 @@
icon_state = "gavelhammer"
force = 5.0
throwforce = 6.0
w_class = 2.0
w_class = 2
attack_verb = list("bashed", "battered", "judged", "whacked")
/obj/item/weapon/gavelhammer/suicide_act(mob/user)
@@ -24,7 +24,7 @@
icon_state = "gavelblock"
force = 2.0
throwforce = 2.0
w_class = 1.0
w_class = 1
/obj/item/weapon/gavelblock/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/weapon/gavelhammer))
@@ -6,7 +6,7 @@
icon_state = "plastic-explosive0"
item_state = "plasticx"
flags = NOBLUDGEON
w_class = 2.0
w_class = 2
origin_tech = "syndicate=2"
var/datum/wires/explosive/plastic/wires = null
var/timer = 10
@@ -7,7 +7,7 @@
hitsound = 'sound/weapons/smash.ogg'
flags = CONDUCT
throwforce = 10
w_class = 3.0
w_class = 3
throw_speed = 2
throw_range = 7
force = 10
@@ -29,7 +29,7 @@
hitsound = null //it is much lighter, after all.
flags = null //doesn't CONDUCT
throwforce = 2
w_class = 2.0
w_class = 2
force = 3.0
materials = list()
max_water = 30
@@ -11,7 +11,7 @@
throwforce = 10.0
throw_speed = 1
throw_range = 5
w_class = 3.0
w_class = 3
materials = list(MAT_METAL=500)
origin_tech = "combat=1;plasmatech=1"
var/status = 0
@@ -4,7 +4,7 @@ var/turf/T
/obj/item/weapon/grenade/bananade
name = "bananade"
desc = "A yellow grenade."
w_class = 2.0
w_class = 2
icon = 'icons/obj/grenade.dmi'
icon_state = "banana"
item_state = "flashbang"
@@ -3,7 +3,7 @@
desc = "HONK! brand Bananas. In a special applicator for rapid slipping of wide areas."
icon_state = "banana"
item_state = "flashbang"
w_class = 2.0
w_class = 2
force = 2.0
var/stage = 0
var/state = 0
@@ -55,7 +55,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "banana_peel"
item_state = "banana_peel"
w_class = 1.0
w_class = 1
throwforce = 0
throw_speed = 4
throw_range = 20
@@ -17,7 +17,7 @@
/obj/item/weapon/grenade/iedcasing
name = "improvised explosive assembly"
desc = "An igniter stuffed into an aluminum shell."
w_class = 2.0
w_class = 2
icon = 'icons/obj/grenade.dmi'
icon_state = "improvised_grenade"
item_state = "flashbang"
@@ -67,7 +67,7 @@
/obj/item/weapon/grenade/iedcasing/filled
name = "improvised firebomb"
desc = "A weak, improvised incendiary device."
w_class = 2.0
w_class = 2
icon = 'icons/obj/grenade.dmi'
icon_state = "improvised_grenade"
item_state = "flashbang"
@@ -1,7 +1,7 @@
/obj/item/weapon/grenade
name = "grenade"
desc = "A hand held grenade, with an adjustable timer."
w_class = 2.0
w_class = 2
icon = 'icons/obj/grenade.dmi'
icon_state = "grenade"
item_state = "flashbang"
+1 -1
View File
@@ -7,7 +7,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 5
w_class = 2.0
w_class = 2
throw_speed = 2
throw_range = 5
materials = list(MAT_METAL=500)
+3 -3
View File
@@ -18,7 +18,7 @@
*/
/obj/item/weapon/kitchen/utensil
force = 5.0
w_class = 1.0
w_class = 1
throwforce = 0.0
throw_speed = 3
throw_range = 5
@@ -164,7 +164,7 @@
throwforce = 10.0
throw_speed = 3
throw_range = 7
w_class = 3.0
w_class = 3
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
/* Trays moved to /obj/item/weapon/storage/bag */
@@ -181,7 +181,7 @@
throwforce = 5
throw_speed = 3
throw_range = 3
w_class = 2.0
w_class = 2
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
/obj/item/weapon/kitchen/mould/bear
+1 -1
View File
@@ -6,7 +6,7 @@
icon_state = "handcuff"
flags = CONDUCT
throwforce = 0
w_class = 3.0
w_class = 3
origin_tech = "materials=1"
slowdown = 7
breakouttime = 300 //Deciseconds = 30s = 0.5 minute
+1 -1
View File
@@ -147,7 +147,7 @@
icon_state = "match_unlit"
var/lit = 0
var/smoketime = 5
w_class = 1.0
w_class = 1
origin_tech = "materials=1"
attack_verb = list("burnt", "singed")
+4 -4
View File
@@ -30,7 +30,7 @@
flags = CONDUCT
force = 5.0
throwforce = 7.0
w_class = 2.0
w_class = 2
materials = list(MAT_METAL=50)
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
@@ -40,7 +40,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "c_tube"
throwforce = 1
w_class = 1.0
w_class = 1
throw_speed = 4
throw_range = 5
@@ -62,7 +62,7 @@
var/data = ""
var/base_url = "http://svn.slurm.us/public/spacestation13/misc/game_kit"
item_state = "sheet-metal"
w_class = 5.0
w_class = 5
*/
/obj/item/weapon/gift
@@ -73,7 +73,7 @@
var/size = 3.0
var/obj/item/gift = null
item_state = "gift"
w_class = 4.0
w_class = 4
/obj/item/weapon/kidanglobe
name = "Kidan homeworld globe"
+1 -1
View File
@@ -9,7 +9,7 @@
throwforce = 5.0
throw_speed = 3
throw_range = 7
w_class = 3.0
w_class = 3
attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
var/mopping = 0
var/mopcount = 0
+2 -2
View File
@@ -9,7 +9,7 @@ var/global/list/cached_icons = list()
icon_state = "paint_neutral"
item_state = "paintcan"
materials = list(MAT_METAL=200)
w_class = 3.0
w_class = 3
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(10,20,30,50,70)
volume = 70
@@ -73,7 +73,7 @@ var/global/list/cached_icons = list()
icon_state = "paint_neutral"
color = "FFFFFF"
item_state = "paintcan"
w_class = 3.0
w_class = 3
/obj/item/weapon/paint/red
name = "Red paint"
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/wizard.dmi'
icon_state = "scroll"
var/uses = 4.0
w_class = 2.0
w_class = 2
item_state = "paper"
throw_speed = 4
throw_range = 20
+1 -1
View File
@@ -7,7 +7,7 @@
sharp = 1
edge = 1
desc = "Could probably be used as ... a throwing weapon?"
w_class = 1.0
w_class = 1
force = 5.0
throwforce = 10.0
item_state = "shard-glass"
+1 -1
View File
@@ -4,7 +4,7 @@
name = "blank picket sign"
desc = "It's blank"
force = 5
w_class = 4.0
w_class = 4
attack_verb = list("bashed","smacked")
var/delayed = 0 //used to do delays
+1 -1
View File
@@ -4,7 +4,7 @@
gender = PLURAL
icon = 'icons/obj/items.dmi'
icon_state = "soap"
w_class = 1.0
w_class = 1
throwforce = 0
throw_speed = 4
throw_range = 20
+2 -2
View File
@@ -7,7 +7,7 @@
throwforce = 5.0
throw_speed = 1
throw_range = 5
w_class = 2.0
w_class = 2
flags = NOSHIELD
armour_penetration = 100
attack_verb = list("bludgeoned", "whacked", "disciplined")
@@ -73,5 +73,5 @@
throwforce = 5.0
throw_speed = 1
throw_range = 5
w_class = 2.0
w_class = 2
flags = NOSHIELD
@@ -59,7 +59,7 @@
desc = "What?"
gender = PLURAL
icon = 'icons/obj/stock_parts.dmi'
w_class = 2.0
w_class = 2
var/rating = 1
New()
src.pixel_x = rand(-5.0, 5)
@@ -10,7 +10,7 @@
item_state = "backpack"
lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi'
righthand_file = 'icons/mob/inhands/clothing_righthand.dmi'
w_class = 4.0
w_class = 4
slot_flags = SLOT_BACK //ERROOOOO
max_w_class = 3
max_combined_w_class = 21
@@ -85,7 +85,7 @@
desc = "Space Santa uses this to deliver toys to all the nice children in space on Christmas! Wow, it's pretty big!"
icon_state = "giftbag0"
item_state = "giftbag"
w_class = 4.0
w_class = 4
max_w_class = 3
max_combined_w_class = 400 // can store a ton of shit!
@@ -389,7 +389,7 @@
throwforce = 10.0
throw_speed = 3
throw_range = 5
w_class = 4.0
w_class = 4
flags = CONDUCT
materials = list(MAT_METAL=3000)
@@ -4,7 +4,7 @@
icon_state ="bible"
throw_speed = 1
throw_range = 5
w_class = 3.0
w_class = 3
var/mob/affecting = null
var/deity_name = "Christ"
@@ -8,7 +8,7 @@
force = 8.0
throw_speed = 2
throw_range = 4
w_class = 4.0
w_class = 4
max_w_class = 3
max_combined_w_class = 21
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
@@ -115,7 +115,7 @@
desc = "A box of crayons for all your rune drawing needs."
icon = 'icons/obj/crayons.dmi'
icon_state = "crayonbox"
w_class = 2.0
w_class = 2
storage_slots = 6
icon_type = "crayon"
can_hold = list(
@@ -209,7 +209,7 @@
icon_state = "pill_canister"
icon = 'icons/obj/chemical.dmi'
item_state = "contsolid"
w_class = 2.0
w_class = 2
can_hold = list("/obj/item/weapon/reagent_containers/food/pill","/obj/item/weapon/dice","/obj/item/weapon/paper")
allow_quick_gather = 1
use_to_pickup = 1
@@ -23,7 +23,7 @@
var/l_hacking = 0
var/emagged = 0
var/open = 0
w_class = 3.0
w_class = 3
max_w_class = 2
max_combined_w_class = 14
@@ -165,7 +165,7 @@
force = 8.0
throw_speed = 2
throw_range = 4
w_class = 4.0
w_class = 4
max_w_class = 3
max_combined_w_class = 21
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
@@ -213,7 +213,7 @@
icon_locking = "safeb"
icon_sparking = "safespark"
force = 8.0
w_class = 5.0
w_class = 5
max_w_class = 8
anchored = 1.0
density = 0
@@ -8,7 +8,7 @@
/obj/item/weapon/storage
name = "storage"
icon = 'icons/obj/storage.dmi'
w_class = 3.0
w_class = 3
var/silent = 0 // No message on putting items in
var/list/can_hold = new/list() //List of objects which this item can store (if set, it can't store anything else)
var/list/cant_hold = new/list() //List of objects which this item can't store (in effect only if can_hold isn't set)
@@ -9,7 +9,7 @@
throwforce = 10.0
throw_speed = 2
throw_range = 7
w_class = 4.0
w_class = 4
materials = list(MAT_METAL = 500)
origin_tech = "combat=1"
attack_verb = list("robusted")
@@ -10,7 +10,7 @@
var/mob/currentUser = null
var/obj/item/device/radio/origradio = null
flags = CONDUCT | ONBELT
w_class = 2.0
w_class = 2
item_state = "radio"
throw_speed = 4
throw_range = 20
@@ -31,7 +31,7 @@
slot_flags = SLOT_BELT
item_state = "radio"
throwforce = 5
w_class = 2.0
w_class = 2
throw_speed = 4
throw_range = 20
materials = list(MAT_METAL=100)
@@ -4,7 +4,7 @@
name = "Jetpack (Empty)"
desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution."
icon_state = "jetpack"
w_class = 4.0
w_class = 4
item_state = "jetpack"
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
var/datum/effect/system/ion_trail_follow/ion_trail
@@ -135,7 +135,7 @@
icon_state = "emergency"
flags = CONDUCT
slot_flags = SLOT_BELT
w_class = 2.0
w_class = 2
force = 4.0
distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
volume = 3 //Tiny. Real life equivalents only have 21 breaths of oxygen in them. They're EMERGENCY tanks anyway -errorage (dangercon 2011)
@@ -5,7 +5,7 @@
icon = 'icons/obj/watertank.dmi'
icon_state = "waterbackpack"
item_state = "waterbackpack"
w_class = 4.0
w_class = 4
slot_flags = SLOT_BACK
slowdown = 1
action_button_name = "Toggle Mister"
@@ -108,7 +108,7 @@
icon = 'icons/obj/watertank.dmi'
icon_state = "mister"
item_state = "mister"
w_class = 4.0
w_class = 4
amount_per_transfer_from_this = 50
possible_transfer_amounts = list(25,50,100)
volume = 500
@@ -17,7 +17,7 @@
var/broadcasting = null
var/listening = 1.0
flags = CONDUCT
w_class = 2.0
w_class = 2
item_state = "electronic"
throw_speed = 4
throw_range = 20
@@ -98,7 +98,7 @@ Frequency:
icon_state = "hand_tele"
item_state = "electronic"
throwforce = 0
w_class = 2.0
w_class = 2
throw_speed = 3
throw_range = 5
materials = list(MAT_METAL=10000)
+7 -7
View File
@@ -24,7 +24,7 @@
slot_flags = SLOT_BELT
force = 5.0
throwforce = 7.0
w_class = 2.0
w_class = 2
materials = list(MAT_METAL=150)
origin_tech = "materials=1;engineering=1"
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
@@ -41,7 +41,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
force = 5.0
w_class = 1.0
w_class = 1
throwforce = 5.0
throw_speed = 3
throw_range = 5
@@ -104,7 +104,7 @@
force = 6.0
throw_speed = 3
throw_range = 7
w_class = 2.0
w_class = 2
materials = list(MAT_METAL=80)
origin_tech = "materials=1;engineering=1"
attack_verb = list("pinched", "nipped")
@@ -409,7 +409,7 @@
icon_state = "upindwelder"
item_state = "upindwelder"
max_fuel = 80
w_class = 3.0
w_class = 3
materials = list(MAT_METAL=70, MAT_GLASS=120)
origin_tech = "engineering=3"
@@ -419,7 +419,7 @@
icon_state = "exwelder"
item_state = "exwelder"
max_fuel = 40
w_class = 3.0
w_class = 3
materials = list(MAT_METAL=70, MAT_GLASS=120)
origin_tech = "engineering=4;plasmatech=3"
var/last_gen = 0
@@ -453,7 +453,7 @@
force = 5.0
throwforce = 7.0
item_state = "crowbar"
w_class = 2.0
w_class = 2
materials = list(MAT_METAL=50)
origin_tech = "engineering=1"
attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
@@ -479,7 +479,7 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "kit"
flags = CONDUCT
w_class = 2.0
w_class = 2
origin_tech = "combat=2"
var/open = 0
+6 -6
View File
@@ -109,7 +109,7 @@
///////////OFFHAND///////////////
/obj/item/weapon/twohanded/offhand
w_class = 5.0
w_class = 5
icon_state = "offhand"
name = "offhand"
flags = ABSTRACT
@@ -131,7 +131,7 @@
///////////Two hand required objects///////////////
//This is for objects that require two hands to even pick up
/obj/item/weapon/twohanded/required/
w_class = 5.0
w_class = 5
/obj/item/weapon/twohanded/required/attack_self()
return
@@ -165,7 +165,7 @@
throwforce = 15
sharp = 1
edge = 1
w_class = 4.0
w_class = 4
slot_flags = SLOT_BACK
force_unwielded = 5
force_wielded = 24
@@ -200,7 +200,7 @@
throwforce = 5.0
throw_speed = 1
throw_range = 5
w_class = 2.0
w_class = 2
force_unwielded = 3
force_wielded = 34
wieldsound = 'sound/weapons/saberon.ogg'
@@ -288,7 +288,7 @@
name = "spear"
desc = "A haphazardly-constructed yet still deadly weapon of ancient design."
force = 10
w_class = 4.0
w_class = 4
slot_flags = SLOT_BACK
force_unwielded = 10
force_wielded = 18 // Was 13, Buffed - RR
@@ -366,7 +366,7 @@
throwforce = 15
throw_speed = 1
throw_range = 5
w_class = 4.0 // can't fit in backpacks
w_class = 4 // can't fit in backpacks
force_unwielded = 15 //still pretty robust
force_wielded = 40 //you'll gouge their eye out! Or a limb...maybe even their entire body!
wieldsound = 'sound/weapons/chainsawstart.ogg'
@@ -10,7 +10,7 @@
throwforce = 10.0
throw_speed = 1
throw_range = 7
w_class = 4.0
w_class = 4
var/charges = 0 //how many restocking "charges" the refill has
+1 -1
View File
@@ -5,7 +5,7 @@
icon_state = "toyhammer"
slot_flags = SLOT_BELT
throwforce = 0
w_class = 1.0
w_class = 1
throw_speed = 7
throw_range = 15
attack_verb = list("banned")