mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-14 01:18:40 +01:00
makes w_class use defines (#9848)
This commit is contained in:
@@ -20,7 +20,7 @@ LINEN BINS
|
||||
throwforce = 1
|
||||
throw_speed = 1
|
||||
throw_range = 2
|
||||
w_class = 4.0
|
||||
w_class = ITEMSIZE_LARGE
|
||||
drop_sound = 'sound/items/drop/cloth.ogg'
|
||||
pickup_sound = 'sound/items/pickup/cloth.ogg'
|
||||
randpixel = 0
|
||||
@@ -124,12 +124,12 @@ LINEN BINS
|
||||
if(!fold)
|
||||
fold = TRUE
|
||||
slot_flags = null
|
||||
w_class = 2.0
|
||||
w_class = ITEMSIZE_SMALL
|
||||
layer = initial(layer)
|
||||
else
|
||||
fold = FALSE
|
||||
slot_flags = SLOT_BACK
|
||||
w_class = 4.0
|
||||
w_class = ITEMSIZE_LARGE
|
||||
update_icon()
|
||||
inuse = FALSE
|
||||
return TRUE
|
||||
@@ -153,19 +153,19 @@ LINEN BINS
|
||||
user.do_attack_animation(src)
|
||||
playsound(get_turf(loc), /decl/sound_category/rustle_sound, 15, 1, -5)
|
||||
var/rolls = roll
|
||||
user.visible_message(SPAN_NOTICE("\The [user] [rolls ? "unrolls" : "rolls"] \the [src]."),
|
||||
user.visible_message(SPAN_NOTICE("\The [user] [rolls ? "unrolls" : "rolls"] \the [src]."),
|
||||
SPAN_NOTICE("You [roll ? "unroll" : "roll"] \the [src]."))
|
||||
if(!roll)
|
||||
roll = TRUE
|
||||
slot_flags = null
|
||||
w_class = 3.0
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
layer = initial(layer)
|
||||
if(user.resting && get_turf(src) == get_turf(user)) // Make them rest
|
||||
user.lay_down()
|
||||
else
|
||||
roll = FALSE
|
||||
slot_flags = SLOT_BACK
|
||||
w_class = 4.0
|
||||
w_class = ITEMSIZE_LARGE
|
||||
if(layer == initial(layer))
|
||||
layer = ABOVE_MOB_LAYER
|
||||
if(!user.resting && get_turf(src) == get_turf(user)) // Make them get up
|
||||
@@ -178,7 +178,7 @@ LINEN BINS
|
||||
|
||||
/obj/item/bedsheet/attackby(obj/item/I, mob/user)
|
||||
if(I.isscrewdriver())
|
||||
user.visible_message(SPAN_NOTICE("\The [user] begins poking eyeholes in \the [src] with \the [I]."),
|
||||
user.visible_message(SPAN_NOTICE("\The [user] begins poking eyeholes in \the [src] with \the [I]."),
|
||||
SPAN_NOTICE("You begin poking eyeholes in \the [src] with \the [I]."))
|
||||
if(do_after(user, 50/I.toolspeed))
|
||||
to_chat(user, SPAN_NOTICE("You poke eyeholes in \the [src]!"))
|
||||
@@ -186,7 +186,7 @@ LINEN BINS
|
||||
qdel(src)
|
||||
return
|
||||
else if(is_sharp(I))
|
||||
user.visible_message(SPAN_NOTICE("\The [user] begins cutting up [src] with [I]."),
|
||||
user.visible_message(SPAN_NOTICE("\The [user] begins cutting up [src] with [I]."),
|
||||
SPAN_NOTICE("You begin cutting up [src] with [I]."))
|
||||
if(do_after(user, 50/I.toolspeed))
|
||||
to_chat(user, SPAN_NOTICE("You cut [src] into pieces!"))
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
icon = 'icons/obj/closet.dmi'
|
||||
icon_state = "closed"
|
||||
density = 1
|
||||
w_class = 5
|
||||
w_class = ITEMSIZE_HUGE
|
||||
layer = OBJ_LAYER - 0.01
|
||||
build_amt = 2
|
||||
var/icon_closed = "closed"
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
icon_state = "door_as_0"
|
||||
anchored = 0
|
||||
density = 1
|
||||
w_class = 5
|
||||
w_class = ITEMSIZE_HUGE
|
||||
build_amt = 4
|
||||
var/state = 0
|
||||
var/base_icon_state = ""
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
anchored = 1
|
||||
density = 1
|
||||
layer = ABOVE_CABLE_LAYER
|
||||
w_class = 5
|
||||
w_class = ITEMSIZE_HUGE
|
||||
var/state = 0
|
||||
var/health = 200
|
||||
var/cover = 50 //how much cover the girder provides against projectiles.
|
||||
|
||||
@@ -262,7 +262,7 @@
|
||||
desc = "Contains inflatable walls and doors."
|
||||
icon_state = "inf_box"
|
||||
item_state = "box"
|
||||
w_class = 3
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
max_storage_space = 28
|
||||
can_hold = list(/obj/item/inflatable)
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
icon = 'icons/obj/janitor.dmi'
|
||||
icon_state = "mopbucket"
|
||||
density = 1
|
||||
w_class = 3
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
flags = OPENCONTAINER
|
||||
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
|
||||
var/bucketsize = 360 //about 3x the size relative to a regular bucket.
|
||||
@@ -44,4 +44,4 @@
|
||||
var/obj/structure/janitorialcart/cart = loc
|
||||
cart.update_icon()
|
||||
else
|
||||
update_icon()
|
||||
update_icon()
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
icon_state = "minimoog"
|
||||
anchored = 1
|
||||
density = 1
|
||||
w_class = 5
|
||||
w_class = ITEMSIZE_HUGE
|
||||
var/datum/song/song
|
||||
var/playing = 0
|
||||
var/help = 0
|
||||
|
||||
@@ -75,4 +75,4 @@
|
||||
desc = "An archaic key, probably not used to open any airlock on station."
|
||||
icon = 'icons/obj/xenoarchaeology.dmi'
|
||||
icon_state = "unknown1"
|
||||
w_class = 2
|
||||
w_class = ITEMSIZE_SMALL
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
opacity = 0
|
||||
density = 0
|
||||
layer = 3.5
|
||||
w_class = 3
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
|
||||
/obj/structure/sign/ex_act(severity)
|
||||
switch(severity)
|
||||
@@ -40,7 +40,7 @@
|
||||
name = "sign"
|
||||
desc = ""
|
||||
icon = 'icons/obj/decals.dmi'
|
||||
w_class = 5 //big
|
||||
w_class = ITEMSIZE_HUGE //big
|
||||
var/sign_state = ""
|
||||
|
||||
/obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob) //construction
|
||||
|
||||
@@ -359,7 +359,7 @@
|
||||
pickup_sound = 'sound/items/pickup/axe.ogg'
|
||||
center_of_mass = list("x" = 17,"y" = 7)
|
||||
var/bedpath = /obj/structure/bed/roller
|
||||
w_class = 4.0 // Can't be put in backpacks. Oh well.
|
||||
w_class = ITEMSIZE_LARGE // Can't be put in backpacks. Oh well.
|
||||
|
||||
/obj/item/roller/hover
|
||||
name = "medical hoverbed"
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
center_of_mass = null
|
||||
force = 10
|
||||
throwforce = 10
|
||||
w_class = 5
|
||||
w_class = ITEMSIZE_HUGE
|
||||
item_state_slots = list(
|
||||
slot_l_hand_str = "stool",
|
||||
slot_r_hand_str = "stool"
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
icon_state = "dispenser"
|
||||
density = 1
|
||||
anchored = 1.0
|
||||
w_class = 5
|
||||
w_class = ITEMSIZE_HUGE
|
||||
var/oxygentanks = 10
|
||||
var/phorontanks = 10
|
||||
var/list/oxytanks = list() //sorry for the similar var names
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
icon = 'icons/obj/target_stake.dmi'
|
||||
icon_state = "target_stake"
|
||||
density = 1
|
||||
w_class = 5
|
||||
w_class = ITEMSIZE_HUGE
|
||||
flags = CONDUCT
|
||||
var/obj/item/target/pinned_target // the current pinned target
|
||||
|
||||
|
||||
@@ -81,7 +81,7 @@
|
||||
drop_sound = 'sound/items/drop/accessory.ogg'
|
||||
pickup_sound = 'sound/items/pickup/accessory.ogg'
|
||||
matter = list(MATERIAL_GLASS = 150, MATERIAL_GOLD = 50)
|
||||
w_class = 1
|
||||
w_class = ITEMSIZE_TINY
|
||||
var/closed = FALSE
|
||||
|
||||
/obj/item/pocketwatch/AltClick(mob/user)
|
||||
@@ -128,7 +128,7 @@
|
||||
drop_sound = 'sound/items/drop/accessory.ogg'
|
||||
pickup_sound = 'sound/items/pickup/accessory.ogg'
|
||||
matter = list(MATERIAL_GLASS = 150, MATERIAL_GOLD = 50)
|
||||
w_class = 1
|
||||
w_class = ITEMSIZE_TINY
|
||||
var/datum/weakref/thrall = null
|
||||
var/time_counter = 0
|
||||
var/closed = FALSE
|
||||
|
||||
@@ -17,7 +17,7 @@ obj/structure/windoor_assembly
|
||||
anchored = 0
|
||||
density = 0
|
||||
dir = NORTH
|
||||
w_class = 3
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
flags = ON_BORDER
|
||||
|
||||
var/obj/item/airlock_electronics/electronics = null
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
desc = "A window."
|
||||
icon = 'icons/obj/structures.dmi'
|
||||
density = 1
|
||||
w_class = 3
|
||||
w_class = ITEMSIZE_NORMAL
|
||||
layer = 3.2//Just above doors
|
||||
anchored = 1.0
|
||||
flags = ON_BORDER
|
||||
|
||||
Reference in New Issue
Block a user