Converts /modules/ to using WEIGHT_CLASS_x

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
+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>")
+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
+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
@@ -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
@@ -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)
@@ -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
@@ -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
. = ..()
. = ..()
+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
+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)
+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