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