makes w_class use defines (#9848)

This commit is contained in:
Wowzewow (Wezzy)
2020-09-07 04:37:56 +08:00
committed by GitHub
parent d90e7f199b
commit 307c214541
304 changed files with 807 additions and 765 deletions
+20 -20
View File
@@ -350,7 +350,7 @@ var/list/holder_mob_icon_cache = list()
icon_state_dead = "nymph_dead"
origin_tech = list(TECH_MAGNET = 3, TECH_BIO = 5)
slot_flags = SLOT_HEAD | SLOT_EARS | SLOT_HOLSTER
w_class = 2
w_class = ITEMSIZE_SMALL
/obj/item/holder/drone
name = "maintenance drone"
@@ -359,14 +359,14 @@ var/list/holder_mob_icon_cache = list()
item_state = "drone"
origin_tech = list(TECH_MAGNET = 3, TECH_ENGINEERING = 5)
slot_flags = SLOT_HEAD
w_class = 4
w_class = ITEMSIZE_LARGE
/obj/item/holder/drone/heavy
name = "construction drone"
desc = "It's a really big maintenance robot."
icon_state = "constructiondrone"
item_state = "constructiondrone"
w_class = 6//You're not fitting this thing in a backpack
w_class = ITEMSIZE_IMMENSE //You're not fitting this thing in a backpack
/obj/item/holder/drone/mining
name = "mining drone"
@@ -385,7 +385,7 @@ var/list/holder_mob_icon_cache = list()
//Setting item state to cat saves on some duplication for the in-hand versions, but we cant use it for head.
//Instead, the head versions are done by duplicating the cat
slot_flags = SLOT_HEAD
w_class = 3
w_class = ITEMSIZE_NORMAL
/obj/item/holder/cat/black
icon_state = "cat"
@@ -403,7 +403,7 @@ var/list/holder_mob_icon_cache = list()
icon_state = "kitten"
icon_state_dead = "cat_kitten_dead"
slot_flags = SLOT_HEAD
w_class = 1
w_class = ITEMSIZE_TINY
item_state = "kitten"
/obj/item/holder/cat/penny
@@ -412,7 +412,7 @@ var/list/holder_mob_icon_cache = list()
icon_state = "penny"
icon_state_dead = "penny_dead"
slot_flags = SLOT_HEAD
w_class = 1
w_class = ITEMSIZE_TINY
item_state = "penny"
/obj/item/holder/carp/baby
@@ -423,7 +423,7 @@ var/list/holder_mob_icon_cache = list()
item_state = "babycarp"
slot_flags = SLOT_HEAD
flags_inv = HIDEEARS
w_class = 1
w_class = ITEMSIZE_TINY
/obj/item/holder/carp/baby/verb/toggle_block_hair()
set name = "Toggle Hair Coverage"
@@ -437,7 +437,7 @@ var/list/holder_mob_icon_cache = list()
desc = "It's a slimy brain slug. Gross."
icon_state = "brainslug"
origin_tech = list(TECH_BIO = 6)
w_class = 1
w_class = ITEMSIZE_TINY
/obj/item/holder/monkey
name = "monkey"
@@ -445,7 +445,7 @@ var/list/holder_mob_icon_cache = list()
icon_state = "monkey"
item_state = "monkey"
slot_flags = SLOT_HEAD
w_class = 3
w_class = ITEMSIZE_NORMAL
/obj/item/holder/monkey/farwa
name = "farwa"
@@ -453,7 +453,7 @@ var/list/holder_mob_icon_cache = list()
icon_state = "farwa"
item_state = "farwa"
slot_flags = SLOT_HEAD
w_class = 3
w_class = ITEMSIZE_NORMAL
/obj/item/holder/monkey/stok
name = "stok"
@@ -461,7 +461,7 @@ var/list/holder_mob_icon_cache = list()
icon_state = "stok"
item_state = "stok"
slot_flags = SLOT_HEAD
w_class = 3
w_class = ITEMSIZE_NORMAL
/obj/item/holder/monkey/neaera
name = "neaera"
@@ -469,7 +469,7 @@ var/list/holder_mob_icon_cache = list()
icon_state = "neaera"
item_state = "neaera"
slot_flags = SLOT_HEAD
w_class = 3
w_class = ITEMSIZE_NORMAL
//Holders for rats
/obj/item/holder/rat
@@ -482,7 +482,7 @@ var/list/holder_mob_icon_cache = list()
icon_state_dead = "rat_brown_dead"
slot_flags = SLOT_EARS
origin_tech = list(TECH_BIO = 2)
w_class = 1
w_class = ITEMSIZE_TINY
/obj/item/holder/rat/white
icon_state = "rat_white_sleep"
@@ -519,7 +519,7 @@ var/list/holder_mob_icon_cache = list()
icon_state = "lizard"
slot_flags = 0
w_class = 1
w_class = ITEMSIZE_TINY
//Chicks and chickens
/obj/item/holder/chick
@@ -530,7 +530,7 @@ var/list/holder_mob_icon_cache = list()
icon_state_dead = "chick_dead"
slot_flags = 0
icon_state = "chick"
w_class = 1
w_class = ITEMSIZE_TINY
/obj/item/holder/chicken
@@ -541,7 +541,7 @@ var/list/holder_mob_icon_cache = list()
icon_state = "chicken_brown"
icon_state_dead = "chicken_brown_dead"
slot_flags = 0
w_class = 2
w_class = ITEMSIZE_SMALL
/obj/item/holder/chicken/brown
icon_state = "chicken_brown"
@@ -566,7 +566,7 @@ var/list/holder_mob_icon_cache = list()
icon_state = "mushroom"
icon_state_dead = "mushroom_dead"
slot_flags = SLOT_HEAD
w_class = 2
w_class = ITEMSIZE_SMALL
@@ -617,18 +617,18 @@ var/list/holder_mob_icon_cache = list()
icon = 'icons/mob/npc/pets.dmi'
icon_state = "corgi"
item_state = "corgi"
w_class = 3
w_class = ITEMSIZE_NORMAL
/obj/item/holder/fox
name = "fox"
icon = 'icons/mob/npc/pets.dmi'
icon_state = "fox"
item_state = "fox"
w_class = 3
w_class = ITEMSIZE_NORMAL
/obj/item/holder/schlorrgo
name = "schlorrgo"
icon = 'icons/mob/npc/livestock.dmi'
icon_state = "schlorgo"
item_state = "schlorgo"
w_class = ITEMSIZE_NORMAL
w_class = ITEMSIZE_NORMAL
+2 -2
View File
@@ -329,7 +329,7 @@
throwforce = 10.0
throw_speed = 2
throw_range = 5
w_class = 3.0
w_class = ITEMSIZE_NORMAL
var/created_name = "Floorbot"
/obj/item/toolbox_tiles/attackby(var/obj/item/W, mob/user as mob)
@@ -359,7 +359,7 @@
throwforce = 10.0
throw_speed = 2
throw_range = 5
w_class = 3.0
w_class = ITEMSIZE_NORMAL
var/created_name = "Floorbot"
/obj/item/toolbox_tiles_sensor/attackby(var/obj/item/W, mob/user as mob)
+1 -1
View File
@@ -337,7 +337,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.0
w_class = ITEMSIZE_NORMAL
/obj/item/firstaid_arm_assembly/Initialize()
. = ..()
+1 -1
View File
@@ -20,7 +20,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 = ITEMSIZE_NORMAL
origin_tech = list(TECH_BIO = 3)
req_access = list(access_robotics)
@@ -3,7 +3,7 @@
desc = "The pinnacle of artifical intelligence which can be achieved using classical computer science."
icon = 'icons/obj/module.dmi'
icon_state = "mainboard"
w_class = 3
w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_ENGINEERING = 4, TECH_MATERIAL = 3, TECH_DATA = 4)
/obj/item/device/mmi/digital/robot/New()
@@ -20,4 +20,4 @@
return
/obj/item/device/mmi/digital/robot/attack_self(mob/user as mob)
return
return
@@ -4,7 +4,7 @@
icon = 'icons/mob/npc/slimes.dmi'
icon_state = "grey slime extract"
force = 1.0
w_class = 1.0
w_class = ITEMSIZE_TINY
throwforce = 0
throw_speed = 3
throw_range = 6
@@ -282,4 +282,4 @@
wizardy = TRUE
/mob/living/carbon/slime/has_eyes()
return FALSE
return FALSE
@@ -15,7 +15,7 @@ var/global/list/robot_modules = list(
name = "robot module"
icon = 'icons/obj/module.dmi'
icon_state = "std_mod"
w_class = 100.0
w_class = ITEMSIZE_IMMENSE
item_state = "electronic"
flags = CONDUCT
var/channels = list()
@@ -1138,4 +1138,4 @@ var/global/list/robot_modules = list(
S.reagents.clear_reagents()
S.mode = initial(S.mode)
S.desc = initial(S.desc)
S.update_icon()
S.update_icon()
@@ -7,7 +7,7 @@
icon = 'icons/obj/wizard.dmi'
icon_state = "soulstone"
item_state = "electronic"
w_class = 2
w_class = ITEMSIZE_SMALL
slot_flags = SLOT_BELT
origin_tech = list(TECH_BLUESPACE = 4, TECH_MATERIAL = 4)
appearance_flags = NO_CLIENT_COLOR
@@ -47,7 +47,7 @@
dat += "<A href='byond://?src=\ref[src];choice=Summon'>Summon Shade</A><br>"
dat += "<i>This will summon the spirit of [A.name] in a pure energy form. Be cautious, for they will be weak without a protective construct to house them.</i><hr>"
dat += "<a href='byond://?src=\ref[src];choice=Close'>Close</a>"
var/datum/browser/soulstone_win = new(user, "soulstone", capitalize_first_letters(name))
soulstone_win.set_content(dat)
soulstone_win.add_stylesheet("cult", 'html/browser/cult.css')
+1 -1
View File
@@ -45,7 +45,7 @@
layer = SCREEN_LAYER
abstract = 1
item_state = "nothing"
w_class = 5.0
w_class = ITEMSIZE_HUGE
/obj/item/grab/New(mob/user, mob/victim)