cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Converts /modules/ to using WEIGHT_CLASS_x

Browse Source
This commit is contained in:
Sam
2017-05-28 01:25:09 +01:00
parent 3bc135b825
commit 2d13e2f7bf
137 changed files with 350 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/arcade/arcade_prize.dm
+2 -2
View File
@@ -67,7 +67,7 @@
throwforce = 0
throw_speed = 1
throw_range = 1
w_class = 1
w_class = WEIGHT_CLASS_TINY
max_amount = 9999 //Dang that's a lot of tickets
/obj/item/stack/tickets/New(var/loc, var/amount=null)
@@ -86,4 +86,4 @@
else if(amount >= 4)
icon_state = "tickets_2"
else
icon_state = "tickets_1"
icon_state = "tickets_1"
code/modules/arcade/mob_hunt/mob_cards.dm
+2 -2
View File
@@ -7,7 +7,7 @@
icon_state = "trade_card"
force = 0
throwforce = 1
w_class = 1
w_class = WEIGHT_CLASS_TINY
var/datum/mob_hunt/mob_data
/obj/item/weapon/nanomob_card/proc/update_info()
@@ -40,4 +40,4 @@
/obj/item/weapon/storage/box/nanomob_booster_pack/New()
..()
for(var/i in 1 to 6)
new /obj/item/weapon/nanomob_card/booster(src)
new /obj/item/weapon/nanomob_card/booster(src)
code/modules/assembly/assembly.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = ""
flags = CONDUCT
w_class = 2
w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL=100)
throwforce = 2
throw_speed = 3
code/modules/assembly/bomb.dm
+2 -2
View File
@@ -3,7 +3,7 @@
icon = 'icons/obj/tank.dmi'
item_state = "assembly"
throwforce = 5
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
throw_speed = 2
throw_range = 4
flags = CONDUCT //Copied this from old code, so this may or may not be necessary
@@ -171,4 +171,4 @@
if(!T)
return
T.assume_air(removed)
air_update_turf()
air_update_turf()
code/modules/assembly/holder.dm
+2 -7
View File
@@ -5,7 +5,7 @@
item_state = "assembly"
flags = CONDUCT
throwforce = 5
w_class = 2
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 10
@@ -100,7 +100,7 @@
a_left.hear_talk(M, msg)
if(a_right)
a_right.hear_talk(M, msg)
hear_message(mob/living/M as mob, msg)
if(a_left)
a_left.hear_message(M, msg)
@@ -210,8 +210,3 @@
qdel(src)
return
return
code/modules/assembly/shock_kit.dm
+1 -1
View File
@@ -6,7 +6,7 @@
var/obj/item/clothing/head/helmet/part1 = null
var/obj/item/device/radio/electropack/part2 = null
var/status = 0
w_class = 5
w_class = WEIGHT_CLASS_HUGE
flags = CONDUCT
/obj/item/assembly/shock_kit/Destroy()
code/modules/clothing/clothing.dm
+5 -5
View File
@@ -85,7 +85,7 @@
//Ears: currently only used for headsets and earmuffs
/obj/item/clothing/ears
name = "ears"
w_class = 1
w_class = WEIGHT_CLASS_TINY
throwforce = 2
slot_flags = SLOT_EARS
burn_state = FIRE_PROOF
@@ -128,7 +128,7 @@
/obj/item/clothing/ears/offear
name = "Other ear"
w_class = 5
w_class = WEIGHT_CLASS_HUGE
icon = 'icons/mob/screen_gen.dmi'
icon_state = "block"
slot_flags = SLOT_EARS | SLOT_TWOEARS
@@ -145,7 +145,7 @@
/obj/item/clothing/glasses
name = "glasses"
icon = 'icons/obj/clothing/glasses.dmi'
w_class = 2
w_class = WEIGHT_CLASS_SMALL
flags_cover = GLASSESCOVERSEYES
slot_flags = SLOT_EYES
materials = list(MAT_GLASS = 250)
@@ -177,7 +177,7 @@ BLIND // can't see anything
/obj/item/clothing/gloves
name = "gloves"
gender = PLURAL //Carn: for grammarically correct text-parsing
w_class = 2
w_class = WEIGHT_CLASS_SMALL
icon = 'icons/obj/clothing/gloves.dmi'
siemens_coefficient = 0.50
body_parts_covered = HANDS
@@ -543,7 +543,7 @@ BLIND // can't see anything
desc = "A suit that protects against low pressure environments. Has a big 13 on the back."
icon_state = "space"
item_state = "s_suit"
w_class = 4//bulky item
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
flags = STOPSPRESSUREDMAGE | THICKMATERIAL
code/modules/clothing/head/misc.dm
+1 -1
View File
@@ -380,7 +380,7 @@
throwforce = 3.0
throw_speed = 2
throw_range = 5
w_class = 2
w_class = WEIGHT_CLASS_SMALL
attack_verb = list("warned", "cautioned", "smashed")
burn_state = FIRE_PROOF
code/modules/clothing/masks/boxing.dm
+3 -3
View File
@@ -5,7 +5,7 @@
item_state = "balaclava"
flags = BLOCKHAIR
flags_inv = HIDEFACE
w_class = 2
w_class = WEIGHT_CLASS_SMALL
actions_types = list(/datum/action/item_action/adjust)
adjusted_flags = SLOT_HEAD
species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin")
@@ -27,7 +27,7 @@
item_state = "luchag"
flags = BLOCKHAIR
flags_inv = HIDEFACE
w_class = 2
w_class = WEIGHT_CLASS_SMALL
species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/mask.dmi',
@@ -47,4 +47,4 @@
name = "Rudos Mask"
desc = "Worn by robust fighters who are willing to do anything to win."
icon_state = "luchar"
item_state = "luchar"
item_state = "luchar"
code/modules/clothing/masks/breath.dm
+1 -1
View File
@@ -5,7 +5,7 @@
item_state = "breath"
flags = AIRTIGHT
flags_cover = MASKCOVERSMOUTH
w_class = 2
w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.10
permeability_coefficient = 0.50
actions_types = list(/datum/action/item_action/adjust)
code/modules/clothing/masks/gasmask.dm
+2 -3
View File
@@ -5,7 +5,7 @@
flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
item_state = "gas_alt"
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
@@ -70,7 +70,7 @@
flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
flags_cover = MASKCOVERSMOUTH | MASKCOVERSEYES
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
item_state = "bane_mask"
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
@@ -494,4 +494,3 @@
// ********************************************************************
code/modules/clothing/masks/miscellaneous.dm
+12 -12
View File
@@ -4,7 +4,7 @@
icon_state = "muzzle"
item_state = "muzzle"
flags_cover = MASKCOVERSMOUTH
w_class = 2
w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.90
put_on_delay = 20
var/resist_time = 0 //deciseconds of how long you need to gnaw to get rid of the gag, 0 to make it impossible to remove
@@ -24,14 +24,14 @@
name = "gag"
desc = "Stick this in their mouth to stop the noise."
icon_state = "gag"
w_class = 1
w_class = WEIGHT_CLASS_TINY
/obj/item/clothing/mask/muzzle/tapegag
name = "tape gag"
desc = "MHPMHHH!"
icon_state = "tapegag"
item_state = null
w_class = 1
w_class = WEIGHT_CLASS_TINY
resist_time = 150
mute = 0
species_fit = list("Vox", "Unathi", "Tajaran", "Vulpkanin")
@@ -59,7 +59,7 @@
desc = "A sterile mask designed to help prevent the spread of diseases."
icon_state = "sterile"
item_state = "sterile"
w_class = 1
w_class = WEIGHT_CLASS_TINY
flags_cover = MASKCOVERSMOUTH
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.01
@@ -109,7 +109,7 @@
icon_state = "blueneckscarf"
item_state = "blueneckscarf"
flags_cover = MASKCOVERSMOUTH
w_class = 2
w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.90
/obj/item/clothing/mask/redscarf
@@ -118,7 +118,7 @@
icon_state = "redwhite_scarf"
item_state = "redwhite_scarf"
flags_cover = MASKCOVERSMOUTH
w_class = 2
w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.90
/obj/item/clothing/mask/greenscarf
@@ -127,7 +127,7 @@
icon_state = "green_scarf"
item_state = "green_scarf"
flags_cover = MASKCOVERSMOUTH
w_class = 2
w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.90
/obj/item/clothing/mask/ninjascarf
@@ -136,7 +136,7 @@
icon_state = "ninja_scarf"
item_state = "ninja_scarf"
flags_cover = MASKCOVERSMOUTH
w_class = 2
w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.90
@@ -147,7 +147,7 @@
item_state = "pig"
flags = BLOCKHAIR
flags_inv = HIDEFACE
w_class = 2
w_class = WEIGHT_CLASS_SMALL
/obj/item/clothing/mask/horsehead
@@ -157,7 +157,7 @@
item_state = "horsehead"
flags = BLOCKHAIR
flags_inv = HIDEFACE
w_class = 2
w_class = WEIGHT_CLASS_SMALL
var/voicechange = 0
var/temporaryname = " the Horse"
var/originalname = ""
@@ -247,7 +247,7 @@
icon_state = "fawkes"
item_state = "fawkes"
flags_inv = HIDEFACE
w_class = 2
w_class = WEIGHT_CLASS_SMALL
/obj/item/clothing/mask/gas/clown_hat/pennywise
name = "Pennywise Mask"
@@ -263,7 +263,7 @@
desc = "A colorful bandana."
flags_inv = HIDEFACE
flags_cover = MASKCOVERSMOUTH
w_class = 1
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_MASK
adjusted_flags = SLOT_HEAD
icon_state = "bandbotany"
code/modules/clothing/spacesuits/alien.dm
+1 -1
View File
@@ -74,7 +74,7 @@
// Vox space gear (vaccuum suit, low pressure armour)
// Can't be equipped by any other species due to bone structure and vox cybernetics.
/obj/item/clothing/suit/space/vox
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
armor = list(melee = 40, bullet = 40, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
code/modules/clothing/spacesuits/ert.dm
+1 -1
View File
@@ -29,7 +29,7 @@
desc = "A suit worn by members of the Nanotrasen Emergency Response Team. Armoured, space ready, and fire resistant."
icon_state = "ert_commander"
item_state = "suit-command"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
armor = list(melee = 45, bullet = 25, laser = 30, energy = 10, bomb = 25, bio = 100, rad = 50)
allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank, /obj/item/device/t_scanner, /obj/item/weapon/rcd, /obj/item/weapon/crowbar, \
code/modules/clothing/spacesuits/hardsuit.dm
+2 -2
View File
@@ -352,7 +352,7 @@
icon_state = "hardsuit1-syndi"
item_state = "syndie_hardsuit"
item_color = "syndi"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
var/on = 1
actions_types = list(/datum/action/item_action/toggle_hardsuit_mode)
armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 35, bio = 100, rad = 50)
@@ -447,7 +447,7 @@
name = "gem-encrusted hardsuit"
desc = "A bizarre gem-encrusted suit that radiates magical energies."
item_state = "wiz_hardsuit"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
unacidable = 1
armor = list(melee = 40, bullet = 40, laser = 40, energy = 20, bomb = 35, bio = 100, rad = 50)
allowed = list(/obj/item/weapon/teleportation_scroll,/obj/item/weapon/tank)
code/modules/clothing/spacesuits/miscellaneous.dm
+3 -3
View File
@@ -27,7 +27,7 @@
desc = "A bulky, heavy-duty piece of exclusive Nanotrasen armor. YOU are in charge!"
icon_state = "caparmor"
item_state = "capspacesuit"
w_class = 4
w_class = WEIGHT_CLASS_BULKY
allowed = list(/obj/item/weapon/tank, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs)
armor = list(melee = 40, bullet = 50, laser = 50, energy = 25, bomb = 50, bio = 100, rad = 50)
species_restricted = list("exclude", "Diona", "Wryn")
@@ -86,7 +86,7 @@
blood_overlay_type = "coat"
flags_inv = 0
slowdown = 0
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
//Space santa outfit suit
/obj/item/clothing/head/helmet/space/santahat
@@ -123,7 +123,7 @@
desc = "Yarr."
icon_state = "pirate"
item_state = "pirate"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
slowdown = 0
armor = list(melee = 30, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
code/modules/clothing/spacesuits/plasmamen.dm
+1 -1
View File
@@ -62,7 +62,7 @@
flags = null //non-conductive
force = 0
throwforce = 0
w_class = 2 //Fits in boxes.
w_class = WEIGHT_CLASS_SMALL //Fits in boxes.
materials = list()
attack_verb = list("tapped")
code/modules/clothing/spacesuits/rig/rig.dm
+1 -1
View File
@@ -14,7 +14,7 @@
slot_flags = SLOT_BACK
req_one_access = list()
req_access = list()
w_class = 4
w_class = WEIGHT_CLASS_BULKY
// These values are passed on to all component pieces.
armor = list(melee = 10, bullet = 5, laser = 10, energy = 5, bomb = 10, bio = 100, rad = 75)
code/modules/clothing/spacesuits/syndi.dm
+2 -2
View File
@@ -12,7 +12,7 @@
icon_state = "syndicate"
item_state = "space_suit_syndicate"
desc = "Has a tag on it: Totally not property of of a hostile corporation, honest!"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/melee/energy/sword/saber,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank)
armor = list(melee = 40, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
@@ -173,4 +173,4 @@ obj/item/clothing/suit/space/syndicate/black/red/strike
/obj/item/clothing/suit/space/syndicate/black/engie
name = "Black Engineering Space Suit"
icon_state = "syndicate-black-engie"
item_state = "syndicate-black"
item_state = "syndicate-black"
code/modules/clothing/suits/armor.dm
+2 -2
View File
@@ -376,7 +376,7 @@
desc = "A suit that protects against some damage."
icon_state = "centcom"
item_state = "centcom"
w_class = 4//bulky item
w_class = WEIGHT_CLASS_BULKY
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
flags = THICKMATERIAL
@@ -393,7 +393,7 @@
icon_state = "heavy"
item_state = "swat_suit"
armor = list(melee = 80, bullet = 80, laser = 50, energy = 50, bomb = 100, bio = 100, rad = 100)
w_class = 4//bulky item
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.90
flags = THICKMATERIAL
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
code/modules/clothing/suits/bio.dm
+2 -2
View File
@@ -15,7 +15,7 @@
desc = "A suit that protects against biological contamination."
icon_state = "bio"
item_state = "bio_suit"
w_class = 4//bulky item
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags = THICKMATERIAL
@@ -93,4 +93,4 @@
strip_delay = 40
put_on_delay = 20
species_fit = null
sprite_sheets = null
sprite_sheets = null
code/modules/clothing/suits/miscellaneous.dm
+2 -2
View File
@@ -135,7 +135,7 @@
icon_state = "syndicate-black-red"
item_state = "syndicate-black-red"
desc = "A plastic replica of the syndicate space suit, you'll look just like a real murderous syndicate agent in this! This is a toy, it is not made for use in space!"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/toy)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
burn_state = FIRE_PROOF
@@ -714,7 +714,7 @@
desc = "A soft white robe made of a synthetic fiber that provides improved protection against biohazards. Possessing multiple overlapping layers, yet light enough to allow complete freedom of movement, it denotes its wearer as a master physician."
icon_state = "mercy_hoodie"
item_state = "mercy_hoodie"
w_class = 4//bulky item
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags_size = ONESIZEFITSALL
code/modules/clothing/suits/storage.dm
+1 -1
View File
@@ -5,7 +5,7 @@
..()
pockets = new/obj/item/weapon/storage/internal(src)
pockets.storage_slots = 2 //two slots
pockets.max_w_class = 2 //fit only pocket sized items
pockets.max_w_class = WEIGHT_CLASS_SMALL //fit only pocket sized items
pockets.max_combined_w_class = 4
/obj/item/clothing/suit/storage/Destroy()
code/modules/clothing/suits/utility.dm
+5 -5
View File
@@ -14,7 +14,7 @@
desc = "A suit that protects against fire and heat."
icon_state = "fire"
item_state = "fire_suit"
w_class = 4//bulky item
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
@@ -43,7 +43,7 @@
desc = "A suit that protects against extreme fire and heat."
//icon_state = "thermal"
item_state = "ro_suit"
w_class = 4//bulky item
w_class = WEIGHT_CLASS_BULKY
slowdown = 1.5
/obj/item/clothing/suit/fire/atmos
@@ -85,7 +85,7 @@
desc = "A suit designed for safety when handling explosives."
icon_state = "bombsuit"
item_state = "bombsuit"
w_class = 4//bulky item
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags = THICKMATERIAL
@@ -142,7 +142,7 @@
desc = "A suit that protects against radiation. Label: Made with lead, do not eat insulation."
icon_state = "rad"
item_state = "rad_suit"
w_class = 4//bulky item
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
flags = THICKMATERIAL
@@ -157,4 +157,4 @@
species_fit = list("Vox")
sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/suit.dmi'
)
)
code/modules/clothing/under/accessories/accessory.dm
+1 -1
View File
@@ -6,7 +6,7 @@
item_state = "" //no inhands
item_color = "bluetie"
slot_flags = SLOT_TIE
w_class = 2
w_class = WEIGHT_CLASS_SMALL
var/slot = "decor"
var/obj/item/clothing/under/has_suit = null //the suit the tie may be attached to
var/image/inv_overlay = null //overlay used when attached to clothing.
code/modules/clothing/under/accessories/holster.dm
+2 -2
View File
@@ -7,7 +7,7 @@
var/holster_allow = /obj/item/weapon/gun
var/obj/item/weapon/gun/holstered = null
actions_types = list(/datum/action/item_action/accessory/holster)
w_class = 3 // so it doesn't fit in pockets
w_class = WEIGHT_CLASS_NORMAL // so it doesn't fit in pockets
/obj/item/clothing/accessory/holster/Destroy()
QDEL_NULL(holstered)
@@ -140,4 +140,4 @@
name = "shoulder holster"
desc = "A handgun holster. Made of expensive leather."
icon_state = "holster"
item_color = "holster_low"
item_color = "holster_low"
code/modules/clothing/under/accessories/storage.dm
+2 -2
View File
@@ -7,7 +7,7 @@
var/slots = 3
var/obj/item/weapon/storage/internal/hold
actions_types = list(/datum/action/item_action/accessory/storage)
w_class = 3 // so it doesn't fit in pockets
w_class = WEIGHT_CLASS_NORMAL // so it doesn't fit in pockets
/obj/item/clothing/accessory/storage/New()
..()
@@ -110,4 +110,4 @@
hold.can_hold = list(/obj/item/weapon/hatchet/unathiknife, /obj/item/weapon/kitchen/knife)
new /obj/item/weapon/hatchet/unathiknife(hold)
new /obj/item/weapon/hatchet/unathiknife(hold)
new /obj/item/weapon/hatchet/unathiknife(hold)
code/modules/clothing/under/miscellaneous.dm
+1 -1
View File
@@ -167,7 +167,7 @@
icon_state = "black"
item_state = "bl_suit"
item_color = "black"
w_class = 4//bulky item
w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
code/modules/customitems/item_defines.dm
+7 -7
View File
@@ -20,7 +20,7 @@
icon_state = "tatgun"
force = 0
throwforce = 0
w_class = 1
w_class = WEIGHT_CLASS_TINY
var/tattoo_name = "tiger stripe tattoo" // Tat name for visible messages
var/tattoo_icon = "Tiger-stripe Tattoo" // body_accessory.dmi, new icons defined in sprite_accessories.dm
var/tattoo_r = 1 // RGB values for the body markings
@@ -221,7 +221,7 @@
item_state = "lunch_box"
force = 5
throwforce = 5
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 9
storage_slots = 3
@@ -248,7 +248,7 @@
hitsound = 'sound/weapons/tap.ogg'
force = 0
throwforce = 0
w_class = 2
w_class = WEIGHT_CLASS_SMALL
var/used = 0
/obj/item/fluff/wingler_comb/attack_self(mob/user)
@@ -268,7 +268,7 @@
desc = "Some sci-fi looking parts for a stun baton."
icon = 'icons/obj/custom_items.dmi'
icon_state = "scifikit"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
/obj/item/device/fluff/desolate_baton_kit/afterattack(atom/target, mob/user, proximity)
if(!proximity || !ishuman(user) || user.incapacitated())
@@ -293,7 +293,7 @@
name = "welding helmet modkit"
desc = "Some spraypaint and a stencil, perfect for painting flames onto a welding helmet!"
icon_state = "modkit"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
force = 0
throwforce = 0
@@ -318,7 +318,7 @@
name = "plasmaman suit modkit"
desc = "A kit containing nanites that are able to modify the look of a plasmaman suit and helmet without exposing the wearer to hostile environments."
icon_state = "modkit"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
force = 0
throwforce = 0
@@ -367,7 +367,7 @@
name = "sallet modkit"
desc = "A modkit that can make most helmets look like a steel sallet."
icon_state = "modkit"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
force = 0
throwforce = 0
code/modules/detective_work/evidence.dm
+5 -5
View File
@@ -6,7 +6,7 @@
icon = 'icons/obj/storage.dmi'
icon_state = "evidenceobj"
item_state = ""
w_class = 1
w_class = WEIGHT_CLASS_TINY
/obj/item/weapon/evidencebag/afterattack(obj/item/I, mob/user,proximity)
if(!proximity || loc == I)
@@ -29,7 +29,7 @@
to_chat(user, "<span class='notice'>You find putting an evidence bag in another evidence bag to be slightly absurd.</span>")
return 1 //now this is podracing
if(I.w_class > 3)
if(I.w_class > WEIGHT_CLASS_NORMAL)
to_chat(user, "<span class='notice'>[I] won't fit in [src].</span>")
return
@@ -76,7 +76,7 @@
"<span class='notice'>You hear someone rustle around in a plastic bag, and remove something.</span>")
overlays.Cut() //remove the overlays
user.put_in_hands(I)
w_class = 1
w_class = WEIGHT_CLASS_TINY
icon_state = "evidenceobj"
desc = "An empty evidence bag."
@@ -87,7 +87,7 @@
/obj/item/weapon/storage/box/evidence
name = "evidence bag box"
desc = "A box claiming to contain evidence bags."
/obj/item/weapon/storage/box/evidence/New()
new /obj/item/weapon/evidencebag(src)
new /obj/item/weapon/evidencebag(src)
@@ -95,4 +95,4 @@
new /obj/item/weapon/evidencebag(src)
new /obj/item/weapon/evidencebag(src)
new /obj/item/weapon/evidencebag(src)
..()
..()
code/modules/detective_work/footprints_and_rag.dm
+1 -1
View File
@@ -17,7 +17,7 @@
/obj/item/weapon/reagent_containers/glass/rag
name = "damp rag"
desc = "For cleaning up messes, you suppose."
w_class = 1
w_class = WEIGHT_CLASS_TINY
icon = 'icons/obj/toy.dmi'
icon_state = "rag"
amount_per_transfer_from_this = 5
code/modules/detective_work/scanner.dm
+1 -1
View File
@@ -7,7 +7,7 @@
desc = "Used to remotely scan objects and biomass for DNA and fingerprints. Can print a report of the findings."
icon = 'icons/goonstation/objects/objects.dmi'
icon_state = "detscanner"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
item_state = "electronic"
flags = CONDUCT | NOBLUDGEON
slot_flags = SLOT_BELT
code/modules/fish/fish_eggs.dm
+1 -2
View File
@@ -4,7 +4,7 @@
desc = "Eggs laid by a fish. This cluster seems... empty?"
icon = 'icons/obj/fish_items.dmi'
icon_state = "eggs"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
var/datum/fish/fish_type = null //Holds the datum of the fish that the egg is for, null means dud eggs
/obj/item/fish_eggs/goldfish
@@ -66,4 +66,3 @@
desc = "A cluster of bright neon eggs belonging to a bio-luminescent species of fish."
icon_state = "glofish_eggs"
fish_type = /datum/fish/glofish
code/modules/fish/fish_items.dm
+5 -5
View File
@@ -10,7 +10,7 @@
icon_state = "egg_scoop"
slot_flags = SLOT_BELT
throwforce = 0
w_class = 2
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
@@ -21,7 +21,7 @@
icon_state = "net"
slot_flags = SLOT_BELT
throwforce = 0
w_class = 2
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
@@ -35,7 +35,7 @@
icon = 'icons/obj/fish_items.dmi'
icon_state = "fish_food"
throwforce = 1
w_class = 2
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
@@ -46,7 +46,7 @@
icon_state = "brush"
slot_flags = SLOT_BELT
throwforce = 0
w_class = 2
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
attack_verb = list("scrubbed", "brushed", "scraped")
@@ -90,7 +90,7 @@
icon = 'icons/obj/fish_items.dmi'
icon_state = "fish"
throwforce = 1
w_class = 2
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 7
force = 1
code/modules/food_and_drinks/drinks/drinks.dm
+5 -5
View File
@@ -141,7 +141,7 @@
name = "pewter cup"
desc = "Everyone gets a trophy."
icon_state = "pewter_cup"
w_class = 1
w_class = WEIGHT_CLASS_TINY
force = 1
throwforce = 1
amount_per_transfer_from_this = 5
@@ -154,7 +154,7 @@
name = "gold cup"
desc = "You're winner!"
icon_state = "golden_cup"
w_class = 4
w_class = WEIGHT_CLASS_BULKY
force = 14
throwforce = 10
amount_per_transfer_from_this = 20
@@ -165,7 +165,7 @@
name = "silver cup"
desc = "Best loser!"
icon_state = "silver_cup"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
force = 10
throwforce = 8
amount_per_transfer_from_this = 15
@@ -176,7 +176,7 @@
name = "bronze cup"
desc = "At least you ranked!"
icon_state = "bronze_cup"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
force = 5
throwforce = 4
amount_per_transfer_from_this = 10
@@ -349,4 +349,4 @@
desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point."
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_bowl"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
code/modules/food_and_drinks/drinks/drinks/bottle.dm
+1 -1
View File
@@ -130,7 +130,7 @@
throwforce = 5
throw_speed = 3
throw_range = 5
w_class = 1
w_class = WEIGHT_CLASS_TINY
item_state = "beer"
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("stabbed", "slashed", "attacked")
code/modules/food_and_drinks/food/snacks.dm
+2 -2
View File
@@ -130,7 +130,7 @@
istype(W, /obj/item/weapon/hatchet) \
)
inaccurate = 1
else if(W.w_class <= 2 && istype(src,/obj/item/weapon/reagent_containers/food/snacks/sliceable))
else if(W.w_class <= WEIGHT_CLASS_SMALL && istype(src,/obj/item/weapon/reagent_containers/food/snacks/sliceable))
if(!iscarbon(user))
return 1
to_chat(user, "<span class='warning'>You slip [W] inside [src].</span>")
@@ -2477,4 +2477,4 @@
desc = "A large fried potato nugget that may or may not try to valid you."
icon_state = "tatortot"
list_reagents = list("nutriment" = 4)
filling_color = "FFD700"
filling_color = "FFD700"
code/modules/hydroponics/grown/banana.dm
+1 -1
View File
@@ -43,7 +43,7 @@
desc = "A peel from a banana."
icon_state = "banana_peel"
item_state = "banana_peel"
w_class = 1
w_class = WEIGHT_CLASS_TINY
throwforce = 0
throw_speed = 3
throw_range = 7
code/modules/hydroponics/grown/corn.dm
+3 -3
View File
@@ -30,7 +30,7 @@
desc = "A reminder of meals gone by."
icon_state = "corncob"
item_state = "corncob"
w_class = 1
w_class = WEIGHT_CLASS_TINY
throwforce = 0
throw_speed = 3
throw_range = 7
@@ -62,7 +62,7 @@
desc = "A cob with snap pops"
icon_state = "snapcorn"
item_state = "corncob"
w_class = 1
w_class = WEIGHT_CLASS_TINY
throwforce = 0
throw_speed = 3
throw_range = 7
@@ -81,4 +81,4 @@
snap_pops -= 1
if(!snap_pops)
new /obj/item/weapon/grown/corncob(user.loc)
qdel(src)
qdel(src)
code/modules/hydroponics/grown/flowers.dm
+2 -2
View File
@@ -117,7 +117,7 @@
force = 0
slot_flags = SLOT_HEAD
throwforce = 0
w_class = 1
w_class = WEIGHT_CLASS_TINY
throw_speed = 1
throw_range = 3
@@ -167,7 +167,7 @@
force = 0
slot_flags = SLOT_HEAD
throwforce = 0
w_class = 1
w_class = WEIGHT_CLASS_TINY
throw_speed = 1
throw_range = 3
attack_verb = list("roasted", "scorched", "burned")
code/modules/hydroponics/grown/melon.dm
+1 -1
View File
@@ -22,7 +22,7 @@
slice_path = /obj/item/weapon/reagent_containers/food/snacks/watermelonslice
slices_num = 5
dried_type = null
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
filling_color = "#008000"
bitesize_mod = 3
code/modules/hydroponics/grown/nettle.dm
+1 -1
View File
@@ -37,7 +37,7 @@
force = 15
hitsound = 'sound/weapons/bladeslice.ogg'
throwforce = 5
w_class = 1
w_class = WEIGHT_CLASS_TINY
throw_speed = 1
throw_range = 3
origin_tech = "combat=3"
code/modules/hydroponics/grown/towercap.dm
+2 -2
View File
@@ -37,7 +37,7 @@
icon_state = "logs"
force = 5
throwforce = 5
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
throw_speed = 2
throw_range = 3
origin_tech = "materials=1"
@@ -191,4 +191,4 @@
/obj/structure/bonfire/unbuckle_mob(force=0)
if(buckled_mob)
buckled_mob.pixel_y -= 13
. = ..()
. = ..()
code/modules/hydroponics/hydroitemdefines.dm
+11 -11
View File
@@ -5,7 +5,7 @@
icon = 'icons/obj/device.dmi'
icon_state = "hydro"
item_state = "analyzer"
w_class = 1
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_BELT
origin_tech = "magnets=2;biotech=2"
materials = list(MAT_METAL=30, MAT_GLASS=20)
@@ -24,7 +24,7 @@
flags = OPENCONTAINER
slot_flags = SLOT_BELT
throwforce = 0
w_class = 2
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 10
@@ -46,7 +46,7 @@
flags = OPENCONTAINER
slot_flags = SLOT_BELT
throwforce = 0
w_class = 2
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 10
@@ -68,7 +68,7 @@
flags = CONDUCT
force = 5
throwforce = 7
w_class = 2
w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL=50)
attack_verb = list("slashed", "sliced", "cut", "clawed")
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -80,7 +80,7 @@
icon_state = "hatchet"
flags = CONDUCT
force = 12
w_class = 1
w_class = WEIGHT_CLASS_TINY
throwforce = 15
throw_speed = 3
throw_range = 4
@@ -111,7 +111,7 @@
throwforce = 5
throw_speed = 2
throw_range = 3
w_class = 4
w_class = WEIGHT_CLASS_BULKY
flags = CONDUCT
armour_penetration = 20
slot_flags = SLOT_BACK
@@ -140,7 +140,7 @@
force = 3
sharp = 0
edge = 0
w_class = 2
w_class = WEIGHT_CLASS_SMALL
extend = 0
slot_flags = SLOT_BELT
origin_tech = "materials=3;combat=3"
@@ -154,7 +154,7 @@
icon_state = "tscythe1"
item_state = "scythe0" //use the normal scythe in-hands
slot_flags = SLOT_BACK //won't fit on belt, but can be worn on belt when extended
w_class = 4 //won't fit in backpacks while extended
w_class = WEIGHT_CLASS_BULKY //won't fit in backpacks while extended
force = 15 //slightly better than normal scythe damage
attack_verb = list("chopped", "sliced", "cut", "reaped")
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -165,7 +165,7 @@
icon_state = "tscythe0"
item_state = null //no sprite for folded version, like a tele-baton
slot_flags = SLOT_BELT //can be worn on belt again, but no longer makes sense to wear on the back
w_class = 2
w_class = WEIGHT_CLASS_SMALL
force = 3
attack_verb = list("hit", "poked")
hitsound = "swing_hit"
@@ -200,7 +200,7 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
volume = 50
w_class = 1
w_class = WEIGHT_CLASS_TINY
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(1,2,5,10,15,25,50)
@@ -249,7 +249,7 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle16"
volume = 50
w_class = 1
w_class = WEIGHT_CLASS_TINY
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(1,2,5,10,15,25,50)
code/modules/hydroponics/seeds.dm
+1 -1
View File
@@ -5,7 +5,7 @@
/obj/item/seeds
icon = 'icons/obj/hydroponics/seeds.dmi'
icon_state = "seed" // Unknown plant seed - these shouldn't exist in-game.
w_class = 1
w_class = WEIGHT_CLASS_TINY
burn_state = FLAMMABLE
var/plantname = "Plants" // Name of plant when planted.
var/product // A type path. The thing that is created when the plant is harvested.
code/modules/library/lib_items.dm
+3 -3
View File
@@ -167,7 +167,7 @@
icon_state ="book"
throw_speed = 1
throw_range = 5
w_class = 3 //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever)
w_class = WEIGHT_CLASS_NORMAL //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever)
attack_verb = list("bashed", "whacked", "educated")
burn_state = FLAMMABLE
@@ -201,7 +201,7 @@
/obj/item/weapon/book/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(carved)
if(!store)
if(W.w_class < 3)
if(W.w_class < WEIGHT_CLASS_NORMAL)
user.drop_item()
W.forceMove(src)
store = W
@@ -293,7 +293,7 @@
icon_state ="scanner"
throw_speed = 1
throw_range = 5
w_class = 1
w_class = WEIGHT_CLASS_TINY
var/obj/machinery/computer/library/checkout/computer // Associated computer - Modes 1 to 3 use this
var/obj/item/weapon/book/book // Currently scanned book
var/mode = 0 // 0 - Scan only, 1 - Scan and Set Buffer, 2 - Scan and Attempt to Check In, 3 - Scan and Attempt to Add to Inventory
code/modules/martial_arts/martial.dm
+1 -1
View File
@@ -172,7 +172,7 @@
name = "bo staff"
desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts. Can be wielded to both kill and incapacitate."
force = 10
w_class = 4
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
force_unwielded = 10
force_wielded = 24
code/modules/mining/coins.dm
+2 -2
View File
@@ -7,7 +7,7 @@
flags = CONDUCT
force = 1
throwforce = 2
w_class = 1
w_class = WEIGHT_CLASS_TINY
var/string_attached
var/list/sideslist = list("heads","tails")
var/cmineral = null
@@ -149,4 +149,4 @@
if(do_after(user, 15, target = src))
user.visible_message("<span class='notice'>[user] has flipped [src]. It lands on [coinflip].</span>", \
"<span class='notice'>You flip [src]. It lands on [coinflip].</span>", \
"<span class='notice'>You hear the clattering of loose change.</span>")
"<span class='notice'>You hear the clattering of loose change.</span>")
code/modules/mining/equipment_locker.dm
+11 -11
View File
@@ -521,7 +521,7 @@
desc = "A token to redeem a piece of equipment. Use it on a mining equipment vendor."
icon = 'icons/obj/items.dmi'
icon_state = "mining_voucher"
w_class = 1
w_class = WEIGHT_CLASS_TINY
/**********************Mining Point Card**********************/
@@ -555,7 +555,7 @@
icon_state = "Jaunter"
item_state = "electronic"
throwforce = 0
w_class = 2
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 5
origin_tech = "bluespace=2"
@@ -615,7 +615,7 @@
icon_state = "resonator"
item_state = "resonator"
desc = "A handheld device that creates small fields of energy that resonate until they detonate, crushing rock. It can also be activated without a target to create a field at the user's location, to act as a delayed time trap. It's more effective in a vaccuum."
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
force = 8
throwforce = 10
var/cooldown = 0
@@ -711,7 +711,7 @@
/obj/item/weapon/mining_drone_cube
name = "mining drone cube"
desc = "Compressed mining drone, ready for deployment. Just press the button to activate!"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
icon = 'icons/obj/aibots.dmi'
icon_state = "minedronecube"
item_state = "electronic"
@@ -728,7 +728,7 @@
name = "Drone Kit"
desc = "A boxed kit that includes one mining drone cube and a welding tool with an increased capacity."
icon_state = "implant"
max_w_class = 3
max_w_class = WEIGHT_CLASS_NORMAL
storage_slots = 2
can_hold = list(/obj/item/weapon/mining_drone_cube, /obj/item/weapon/weldingtool/hugetank)
@@ -746,7 +746,7 @@
icon_state = "lazarus_hypo"
item_state = "hypo"
throwforce = 0
w_class = 2
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 5
var/loaded = 1
@@ -806,7 +806,7 @@
name = "manual mining scanner"
icon_state = "mining1"
item_state = "analyzer"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT
var/cooldown = 0
@@ -838,7 +838,7 @@
name = "advanced automatic mining scanner"
icon_state = "mining0"
item_state = "analyzer"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
slot_flags = SLOT_BELT
var/cooldown = 35
@@ -931,7 +931,7 @@
desc = "A tank of compressed carbon dioxide for miners to use as propulsion in local space. The compact size allows for easy storage at the cost of capacity."
volume = 40
throw_range = 7
w_class = 3 //same as syndie harness
w_class = WEIGHT_CLASS_NORMAL //same as syndie harness
/*********************Hivelord stabilizer****************/
@@ -940,7 +940,7 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "bottle19"
desc = "Inject a hivelord core with this stabilizer to preserve its healing powers indefinitely."
w_class = 1
w_class = WEIGHT_CLASS_TINY
origin_tech = "biotech=1"
/obj/item/weapon/hivelordstabilizer/afterattack(obj/item/organ/internal/M, mob/user)
@@ -963,7 +963,7 @@
\n<span class='info'>Mark a mob with the destabilizing force, then hit them in melee to activate it for extra damage. Extra damage if backstabbed in this fashion. \
This weapon is only particularly effective against large creatures.</span>"
force = 20 //As much as a bone spear, but this is significantly more annoying to carry around due to requiring the use of both hands at all times
w_class = 4
w_class = WEIGHT_CLASS_BULKY
slot_flags = SLOT_BACK
force_unwielded = 20 //It's never not wielded so these are the same
force_wielded = 20
code/modules/mining/lavaland/ash_flora.dm
+2 -2
View File
@@ -155,7 +155,7 @@
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_shavings"
list_reagents = list("sugar" = 3, "ethanol" = 2, "stabilizing_agent" = 3, "minttoxin" = 2)
w_class = 1
w_class = WEIGHT_CLASS_TINY
/obj/item/weapon/reagent_containers/food/snacks/ash_flora/New()
..()
@@ -194,7 +194,7 @@
desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point."
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_bowl"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
//what you can craft with these things
/datum/crafting_recipe/mushroom_bowl
code/modules/mining/lavaland/loot/ashdragon_loot.dm
+7 -7
View File
@@ -15,8 +15,8 @@
if(4)
new /obj/item/weapon/dragons_blood(src)
// Spectral Blade
// Spectral Blade
/obj/item/weapon/melee/ghost_sword
name = "spectral blade"
desc = "A rusted and dulled blade. It doesn't look like it'd do much damage. It glows weakly."
@@ -25,7 +25,7 @@
flags = CONDUCT
sharp = 1
edge = 1
w_class = 4
w_class = WEIGHT_CLASS_BULKY
force = 1
throwforce = 1
hitsound = 'sound/effects/ghost2.ogg'
@@ -71,7 +71,7 @@
var/turf/T = get_turf(src)
var/list/contents = T.GetAllContents()
var/mob/dead/observer/current_spirits = list()
for(var/mob/dead/observer/O in player_list)
if(is_type_in_list(O.following, contents))
ghost_counter++
@@ -145,7 +145,7 @@
stage4 = list("<span class='danger'>Your blood burns.</span>")
stage5 = list("<span class='danger'>You're a fucking dragon. However, any previous allegiances you held still apply. It'd be incredibly rude to eat your still human friends for no reason.</span>")
new_form = /mob/living/simple_animal/hostile/megafauna/dragon/lesser
//Lava Staff
/obj/item/weapon/lava_staff
@@ -156,7 +156,7 @@
icon = 'icons/obj/guns/magic.dmi'
slot_flags = SLOT_BACK
item_state = "staffofstorms"
w_class = 4
w_class = WEIGHT_CLASS_BULKY
force = 25
damtype = BURN
hitsound = 'sound/weapons/sear.ogg'
@@ -214,4 +214,4 @@
/obj/effect/overlay/temp/lavastaff
icon_state = "lavastaff_warn"
duration = 50
duration = 50
code/modules/mining/lavaland/loot/hierophant_loot.dm
+2 -2
View File
@@ -5,7 +5,7 @@
item_state = "hierophant_staff"
icon = 'icons/obj/guns/magic.dmi'
slot_flags = SLOT_BACK
w_class = 4
w_class = WEIGHT_CLASS_BULKY
force = 20
hitsound = "swing_hit"
//hitsound = 'sound/weapons/sonic_jackhammer.ogg'
@@ -185,4 +185,4 @@
//playsound(T,'sound/effects/bin_close.ogg', 200, 1)
sleep(2)
for(var/t in RANGE_TURFS(1, T))
new /obj/effect/overlay/temp/hierophant/blast(t, user, friendly_fire_check)
new /obj/effect/overlay/temp/hierophant/blast(t, user, friendly_fire_check)
code/modules/mining/lavaland/loot/legion_loot.dm
+2 -2
View File
@@ -6,7 +6,7 @@
icon = 'icons/obj/guns/magic.dmi'
slot_flags = SLOT_BACK
item_state = "staffofstorms"
w_class = 4
w_class = WEIGHT_CLASS_BULKY
force = 25
damtype = BURN
hitsound = 'sound/weapons/sear.ogg'
@@ -49,4 +49,4 @@
"<span class='notice'>You hold [src] skyward, calling down a terrible storm!</span>")
playsound(user, 'sound/magic/Staff_Change.ogg', 200, 0)
A.telegraph()
storm_cooldown = world.time + 200
storm_cooldown = world.time + 200
code/modules/mining/lavaland/loot/tendril_loot.dm
+3 -3
View File
@@ -5,7 +5,7 @@
name = "paradox bag"
desc = "Somehow, it's in two places at once."
max_combined_w_class = 60
max_w_class = 3
max_w_class = WEIGHT_CLASS_NORMAL
//External
/obj/item/device/shared_storage
@@ -144,7 +144,7 @@
item_state = "rods"
desc = "Not to be confused with the kind Research hassles you for."
force = 12
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
burn_state = LAVA_PROOF | FIRE_PROOF
/datum/crafting_recipe/oar
@@ -391,4 +391,4 @@
if(!can_destroy && !force)
return QDEL_HINT_LETMELIVE
else
. = ..()
. = ..()
code/modules/mining/mine_items.dm
+6 -6
View File
@@ -79,7 +79,7 @@
force = 15.0
throwforce = 10.0
item_state = "pickaxe"
w_class = 4
w_class = WEIGHT_CLASS_BULKY
materials = list(MAT_METAL=2000) //one sheet, but where can you make them?
var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
origin_tech = "materials=1;engineering=1"
@@ -152,7 +152,7 @@
icon_state = "smdrill"
origin_tech = "materials=6;powerstorage=4;engineering=5;syndicate=3"
desc = "Microscopic supermatter crystals cover the head of this tiny drill."
w_class = 2
w_class = WEIGHT_CLASS_SMALL
/obj/item/weapon/pickaxe/drill/cyborg/diamond //This is the BORG version!
name = "diamond-tipped cyborg mining drill" //To inherit the NODROP flag, and easier to change borg specific drill mechanics.
@@ -184,7 +184,7 @@
force = 8.0
throwforce = 4.0
item_state = "shovel"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=50)
origin_tech = "materials=1;engineering=1"
attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
@@ -198,7 +198,7 @@
item_state = "spade"
force = 5.0
throwforce = 7.0
w_class = 2
w_class = WEIGHT_CLASS_SMALL
toolspeed = 2
@@ -219,7 +219,7 @@
desc = "It allows you to store and deploy lazarus-injected creatures easier."
icon = 'icons/obj/mobcap.dmi'
icon_state = "mobcap0"
w_class = 1
w_class = WEIGHT_CLASS_TINY
throw_range = 20
var/mob/living/simple_animal/captured = null
var/colorindex = 0
@@ -282,7 +282,7 @@
desc = "An emergency shelter stored within a pocket of bluespace."
icon_state = "capsule"
icon = 'icons/obj/mining.dmi'
w_class = 1
w_class = WEIGHT_CLASS_TINY
origin_tech = "engineering=3;bluespace=3"
var/template_id = "shelter_alpha"
var/datum/map_template/shelter/template
code/modules/mining/money_bag.dm
+2 -2
View File
@@ -9,7 +9,7 @@
throwforce = 0
burn_state = FLAMMABLE
burntime = 20
w_class = 4
w_class = WEIGHT_CLASS_BULKY
/obj/item/weapon/moneybag/attack_hand(user as mob)
var/amt_gold = 0
@@ -119,4 +119,4 @@
new /obj/item/weapon/coin/silver(src)
new /obj/item/weapon/coin/gold(src)
new /obj/item/weapon/coin/gold(src)
new /obj/item/weapon/coin/adamantine(src)
new /obj/item/weapon/coin/adamantine(src)
code/modules/mining/ore.dm
+1 -1
View File
@@ -153,7 +153,7 @@
icon = 'icons/obj/mining.dmi'
icon_state = "Gibtonite ore"
item_state = "Gibtonite ore"
w_class = 4
w_class = WEIGHT_CLASS_BULKY
throw_range = 0
anchored = 1 //Forces people to carry it by hand, no pulling!
var/primed = 0
code/modules/mob/living/carbon/alien/humanoid/inventory.dm
+3 -3
View File
@@ -22,7 +22,7 @@
if(slot_l_store)
if(l_store)
return
if(W.w_class > 3)
if(W.w_class > WEIGHT_CLASS_NORMAL)
return
unEquip(W)
l_store = W
@@ -30,7 +30,7 @@
if(slot_r_store)
if(r_store)
return
if(W.w_class > 3)
if(W.w_class > WEIGHT_CLASS_NORMAL)
return
unEquip(W)
r_store = W
@@ -44,4 +44,4 @@
if(slot_l_store)
if(l_store) l_store.attack_alien(src)
if(slot_r_store)
if(r_store) r_store.attack_alien(src)
if(r_store) r_store.attack_alien(src)
code/modules/mob/living/carbon/alien/special/facehugger.dm
+2 -2
View File
@@ -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 = WEIGHT_CLASS_TINY //note: can be picked up by aliens unlike most other items of w_class below 4
throw_range = 5
tint = 3
flags = AIRTIGHT
@@ -249,4 +249,4 @@ var/const/MAX_ACTIVE_TIME = 400
gender = FEMALE
/obj/item/clothing/mask/facehugger/lamarr/New()//to prevent deleting it if aliums are disabled
return
return
code/modules/mob/living/carbon/brain/MMI.dm
+1 -1
View File
@@ -5,7 +5,7 @@
desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity."
icon = 'icons/obj/assemblies.dmi'
icon_state = "mmi_empty"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "biotech=3"
//Revised. Brainmob is now contained directly within object of transfer. MMI in this case.
code/modules/mob/living/carbon/brain/brain_item.dm
+1 -1
View File
@@ -4,7 +4,7 @@
max_damage = 200
icon_state = "brain2"
force = 1.0
w_class = 2
w_class = WEIGHT_CLASS_SMALL
throwforce = 1.0
throw_speed = 3
throw_range = 5
code/modules/mob/living/carbon/brain/posibrain.dm
+2 -2
View File
@@ -3,7 +3,7 @@
desc = "A cube of shining metal, four inches to a side and covered in shallow grooves."
icon = 'icons/obj/assemblies.dmi'
icon_state = "posibrain"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "biotech=3;programming=2"
var/searching = 0
@@ -37,7 +37,7 @@
silenced = !silenced
to_chat(user, "<span class='notice'>You toggle the speaker [silenced ? "off" : "on"].</span>")
if(brainmob && brainmob.key)
to_chat(brainmob, "<span class='warning'>Your internal speaker has been toggled [silenced ? "off" : "on"].</span>")
to_chat(brainmob, "<span class='warning'>Your internal speaker has been toggled [silenced ? "off" : "on"].</span>")
/obj/item/device/mmi/posibrain/proc/request_player()
for(var/mob/dead/observer/O in player_list)
code/modules/mob/living/carbon/human/inventory.dm
+3 -3
View File
@@ -546,7 +546,7 @@
return 0
if(I.slot_flags & SLOT_DENYPOCKET)
return
if(I.w_class <= 2 || (I.slot_flags & SLOT_POCKET))
if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & SLOT_POCKET))
return 1
if(slot_r_store)
if(I.flags & NODROP)
@@ -559,7 +559,7 @@
return 0
if(I.slot_flags & SLOT_DENYPOCKET)
return 0
if(I.w_class <= 2 || (I.slot_flags & SLOT_POCKET))
if(I.w_class <= WEIGHT_CLASS_SMALL || (I.slot_flags & SLOT_POCKET))
return 1
return 0
if(slot_s_store)
@@ -575,7 +575,7 @@
if(!disable_warning)
to_chat(src, "You somehow have a suit with no defined allowed items for suit storage, stop that.")
return 0
if(I.w_class > 4)
if(I.w_class > WEIGHT_CLASS_BULKY)
if(!disable_warning)
to_chat(src, "The [name] is too big to attach.")
return 0
code/modules/mob/living/silicon/robot/component.dm
+1 -1
View File
@@ -171,7 +171,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 3
w_class = 2
w_class = WEIGHT_CLASS_SMALL
throw_speed = 5
throw_range = 10
origin_tech = "magnets=1;biotech=1"
code/modules/mob/living/silicon/robot/drone/drone.dm
+1 -1
View File
@@ -327,7 +327,7 @@
..()
else if(istype(AM,/obj/item))
var/obj/item/O = AM
if(O.w_class > 2)
if(O.w_class > WEIGHT_CLASS_SMALL)
to_chat(src, "<span class='warning'>You are too small to pull that.</span>")
return
else
code/modules/mob/living/simple_animal/bot/construction.dm
+5 -5
View File
@@ -10,7 +10,7 @@
throwforce = 5
throw_speed = 2
throw_range = 5
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
var/created_name = "Cleanbot"
/obj/item/weapon/bucket_sensor/attackby(obj/item/W, mob/user as mob, params)
@@ -204,7 +204,7 @@
throwforce = 10
throw_speed = 2
throw_range = 5
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
var/created_name = "Floorbot"
/obj/item/weapon/toolbox_tiles_sensor
@@ -216,7 +216,7 @@
throwforce = 10
throw_speed = 2
throw_range = 5
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
var/created_name = "Floorbot"
/obj/item/weapon/storage/toolbox/mechanical/attackby(obj/item/stack/tile/plasteel/T, mob/user, params)
@@ -286,7 +286,7 @@
var/build_step = 0
var/created_name = "Medibot" //To preserve the name if it's a unique medbot I guess
var/skin = null //Same as medbot, set to tox or ointment for the respective kits.
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
var/treatment_brute = "salglu_solution"
var/treatment_oxy = "salbutamol"
var/treatment_fire = "salglu_solution"
@@ -478,4 +478,4 @@
overlays -= "hs_arm"
new /obj/item/robot_parts/l_arm(get_turf(src))
to_chat(user, "<span class='notice'>You remove the robot arm from [src].</span>")
build_step--
build_step--
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+1 -1
View File
@@ -260,7 +260,7 @@
var/list/items = list()
for(var/obj/item/I in view(1,src))
if(I.loc != src && I.w_class <= 2)
if(I.loc != src && I.w_class <= WEIGHT_CLASS_SMALL)
items.Add(I)
var/obj/selection = input("Select an item.", "Pickup") in items
code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+1 -1
View File
@@ -222,7 +222,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "goliath_hide"
flags = NOBLUDGEON
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
layer = 4
/obj/item/asteroid/goliath_hide/afterattack(atom/target, mob/user, proximity_flag)
code/modules/mob/living/simple_animal/parrot.dm
+7 -7
View File
@@ -515,12 +515,12 @@
if(istype(AM, /obj/item))
var/obj/item/I = AM
if(I.w_class < 2)
if(I.w_class < WEIGHT_CLASS_SMALL)
return I
if(iscarbon(AM))
var/mob/living/carbon/C = AM
if((C.l_hand && C.l_hand.w_class <= 2) || (C.r_hand && C.r_hand.w_class <= 2))
if((C.l_hand && C.l_hand.w_class <= WEIGHT_CLASS_SMALL) || (C.r_hand && C.r_hand.w_class <= WEIGHT_CLASS_SMALL))
return C
return null
@@ -544,12 +544,12 @@
if(istype(AM, /obj/item))
var/obj/item/I = AM
if(I.w_class <= 2)
if(I.w_class <= WEIGHT_CLASS_SMALL)
return I
if(iscarbon(AM))
var/mob/living/carbon/C = AM
if(C.l_hand && C.l_hand.w_class <= 2 || C.r_hand && C.r_hand.w_class <= 2)
if(C.l_hand && C.l_hand.w_class <= WEIGHT_CLASS_SMALL || C.r_hand && C.r_hand.w_class <= WEIGHT_CLASS_SMALL)
return C
return null
@@ -571,7 +571,7 @@
for(var/obj/item/I in view(1,src))
//Make sure we're not already holding it and it's small enough
if(I.loc != src && I.w_class <= 2)
if(I.loc != src && I.w_class <= WEIGHT_CLASS_SMALL)
//If we have a perch and the item is sitting on it, continue
if(!client && parrot_perch && I.loc == parrot_perch.loc)
@@ -600,10 +600,10 @@
var/obj/item/stolen_item = null
for(var/mob/living/carbon/C in view(1,src))
if(C.l_hand && C.l_hand.w_class <= 2)
if(C.l_hand && C.l_hand.w_class <= WEIGHT_CLASS_SMALL)
stolen_item = C.l_hand
if(C.r_hand && C.r_hand.w_class <= 2)
if(C.r_hand && C.r_hand.w_class <= WEIGHT_CLASS_SMALL)
stolen_item = C.r_hand
if(stolen_item)
code/modules/mob/mob.dm
+3 -3
View File
@@ -424,7 +424,7 @@ var/list/slot_equipment_priority = list( \
return 0
if(slot_flags & SLOT_DENYPOCKET)
return
if( w_class <= 2 || (slot_flags & SLOT_POCKET) )
if( w_class <= WEIGHT_CLASS_SMALL || (slot_flags & SLOT_POCKET) )
return 1
if(slot_r_store)
if(H.r_store)
@@ -435,7 +435,7 @@ var/list/slot_equipment_priority = list( \
return 0
if(slot_flags & SLOT_DENYPOCKET)
return 0
if( w_class <= 2 || (slot_flags & SLOT_POCKET) )
if( w_class <= WEIGHT_CLASS_SMALL || (slot_flags & SLOT_POCKET) )
return 1
return 0
if(slot_s_store)
@@ -447,7 +447,7 @@ var/list/slot_equipment_priority = list( \
if(!disable_warning)
to_chat(usr, "You somehow have a suit with no defined allowed items for suit storage, stop that.")
return 0
if(src.w_class > 4)
if(src.w_class > WEIGHT_CLASS_BULKY)
if(!disable_warning)
to_chat(usr, "The [name] is too big to attach.")
return 0
code/modules/mob/mob_grab.dm
+1 -1
View File
@@ -26,7 +26,7 @@
plane = HUD_PLANE
item_state = "nothing"
icon = 'icons/mob/screen_gen.dmi'
w_class = 5
w_class = WEIGHT_CLASS_BULKY
/obj/item/weapon/grab/New(var/mob/user, var/mob/victim)
code/modules/paperwork/clipboard.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "clipboard"
item_state = "clipboard"
throwforce = 0
w_class = 2
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 10
var/obj/item/weapon/pen/haspen //The stored pen.
code/modules/paperwork/folders.dm
+1 -2
View File
@@ -3,7 +3,7 @@
desc = "A folder."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "folder"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
pressure_resistance = 2
burn_state = FLAMMABLE
@@ -121,4 +121,3 @@
..()
new /obj/item/documents/syndicate/blue(src)
update_icon()
code/modules/paperwork/paper.dm
+1 -1
View File
@@ -10,7 +10,7 @@
icon_state = "paper"
item_state = "paper"
throwforce = 0
w_class = 1
w_class = WEIGHT_CLASS_TINY
throw_range = 1
throw_speed = 1
layer = 4
code/modules/paperwork/paper_bundle.dm
+2 -2
View File
@@ -5,7 +5,7 @@
icon_state = "paper"
item_state = "paper"
throwforce = 0
w_class = 1
w_class = WEIGHT_CLASS_TINY
throw_range = 2
throw_speed = 1
layer = 4
@@ -241,4 +241,4 @@
if(photo)
desc += "\nThere is a photo attached to it."
overlays += image('icons/obj/bureaucracy.dmi', "clip")
return
return
code/modules/paperwork/paperbin.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon_state = "paper_bin1"
item_state = "sheet-metal"
throwforce = 1
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
throw_speed = 3
throw_range = 7
pressure_resistance = 8
code/modules/paperwork/pen.dm
+3 -3
View File
@@ -17,7 +17,7 @@
item_state = "pen"
slot_flags = SLOT_BELT | SLOT_EARS
throwforce = 0
w_class = 1
w_class = WEIGHT_CLASS_TINY
throw_speed = 3
throw_range = 7
materials = list(MAT_METAL=10)
@@ -167,7 +167,7 @@
force = 18
sharp = 1
edge = 1
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
name = "energy dagger"
hitsound = 'sound/weapons/blade1.ogg'
throwforce = 35
@@ -200,4 +200,4 @@
add_logs(user, P, "used poison pen on")
to_chat(user, "<span class='warning'>You apply the poison to [P].</span>")
else
to_chat(user, "<span class='warning'>[src] clicks. It seems to be depleted.</span>")
to_chat(user, "<span class='warning'>[src] clicks. It seems to be depleted.</span>")
code/modules/paperwork/photography.dm
+4 -4
View File
@@ -15,7 +15,7 @@
desc = "A camera film cartridge. Insert it into a camera to reload it."
icon_state = "film"
item_state = "electropack"
w_class = 1
w_class = WEIGHT_CLASS_TINY
burn_state = FLAMMABLE
@@ -27,7 +27,7 @@
icon = 'icons/obj/items.dmi'
icon_state = "photo"
item_state = "paper"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
burn_state = FLAMMABLE
burntime = 5
var/blueprints = 0 // Does this have the blueprints?
@@ -146,7 +146,7 @@
desc = "A polaroid camera. 10 photos left."
icon_state = "camera"
item_state = "electropack"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
var/list/matter = list("metal" = 2000)
var/pictures_max = 10
@@ -508,7 +508,7 @@ var/list/SpookyGhosts = list("ghost","shade","shade2","ghost-narsie","horror","s
desc = "video camera that can send live feed to the entertainment network."
icon_state = "videocam"
item_state = "videocam"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
materials = list(MAT_METAL=2000)
var/on = 0
code/modules/paperwork/stamps.dm
+2 -2
View File
@@ -5,7 +5,7 @@
icon_state = "stamp-ok"
item_state = "stamp"
throwforce = 0
w_class = 1
w_class = WEIGHT_CLASS_TINY
throw_speed = 3
throw_range = 7
materials = list(MAT_METAL=60)
@@ -105,4 +105,4 @@
if(chosen_stamp)
name = chosen_stamp.name
icon_state = chosen_stamp.icon_state
item_color = chosen_stamp.item_color
item_color = chosen_stamp.item_color
code/modules/pda/PDA.dm
+1 -1
View File
@@ -10,7 +10,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
icon = 'icons/obj/pda.dmi'
icon_state = "pda"
item_state = "electronic"
w_class = 1
w_class = WEIGHT_CLASS_TINY
slot_flags = SLOT_ID | SLOT_BELT | SLOT_PDA
//Main variables
code/modules/pda/cart.dm
+2 -2
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/pda.dmi'
icon_state = "cart"
item_state = "electronic"
w_class = 1
w_class = WEIGHT_CLASS_TINY
var/obj/item/radio/integrated/radio = null
@@ -322,4 +322,4 @@
my_game.hacked = 1
to_chat(user, "<span class='warning'>TR4P_M45T3R.mod successfully initialized. ToS violated. User Agreement nullified. Gotta pwn them all.</span>")
to_chat(user, "<span class='warning'>You can now create trapped versions of any mob in your collection that will damage hunters who attempt to capture it.</span>")
description_antag = "This copy of Nano-Mob Hunter GO! has been hacked to allow the creation of trap mobs which will cause any PDA that attempts to capture it to shock anyone holding it. Hacked copies of the game will not trigger the trap."
description_antag = "This copy of Nano-Mob Hunter GO! has been hacked to allow the creation of trap mobs which will cause any PDA that attempts to capture it to shock anyone holding it. Hacked copies of the game will not trigger the trap."
code/modules/power/apc.dm
+2 -2
View File
@@ -122,7 +122,7 @@
desc = "Heavy-duty switching circuits for power control."
icon = 'icons/obj/module.dmi'
icon_state = "power_mod"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
item_state = "electronic"
flags = CONDUCT
usesound = 'sound/items/Deconstruct.ogg'
@@ -621,7 +621,7 @@
if(((stat & BROKEN) || malfhack) \
&& !opened \
&& ( \
(W.force >= 5 && W.w_class >= 3.0) \
(W.force >= 5 && W.w_class >= WEIGHT_CLASS_NORMAL) \
|| istype(W,/obj/item/weapon/crowbar) \
) \
&& prob(20) )
code/modules/power/cable.dm
+3 -3
View File
@@ -485,7 +485,7 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
color = COLOR_RED
desc = "A coil of power cable."
throwforce = 10
w_class = 2
w_class = WEIGHT_CLASS_SMALL
throw_speed = 2
throw_range = 5
materials = list(MAT_METAL=10, MAT_GLASS=5)
@@ -568,9 +568,9 @@ var/global/list/datum/stack_recipe/cable_coil_recipes = list(
/obj/item/stack/cable_coil/proc/update_wclass()
if(amount == 1)
w_class = 1
w_class = WEIGHT_CLASS_TINY
else
w_class = 2
w_class = WEIGHT_CLASS_SMALL
/obj/item/stack/cable_coil/examine(mob/user)
if(!..(user, 1))
code/modules/power/lighting.dm
+2 -2
View File
@@ -592,7 +592,7 @@
icon = 'icons/obj/lighting.dmi'
force = 2
throwforce = 5
w_class = 1
w_class = WEIGHT_CLASS_TINY
var/status = 0 // LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN
var/base_state
var/switchcount = 0 // number of times switched
@@ -612,7 +612,7 @@
brightness_range = 8
/obj/item/weapon/light/tube/large
w_class = 2
w_class = WEIGHT_CLASS_SMALL
name = "large light tube"
brightness_range = 15
brightness_power = 2
code/modules/power/solar.dm
+1 -1
View File
@@ -204,7 +204,7 @@
icon = 'icons/obj/power.dmi'
icon_state = "sp_base"
item_state = "electropack"
w_class = 4 // Pretty big!
w_class = WEIGHT_CLASS_BULKY // Pretty big!
anchored = 0
var/tracker = 0
var/glass_type = null
code/modules/power/supermatter/sm_shard.dm
+2 -2
View File
@@ -7,7 +7,7 @@
icon_state = "supermatter"
sharp = 1
edge = 1
w_class = 2
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
light_color = "#8A8A00"
var/brightness = 2
@@ -85,7 +85,7 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "tongs"
edge = 1
w_class = 2
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
var/obj/item/held = null // The item currently being held
code/modules/power/tracker.dm
+1 -1
View File
@@ -81,4 +81,4 @@
name = "tracker electronics"
icon = 'icons/obj/doors/door_assembly.dmi'
icon_state = "door_electronics"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
code/modules/projectiles/ammunition.dm
+3 -3
View File
@@ -6,7 +6,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
throwforce = 1
w_class = 1
w_class = WEIGHT_CLASS_TINY
var/fire_sound = null //What sound should play when this ammo is fired
var/caliber = null //Which kind of guns it can be loaded into
var/projectile_type = null //The bullet type to create when New() is called
@@ -87,7 +87,7 @@
item_state = "syringe_kit"
materials = list(MAT_METAL=30000)
throwforce = 2
w_class = 1
w_class = WEIGHT_CLASS_TINY
throw_speed = 4
throw_range = 10
var/list/stored_ammo = list()
@@ -192,4 +192,4 @@
var/turf_mag = get_turf(src)
for(var/obj/item/ammo in stored_ammo)
ammo.forceMove(turf_mag)
stored_ammo -= ammo
stored_ammo -= ammo
code/modules/projectiles/gun.dm
+1 -1
View File
@@ -7,7 +7,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
materials = list(MAT_METAL=2000)
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
throwforce = 5
throw_speed = 3
throw_range = 5
code/modules/projectiles/guns/alien.dm
+2 -2
View File
@@ -3,7 +3,7 @@
desc = "A vicious alien projectile weapon. Parts of it quiver gelatinously, as though the thing is insectile and alive."
icon_state = "spikethrower"
item_state = "spikethrower"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
fire_sound_text = "a strange noise"
mag_type = /obj/item/ammo_box/magazine/internal/spikethrower
burst_size = 2
@@ -52,7 +52,7 @@
sharp = 1
edge = 0
throwforce = 5
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
caliber = "spike"
icon_state = "bolt"
fire_sound = 'sound/weapons/bladeslice.ogg'
code/modules/projectiles/guns/energy/laser.dm
+2 -2
View File
@@ -3,7 +3,7 @@
desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal."
icon_state = "laser"
item_state = "laser"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=2000)
origin_tech = "combat=3;magnets=2"
ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
@@ -66,7 +66,7 @@
desc = "An advanced laser cannon that does more damage the farther away the target is."
icon_state = "lasercannon"
item_state = "laser"
w_class = 4
w_class = WEIGHT_CLASS_BULKY
force = 10
flags = CONDUCT
slot_flags = SLOT_BACK
code/modules/projectiles/guns/energy/nuclear.dm
+2 -2
View File
@@ -31,7 +31,7 @@
desc = "A small, pistol-sized energy gun with a built-in flashlight. It has two settings: stun and kill."
icon_state = "mini"
item_state = "gun"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
ammo_x_offset = 2
charge_sections = 3
can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
@@ -71,7 +71,7 @@
icon_state = "turretlaser"
item_state = "turretlaser"
slot_flags = null
w_class = 5
w_class = WEIGHT_CLASS_HUGE
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
weapon_weight = WEAPON_MEDIUM
can_flashlight = 0
code/modules/projectiles/guns/energy/pulse.dm
+5 -5
View File
@@ -3,7 +3,7 @@
desc = "A heavy-duty, multifaceted energy rifle with three modes. Preferred by front-line combat personnel."
icon_state = "pulse"
item_state = null
w_class = 4
w_class = WEIGHT_CLASS_BULKY
force = 10
flags = CONDUCT
slot_flags = SLOT_BACK
@@ -25,7 +25,7 @@
/obj/item/weapon/gun/energy/pulse/carbine
name = "pulse carbine"
desc = "A compact variant of the pulse rifle with less firepower but easier storage."
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
slot_flags = SLOT_BELT
icon_state = "pulse_carbine"
item_state = "pulse"
@@ -37,7 +37,7 @@
/obj/item/weapon/gun/energy/pulse/pistol
name = "pulse pistol"
desc = "A pulse rifle in an easily concealed handgun package with low capacity."
w_class = 2
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
icon_state = "pulse_pistol"
item_state = "gun"
@@ -77,9 +77,9 @@
icon_state = "turretlaser"
item_state = "turretlaser"
slot_flags = null
w_class = 5
w_class = WEIGHT_CLASS_HUGE
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser/pulse)
weapon_weight = WEAPON_MEDIUM
can_flashlight = 0
trigger_guard = TRIGGER_GUARD_NONE
ammo_x_offset = 2
ammo_x_offset = 2
code/modules/projectiles/guns/energy/special.dm
+9 -9
View File
@@ -5,7 +5,7 @@
item_state = null //so the human update icon uses the icon_state instead.
fire_sound = 'sound/weapons/IonRifle.ogg'
origin_tech = "combat=2;magnets=4"
w_class = 5
w_class = WEIGHT_CLASS_HUGE
flags = CONDUCT
slot_flags = SLOT_BACK
ammo_type = list(/obj/item/ammo_casing/energy/ion)
@@ -21,7 +21,7 @@
desc = "The MK.II Prototype Ion Projector is a lightweight carbine version of the larger ion rifle, built to be ergonomic and efficient."
icon_state = "ioncarbine"
origin_tech = "combat=4;magnets=4;materials=4"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
slot_flags = SLOT_BELT
ammo_x_offset = 2
flight_x_offset = 18
@@ -60,7 +60,7 @@
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "riotgun"
item_state = "c20r"
w_class = 4
w_class = WEIGHT_CLASS_BULKY
ammo_type = list(/obj/item/ammo_casing/energy/meteor)
cell_type = /obj/item/weapon/stock_parts/cell/potato
clumsy_check = 0 //Admin spawn only, might as well let clowns use it.
@@ -74,7 +74,7 @@
item_state = "pen"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
w_class = 1
w_class = WEIGHT_CLASS_TINY
/obj/item/weapon/gun/energy/mindflayer
name = "\improper Mind Flayer"
@@ -89,7 +89,7 @@
desc = "A weapon favored by syndicate stealth specialists."
icon_state = "crossbow"
item_state = "crossbow"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL=2000)
origin_tech = "combat=2;magnets=2;syndicate=5"
suppressed = 1
@@ -111,7 +111,7 @@
name = "energy crossbow"
desc = "A reverse engineered weapon using syndicate technology."
icon_state = "crossbowlarge"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=4000)
origin_tech = "combat=2;magnets=2;syndicate=3" //can be further researched for more syndie tech
suppressed = 0
@@ -280,7 +280,7 @@
desc = "A specialized firearm designed to fire lethal bolts of toxins."
icon_state = "toxgun"
fire_sound = 'sound/effects/stealthoff.ogg'
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=4;plasmatech=3"
ammo_type = list(/obj/item/ammo_casing/energy/toxplasma)
shaded_charge = 1
@@ -292,7 +292,7 @@
origin_tech = "combat=6;materials=5;powerstorage=4"
ammo_type = list(/obj/item/ammo_casing/energy/sniper)
slot_flags = SLOT_BACK
w_class = 4
w_class = WEIGHT_CLASS_BULKY
zoomable = TRUE
zoom_amt = 7 //Long range, enough to see in front of you, but no tiles behind you.
shaded_charge = 1
@@ -303,7 +303,7 @@
icon_state = "tempgun_4"
item_state = "tempgun_4"
slot_flags = SLOT_BACK
w_class = 4
w_class = WEIGHT_CLASS_BULKY
fire_sound = 'sound/weapons/pulse3.ogg'
desc = "A gun that changes the body temperature of its targets."
var/temperature = 300
code/modules/projectiles/guns/grenade_launcher.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "riotgun"
item_state = "riotgun"
w_class = 4
w_class = WEIGHT_CLASS_BULKY
throw_speed = 2
throw_range = 10
force = 5
code/modules/projectiles/guns/magic.dm
+1 -1
View File
@@ -7,7 +7,7 @@
fire_sound = 'sound/weapons/emitter.ogg'
fire_sound_text = "energy blast"
flags = CONDUCT
w_class = 5
w_class = WEIGHT_CLASS_HUGE
var/max_charges = 6
var/charges = 0
var/recharge_rate = 4
code/modules/projectiles/guns/magic/wand.dm
+1 -1
View File
@@ -4,7 +4,7 @@
ammo_type = /obj/item/ammo_casing/magic
icon_state = "nothingwand"
item_state = "wand"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
can_charge = 0
max_charges = 100 //100, 50, 50, 34 (max charge distribution by 25%ths)
var/variable_charges = 1
code/modules/projectiles/guns/medbeam.dm
+1 -1
View File
@@ -4,7 +4,7 @@
icon = 'icons/obj/chronos.dmi'
icon_state = "chronogun"
item_state = "chronogun"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
var/mob/living/current_target
var/last_check = 0
code/modules/projectiles/guns/mounted.dm
+2 -2
View File
@@ -4,7 +4,7 @@
icon_state = "armcannon"
force = 5
flags = NODROP
w_class = 5
w_class = WEIGHT_CLASS_HUGE
can_flashlight = 0
selfcharge = 1
trigger_guard = TRIGGER_GUARD_ALLOW_ALL // Has no trigger at all, uses neural signals instead
@@ -20,7 +20,7 @@
item_state = "armcannonlase"
force = 5
flags = NODROP
w_class = 5
w_class = WEIGHT_CLASS_HUGE
materials = null
selfcharge = 1
trigger_guard = TRIGGER_GUARD_ALLOW_ALL
code/modules/projectiles/guns/projectile.dm
+4 -4
View File
@@ -3,7 +3,7 @@
name = "projectile gun"
icon_state = "pistol"
origin_tech = "combat=2;materials=2"
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=1000)
var/mag_type = /obj/item/ammo_box/magazine/m10mm //Removes the need for max_ammo and caliber info
@@ -77,7 +77,7 @@
S.oldsound = fire_sound
S.initial_w_class = w_class
fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
w_class = 3 //so pistols do not fit in pockets when suppressed
w_class = WEIGHT_CLASS_NORMAL //so pistols do not fit in pockets when suppressed
A.loc = src
update_icon()
return
@@ -169,7 +169,7 @@
user.visible_message("[user] shortens \the [src]!", "<span class='notice'>You shorten \the [src].</span>")
name = "sawn-off [name]"
desc = sawn_desc
w_class = 3
w_class = WEIGHT_CLASS_NORMAL
item_state = "gun"//phil235 is it different with different skin?
slot_flags &= ~SLOT_BACK //you can't sling it on your back
slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
@@ -191,7 +191,7 @@
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "suppressor"
item_state = "suppressor"
w_class = 2
w_class = WEIGHT_CLASS_SMALL
var/oldsound = null
var/initial_w_class = null

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