Fixed vars getting set twice in the same class (#19294)

Fixed vars getting set twice in the same class
This commit is contained in:
Fluffy
2024-06-02 23:13:31 +00:00
committed by GitHub
parent 0dc6f03a46
commit aeb27e21e1
78 changed files with 93 additions and 132 deletions
@@ -287,7 +287,6 @@
/obj/item/device/radio/headset/headset_service/alt
name = "service radio bowman headset"
icon_state = "srv_headset_alt"
icon_state = "headset_alt"
/obj/item/device/radio/headset/alt/double/service
@@ -3,11 +3,10 @@
desc = "The by-product of some animal farming."
singular_name = "hide piece"
icon_state = "sheet-hide"
default_type = "hide"
default_type = MATERIAL_HIDE
icon_has_variants = TRUE
drop_sound = 'sound/items/drop/cloth.ogg'
pickup_sound = 'sound/items/pickup/cloth.ogg'
default_type = MATERIAL_HIDE
var/bare = FALSE //is this hair devoid of fur, hair, scales, carapace? Prevents re-stripping. Can also apply it to a hide type if we don't want to tan, like, xeno hide.
var/hide_type = "hair" //type of skin this animal has; scales for lizard, carapace for xeno.
@@ -10,13 +10,12 @@
pickup_sound = 'sound/items/pickup/knife.ogg'
hitsound = 'sound/weapons/bladeslice.ogg'
w_class = ITEMSIZE_TINY
thrown_force_divisor = 1
thrown_force_divisor = 0.25 // 5 when thrown with weight 20 (steel)
origin_tech = list(TECH_MATERIAL = 1)
attack_verb = list("attacked", "stabbed", "poked")
sharp = FALSE
edge = FALSE
force_divisor = 0.1 // 6 when wielded with hardness 60 (steel)
thrown_force_divisor = 0.25 // 5 when thrown with weight 20 (steel)
var/loaded //Descriptive string for currently loaded food object.
var/is_liquid = FALSE //whether you've got liquid on your utensil
var/scoop_food = 1
+1 -2
View File
@@ -8,10 +8,9 @@
icon_state = "grille"
density = TRUE
anchored = TRUE
obj_flags = OBJ_FLAG_CONDUCTABLE
obj_flags = OBJ_FLAG_CONDUCTABLE | OBJ_FLAG_MOVES_UNSUPPORTED
explosion_resistance = 1
layer = BELOW_OBJ_LAYER
obj_flags = OBJ_FLAG_MOVES_UNSUPPORTED
var/health = 10
var/destroyed = 0
@@ -151,10 +151,9 @@
/obj/structure/bed/chair/stool/bamboo
name = "bamboo stool"
desc = "A makeshift bamboo stool with a rustic look."
icon_state = "bamboo_stool_item"
item_state = "bamboo_stool"
base_icon = "bamboo_stool"
icon_state = "bamboo_stool"
item_state = "bamboo_stool_item"
base_icon = "bamboo_stool"
material_alteration = MATERIAL_ALTERATION_NAME || MATERIAL_ALTERATION_DESC
held_item = /obj/item/material/stool/bamboo
can_pad = FALSE
+1 -2
View File
@@ -553,12 +553,11 @@
desc = "It looks rather strong. Might take a few good hits to shatter it."
icon = 'icons/obj/smooth/shuttle_window.dmi'
icon_state = "shuttle_window"
basestate = "window"
basestate = "w"
atom_flags = 0
obj_flags = null
maxhealth = 40
reinf = TRUE
basestate = "w"
dir = 5
smoothing_flags = SMOOTH_TRUE
can_be_unanchored = TRUE