diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm
index 7c5a18623a0..a3c60e28e53 100644
--- a/code/_onclick/click.dm
+++ b/code/_onclick/click.dm
@@ -471,7 +471,6 @@
setDir(direction)
/atom/movable/screen/click_catcher
- icon = 'icons/mob/screen_gen.dmi'
icon_state = "catcher"
plane = CLICKCATCHER_PLANE
mouse_opacity = MOUSE_OPACITY_OPAQUE
diff --git a/code/_onclick/hud/action_button.dm b/code/_onclick/hud/action_button.dm
index abc5ba05aac..085a5152631 100644
--- a/code/_onclick/hud/action_button.dm
+++ b/code/_onclick/hud/action_button.dm
@@ -398,7 +398,6 @@ GLOBAL_LIST_INIT(palette_removed_matrix, list(1.4,0,0,0, 0.7,0.4,0,0, 0.4,0,0.6,
/atom/movable/screen/palette_scroll
- icon = 'icons/mob/screen_gen.dmi'
screen_loc = ui_palette_scroll
/// How should we move the palette's actions?
/// Positive scrolls down the list, negative scrolls back
@@ -465,7 +464,6 @@ GLOBAL_LIST_INIT(palette_removed_matrix, list(1.4,0,0,0, 0.7,0.4,0,0, 0.4,0,0.6,
/atom/movable/screen/action_landing
name = "Button Space"
desc = "Drag and drop a button into this spot
to add it to the group."
- icon = 'icons/mob/screen_gen.dmi'
icon_state = "reserved"
// We want our whole 32x32 space to be clickable, so dropping's forgiving
mouse_opacity = MOUSE_OPACITY_OPAQUE
diff --git a/code/_onclick/hud/alert.dm b/code/_onclick/hud/alert.dm
index fecbf9e1d23..2347714184b 100644
--- a/code/_onclick/hud/alert.dm
+++ b/code/_onclick/hud/alert.dm
@@ -101,7 +101,6 @@
icon_state = "default"
name = "Alert"
desc = "Something seems to have gone wrong with this alert, so report this bug please."
- mouse_opacity = MOUSE_OPACITY_ICON
/// How long before this alert automatically clears itself (in deciseconds). If zero, remains until cleared.
var/timeout = 0
/// Some alerts may have different icon states based on severity, this adjusts that.
diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm
index d004fe49e2a..ccf7d3528f5 100644
--- a/code/_onclick/hud/fullscreen.dm
+++ b/code/_onclick/hud/fullscreen.dm
@@ -127,8 +127,6 @@
icon_state = "flash"
/atom/movable/screen/fullscreen/stretch/flash/noise
- icon = 'icons/mob/screen_gen.dmi'
- screen_loc = "WEST,SOUTH to EAST,NORTH"
icon_state = "noise"
/atom/movable/screen/fullscreen/stretch/high
@@ -149,12 +147,10 @@
invisibility = INVISIBILITY_LIGHTING
layer = BACKGROUND_LAYER+21
color = "#000"
- show_when_dead = TRUE
//Provides whiteness in case you don't see lights so everything is still visible
/atom/movable/screen/fullscreen/stretch/lighting_backdrop/unlit
layer = BACKGROUND_LAYER+20
- show_when_dead = TRUE
/atom/movable/screen/fullscreen/stretch/see_through_darkness
icon_state = "nightvision"
diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm
index 07818fb67fc..059986d0bc7 100644
--- a/code/_onclick/hud/parallax.dm
+++ b/code/_onclick/hud/parallax.dm
@@ -288,7 +288,6 @@
/atom/movable/screen/parallax_layer/layer_2
icon_state = "layer2"
- speed = 1
layer = 2
/atom/movable/screen/parallax_layer/layer_3
diff --git a/code/_onclick/hud/plane_master.dm b/code/_onclick/hud/plane_master.dm
index cd46bdadf34..ecb1d531b74 100644
--- a/code/_onclick/hud/plane_master.dm
+++ b/code/_onclick/hud/plane_master.dm
@@ -21,13 +21,11 @@
name = "floor plane master"
plane = FLOOR_PLANE
appearance_flags = PLANE_MASTER
- blend_mode = BLEND_OVERLAY
/atom/movable/screen/plane_master/game_world
name = "game world plane master"
plane = GAME_PLANE
appearance_flags = PLANE_MASTER
- blend_mode = BLEND_OVERLAY
/atom/movable/screen/plane_master/game_world/backdrop(mob/mymob)
. = ..() //if you delete it so help me god
@@ -55,7 +53,6 @@
name = "point plane master"
plane = POINT_PLANE
appearance_flags = PLANE_MASTER //should use client color
- blend_mode = BLEND_OVERLAY
/atom/movable/screen/plane_master/point/backdrop(mob/mymob)
if(istype(mymob) && mymob.client && mymob.client.prefs)
@@ -65,7 +62,6 @@
name = "cogbar plane master"
plane = COGBAR_PLANE
appearance_flags = PLANE_MASTER //should use client color
- blend_mode = BLEND_OVERLAY
/atom/movable/screen/plane_master/cogbar/backdrop(mob/mymob)
if(istype(mymob) && mymob.client?.prefs)
@@ -91,7 +87,6 @@
name = "space plane master"
plane = PLANE_SPACE
appearance_flags = PLANE_MASTER
- blend_mode = BLEND_OVERLAY
/atom/movable/screen/plane_master/parallax
name = "parallax plane master"
@@ -113,18 +108,15 @@
plane = GRAVITY_PULSE_PLANE
blend_mode = BLEND_ADD
render_target = GRAVITY_PULSE_RENDER_TARGET
- appearance_flags = PLANE_MASTER | NO_CLIENT_COLOR
/atom/movable/screen/plane_master/smoke
name = "point plane master"
plane = SMOKE_PLANE
appearance_flags = PLANE_MASTER
- blend_mode = BLEND_OVERLAY
/atom/movable/screen/plane_master/lamps
name = "lamps plane master"
plane = LIGHTING_LAMPS_PLANE
- blend_mode = BLEND_OVERLAY
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
render_target = LIGHTING_LAMPS_RENDER_TARGET
diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
index ff3ac8eccad..e525d51975b 100644
--- a/code/_onclick/hud/screen_objects.dm
+++ b/code/_onclick/hud/screen_objects.dm
@@ -100,11 +100,9 @@
/atom/movable/screen/act_intent/alien
icon = 'icons/mob/screen_alien.dmi'
- screen_loc = ui_acti
/atom/movable/screen/act_intent/robot
icon = 'icons/mob/screen_robot.dmi'
- screen_loc = ui_borg_intents
/atom/movable/screen/act_intent/robot/ai
screen_loc = "SOUTH+1:6,EAST-1:32"
@@ -115,11 +113,9 @@
/atom/movable/screen/act_intent/simple_animal
icon = 'icons/mob/screen_simplemob.dmi'
- screen_loc = ui_acti
/atom/movable/screen/act_intent/guardian
icon = 'icons/mob/guardian.dmi'
- screen_loc = ui_acti
/atom/movable/screen/mov_intent/Click()
usr.toggle_move_intent()
@@ -281,7 +277,6 @@
icon = 'icons/mob/zone_sel.dmi'
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
alpha = 128
- anchored = TRUE
layer = ABOVE_HUD_LAYER
plane = ABOVE_HUD_PLANE
@@ -551,7 +546,6 @@
name = "summoner health"
icon = 'icons/mob/guardian.dmi'
icon_state = "base"
- screen_loc = ui_health
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/atom/movable/screen/healthdoll
diff --git a/code/controllers/subsystem/SSair.dm b/code/controllers/subsystem/SSair.dm
index 4b288414bb1..ee60c186439 100644
--- a/code/controllers/subsystem/SSair.dm
+++ b/code/controllers/subsystem/SSair.dm
@@ -697,7 +697,6 @@ SUBSYSTEM_DEF(air)
/obj/effect/overlay/turf
icon = 'icons/effects/tile_effects.dmi'
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- anchored = TRUE // should only appear in vis_contents, but to be safe
layer = FLY_LAYER
appearance_flags = TILE_BOUND | RESET_TRANSFORM | RESET_COLOR
diff --git a/code/datums/actions/generic_action.dm b/code/datums/actions/generic_action.dm
index b4e7ebea023..07a667336a1 100644
--- a/code/datums/actions/generic_action.dm
+++ b/code/datums/actions/generic_action.dm
@@ -1,6 +1,5 @@
//Preset for action that call specific procs (consider innate)
/datum/action/generic
- check_flags = 0
var/procname
/datum/action/generic/Trigger(left_click)
diff --git a/code/datums/actions/innate_action.dm b/code/datums/actions/innate_action.dm
index ef76befea52..645fb1e7b6a 100644
--- a/code/datums/actions/innate_action.dm
+++ b/code/datums/actions/innate_action.dm
@@ -1,6 +1,5 @@
//Preset for general and toggled actions
/datum/action/innate
- check_flags = 0
var/active = FALSE
/datum/action/innate/Trigger(left_click)
diff --git a/code/datums/actions/item_action.dm b/code/datums/actions/item_action.dm
index 3150dff47b5..8ad5b4cdd9f 100644
--- a/code/datums/actions/item_action.dm
+++ b/code/datums/actions/item_action.dm
@@ -326,7 +326,6 @@
/datum/action/item_action/bhop
name = "Activate Jump Boots"
desc = "Activates the jump boot's internal propulsion system, allowing the user to dash over 4-wide gaps."
- button_overlay_icon = 'icons/mob/actions/actions.dmi'
button_overlay_icon_state = "jetboot"
use_itemicon = FALSE
diff --git a/code/datums/actions/spell_action.dm b/code/datums/actions/spell_action.dm
index 1d01cd27e9e..60d57021f51 100644
--- a/code/datums/actions/spell_action.dm
+++ b/code/datums/actions/spell_action.dm
@@ -1,6 +1,5 @@
//Preset for spells
/datum/action/spell_action
- check_flags = 0
button_background_icon_state = "bg_spell"
var/recharge_text_color = "#FFFFFF"
diff --git a/code/datums/beam.dm b/code/datums/beam.dm
index 23776d1d8d0..191240b3022 100644
--- a/code/datums/beam.dm
+++ b/code/datums/beam.dm
@@ -178,7 +178,6 @@
/obj/effect/ebeam
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- anchored = TRUE
var/datum/beam/owner
/obj/effect/ebeam/Initialize(mapload, beam_owner)
diff --git a/code/datums/diseases/advance/symptoms/confusion.dm b/code/datums/diseases/advance/symptoms/confusion.dm
index d7dbffd2f54..fa0733bc0dd 100644
--- a/code/datums/diseases/advance/symptoms/confusion.dm
+++ b/code/datums/diseases/advance/symptoms/confusion.dm
@@ -21,7 +21,6 @@ Bonus
stealth = 1
resistance = -1
stage_speed = -3
- transmittable = 0
level = 4
severity = 2
diff --git a/code/datums/diseases/advance/symptoms/fever.dm b/code/datums/diseases/advance/symptoms/fever.dm
index 32c051d5a26..845ff9f5abc 100644
--- a/code/datums/diseases/advance/symptoms/fever.dm
+++ b/code/datums/diseases/advance/symptoms/fever.dm
@@ -18,7 +18,6 @@ Bonus
/datum/symptom/fever
name = "Fever"
- stealth = 0
resistance = 3
stage_speed = 3
transmittable = 2
diff --git a/code/datums/diseases/advance/symptoms/flesh_eating.dm b/code/datums/diseases/advance/symptoms/flesh_eating.dm
index e7d68bebb92..9de5ce72b3c 100644
--- a/code/datums/diseases/advance/symptoms/flesh_eating.dm
+++ b/code/datums/diseases/advance/symptoms/flesh_eating.dm
@@ -20,7 +20,6 @@ Bonus
name = "Necrotizing Fasciitis"
stealth = -3
resistance = -4
- stage_speed = 0
transmittable = -4
level = 6
severity = 5
diff --git a/code/datums/diseases/advance/symptoms/headache.dm b/code/datums/diseases/advance/symptoms/headache.dm
index d1efc35fc98..769abc9e987 100644
--- a/code/datums/diseases/advance/symptoms/headache.dm
+++ b/code/datums/diseases/advance/symptoms/headache.dm
@@ -22,7 +22,6 @@ BONUS
stealth = -1
resistance = 4
stage_speed = 2
- transmittable = 0
level = 1
severity = 1
diff --git a/code/datums/diseases/advance/symptoms/heal.dm b/code/datums/diseases/advance/symptoms/heal.dm
index c6e68cd3f28..c52c7df54b6 100644
--- a/code/datums/diseases/advance/symptoms/heal.dm
+++ b/code/datums/diseases/advance/symptoms/heal.dm
@@ -61,7 +61,6 @@ Bonus
stealth = -1
resistance = -1
stage_speed = -1
- transmittable = -4
level = 3
var/list/cured_diseases = list()
diff --git a/code/datums/diseases/advance/symptoms/itching.dm b/code/datums/diseases/advance/symptoms/itching.dm
index f6689c3c464..6d62a443210 100644
--- a/code/datums/diseases/advance/symptoms/itching.dm
+++ b/code/datums/diseases/advance/symptoms/itching.dm
@@ -19,7 +19,6 @@ BONUS
/datum/symptom/itching
name = "Itching"
- stealth = 0
resistance = 3
stage_speed = 3
transmittable = 1
diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm
index 9adc4c67e49..0945ce9f5d1 100644
--- a/code/datums/diseases/advance/symptoms/sensory.dm
+++ b/code/datums/diseases/advance/symptoms/sensory.dm
@@ -22,7 +22,6 @@ Bonus
stage_speed = -4
transmittable = -3
level = 5
- severity = 0
/datum/symptom/mind_restoration/Activate(datum/disease/advance/A)
..()
diff --git a/code/datums/diseases/advance/symptoms/shivering.dm b/code/datums/diseases/advance/symptoms/shivering.dm
index 30d1084ba0e..e0cb6a9b563 100644
--- a/code/datums/diseases/advance/symptoms/shivering.dm
+++ b/code/datums/diseases/advance/symptoms/shivering.dm
@@ -18,7 +18,6 @@ Bonus
/datum/symptom/shivering
name = "Shivering"
- stealth = 0
resistance = 2
stage_speed = 2
transmittable = 2
diff --git a/code/datums/diseases/advance/symptoms/sneeze.dm b/code/datums/diseases/advance/symptoms/sneeze.dm
index b8af8f92a24..8564360fa94 100644
--- a/code/datums/diseases/advance/symptoms/sneeze.dm
+++ b/code/datums/diseases/advance/symptoms/sneeze.dm
@@ -21,7 +21,6 @@ Bonus
name = "Sneezing"
stealth = -2
resistance = 3
- stage_speed = 0
transmittable = 4
level = 1
severity = 1
diff --git a/code/datums/diseases/advance/symptoms/viral.dm b/code/datums/diseases/advance/symptoms/viral.dm
index 1614d092fc3..a4ddc9d5f86 100644
--- a/code/datums/diseases/advance/symptoms/viral.dm
+++ b/code/datums/diseases/advance/symptoms/viral.dm
@@ -18,7 +18,6 @@ BONUS
stealth = 3
resistance = 5
stage_speed = -3
- transmittable = 0
level = 3
/datum/symptom/viraladaptation/Activate(datum/disease/advance/A)
diff --git a/code/datums/diseases/advance/symptoms/vomit.dm b/code/datums/diseases/advance/symptoms/vomit.dm
index 6ebc4f5bc45..650f7bb380f 100644
--- a/code/datums/diseases/advance/symptoms/vomit.dm
+++ b/code/datums/diseases/advance/symptoms/vomit.dm
@@ -24,7 +24,6 @@ Bonus
name = "Vomiting"
stealth = -2
resistance = -1
- stage_speed = 0
transmittable = 1
level = 3
severity = 4
@@ -67,10 +66,7 @@ Bonus
/datum/symptom/vomit/blood
name = "Blood Vomiting"
- stealth = -2
- resistance = -1
stage_speed = -1
- transmittable = 1
level = 4
severity = 5
@@ -99,7 +95,6 @@ Bonus
/datum/symptom/vomit/projectile
name = "Projectile Vomiting"
- stealth = -2
level = 4
/datum/symptom/vomit/projectile/Vomit(mob/living/carbon/M)
diff --git a/code/datums/diseases/cold.dm b/code/datums/diseases/cold.dm
index 9d3792ba4ba..f2ddacc0dce 100644
--- a/code/datums/diseases/cold.dm
+++ b/code/datums/diseases/cold.dm
@@ -2,7 +2,6 @@
name = "The Cold"
max_stages = 3
spread_text = "Airborne"
- spread_flags = AIRBORNE
cure_text = "Rest & Spaceacillin"
cures = list("spaceacillin")
agent = "XY-rhinovirus"
diff --git a/code/datums/diseases/critical.dm b/code/datums/diseases/critical.dm
index 4771e150d5d..2ec4c68e7fe 100644
--- a/code/datums/diseases/critical.dm
+++ b/code/datums/diseases/critical.dm
@@ -88,10 +88,7 @@
cure_chance = 10
stage_prob = 5
severity = HARMFUL
- disease_flags = CURABLE
required_organs = list(ORGAN_DATUM_HEART)
- bypasses_immunity = TRUE
- virus_heal_resistant = TRUE
/datum/disease/critical/heart_failure/stage_act()
if(..())
diff --git a/code/datums/elements/rust_element.dm b/code/datums/elements/rust_element.dm
index 1e0cf1375be..bdf5a5655d4 100644
--- a/code/datums/elements/rust_element.dm
+++ b/code/datums/elements/rust_element.dm
@@ -110,7 +110,6 @@
/obj/effect/glowing_rune
icon = 'icons/effects/eldritch.dmi'
icon_state = "small_rune_1"
- anchored = TRUE
plane = FLOOR_PLANE
layer = SIGIL_LAYER
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
diff --git a/code/datums/keybindings/client.dm b/code/datums/keybindings/client.dm
index ac39a724cef..89d05674e52 100644
--- a/code/datums/keybindings/client.dm
+++ b/code/datums/keybindings/client.dm
@@ -1,5 +1,4 @@
/datum/keybinding/client
- category = KB_CATEGORY_UNSORTED
/datum/keybinding/client/admin_help
name = "Admin Help"
diff --git a/code/datums/looping_sounds/machinery_sounds.dm b/code/datums/looping_sounds/machinery_sounds.dm
index 24acbb7bb22..d8b46ae847e 100644
--- a/code/datums/looping_sounds/machinery_sounds.dm
+++ b/code/datums/looping_sounds/machinery_sounds.dm
@@ -41,7 +41,6 @@ GLOBAL_DATUM_INIT(firealarm_soundloop, /datum/looping_sound/firealarm, new(list(
mid_sounds = list('sound/machines/kitchen/microwave_mid1.ogg' = 10, 'sound/machines/kitchen/microwave_mid2.ogg' = 1)
mid_length = 15
end_sound = 'sound/machines/kitchen/microwave_end.ogg'
- volume = 100
/datum/looping_sound/kitchen/deep_fryer
start_sound = 'sound/machines/kitchen/deep_fryer_immerse.ogg'
diff --git a/code/datums/mapping/themes/caves_theme.dm b/code/datums/mapping/themes/caves_theme.dm
index 8d58da9c9d2..1aa1d5a4815 100644
--- a/code/datums/mapping/themes/caves_theme.dm
+++ b/code/datums/mapping/themes/caves_theme.dm
@@ -81,8 +81,6 @@ GLOBAL_LIST_INIT(caves_default_flora_spawns, list(
name = "Blocked Burrows"
perlin_accuracy = 90
perlin_stamp_size = 7
- perlin_lower_range = 0
- perlin_upper_range = 0.3
/datum/caves_theme/burrows/on_change(turf/T)
if(prob(7))
@@ -138,7 +136,6 @@ GLOBAL_LIST_INIT(caves_default_flora_spawns, list(
/datum/caves_theme/deeprock
name = "Deadly Deeprock"
perlin_stamp_size = 12
- perlin_lower_range = 0
perlin_upper_range = 0.2
var/oasis_padding = 50
var/list/oasis_centroids = list()
diff --git a/code/datums/ores.dm b/code/datums/ores.dm
index b779d6592e8..c396fd1ee29 100644
--- a/code/datums/ores.dm
+++ b/code/datums/ores.dm
@@ -77,7 +77,6 @@
/datum/ore/bluespace
drop_type = /obj/item/stack/ore/bluespace_crystal
- drop_min = 1
drop_max = 1
scan_icon_state = "rock_BScrystal"
diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm
index 402c344775a..180f4c88566 100644
--- a/code/datums/outfits/outfit_admin.dm
+++ b/code/datums/outfits/outfit_admin.dm
@@ -782,7 +782,6 @@
name = "TSF Lieutenant"
uniform = /obj/item/clothing/under/solgov/command
head = /obj/item/clothing/head/beret/solgov
- glasses = /obj/item/clothing/glasses/night
back = /obj/item/storage/backpack/satchel
shoes = /obj/item/clothing/shoes/magboots/elite
l_ear = /obj/item/radio/headset/ert/alt/commander/solgov
@@ -824,8 +823,6 @@
uniform = /obj/item/clothing/under/solgov/command/elite
suit = /obj/item/clothing/suit/space/hardsuit/ert/solgov/command
head = null
- mask = /obj/item/clothing/mask/gas/explorer/marines
- glasses = /obj/item/clothing/glasses/night
belt = /obj/item/melee/baton/loaded
l_hand = null
suit_store = /obj/item/gun/projectile/automatic/pistol/deagle
@@ -877,7 +874,6 @@
shoes = /obj/item/clothing/shoes/combat
belt = /obj/item/melee/classic_baton/telescopic
back = /obj/item/storage/backpack/security
- box = /obj/item/storage/box/survival
/datum/outfit/admin/trader/commie
name = "USSP Trader"
@@ -1067,7 +1063,6 @@
uniform = /obj/item/clothing/under/rank/security/detective
suit = /obj/item/clothing/suit/storage/det_suit
- shoes = /obj/item/clothing/shoes/black
head = /obj/item/clothing/head/det_hat
glasses = /obj/item/clothing/glasses/thermal/monocle
l_pocket = /obj/item/ammo_box/a357
@@ -1079,11 +1074,9 @@
uniform = /obj/item/clothing/under/rank/civilian/chef
suit = /obj/item/clothing/suit/chef
- shoes = /obj/item/clothing/shoes/black
head = /obj/item/clothing/head/chefhat
l_pocket = /obj/item/kitchen/knife
r_pocket = /obj/item/kitchen/knife
- l_hand = /obj/item/kitchen/knife
r_hand = /obj/item/kitchen/rollingpin
/datum/outfit/admin/tournament/tournament_janitor
@@ -1091,7 +1084,6 @@
uniform = /obj/item/clothing/under/rank/civilian/janitor
back = /obj/item/storage/backpack
- shoes = /obj/item/clothing/shoes/black
l_hand = /obj/item/reagent_containers/glass/bucket
backpack_contents = list(
/obj/item/grenade/chem_grenade/cleaner = 2,
diff --git a/code/datums/outfits/outfit_debug.dm b/code/datums/outfits/outfit_debug.dm
index d9a7e93e127..75677e86a8a 100644
--- a/code/datums/outfits/outfit_debug.dm
+++ b/code/datums/outfits/outfit_debug.dm
@@ -23,7 +23,6 @@
pda = /obj/item/pda/centcom
internals_slot = ITEM_SLOT_SUIT_STORE
- toggle_helmet = TRUE
cybernetic_implants = list(
/obj/item/organ/internal/cyberimp/arm/surgery/debug,
@@ -55,7 +54,6 @@
desc = "Lets you listen to everything. Use in hand to toggle voice changing. Alt-click to change your fake name."
icon_state = "com_cypherkey"
channels = list("Response Team" = 1, "Special Ops" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Procedure" = 1) // just in case
- syndie = TRUE
change_voice = FALSE
/obj/item/encryptionkey/syndicate/all_channels/Initialize(mapload)
@@ -98,7 +96,6 @@
desc = "Diagnostic, Hydroponic, Medical, Security, and Skills HUD. Built-in advanced reagent scanner. Alt-click to toggle X-ray vision."
icon_state = "nvgmeson"
hud_debug = TRUE
- flags_cover = GLASSESCOVERSEYES
flash_protect = FLASH_PROTECTION_WELDER
scan_reagents_advanced = TRUE
@@ -147,8 +144,6 @@
desc = "Spawn a human by aiming at a turf and clicking. Use in hand to change type."
icon = 'icons/obj/guns/magic.dmi'
icon_state = "nothingwand"
- lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/items_righthand.dmi'
w_class = WEIGHT_CLASS_SMALL
var/datum/species/selected_species
var/activate_mind = FALSE
@@ -263,7 +258,6 @@
//
/obj/item/storage/box/debug
- w_class = WEIGHT_CLASS_NORMAL
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 1000
storage_slots = 99
diff --git a/code/datums/periodic_news.dm b/code/datums/periodic_news.dm
index a74f15c61b5..513f229a33e 100644
--- a/code/datums/periodic_news.dm
+++ b/code/datums/periodic_news.dm
@@ -67,7 +67,6 @@
round_time = 60 * 50
/datum/news_announcement/random_junk/found_ssd
- channel_name = "Nyx Daily"
author = "Doctor Eric Hanfield"
headline = "Employees found SSD"
message = {"Several people have been found unconscious at their terminals. It is thought that it was due
@@ -77,7 +76,6 @@
round_time = 60 * 90
/datum/news_announcement/lotus_tree
- channel_name = "Nyx Daily"
author = "Reporter Leland H. Howards"
headline = "Explosion on Civilian Transport"
message = {"The newly-christened civilian transport Lotus Tree suffered two very large explosions near the
@@ -89,7 +87,6 @@
round_time = 60 * 30
/datum/news_announcement/food_riots/breaking_news
- channel_name = "Nyx Daily"
author = "Reporter Ro'kii Ar-Raqis"
headline = "Food Riots in Tenebrae Lupus"
message = {"Breaking news: Food riots have broken out throughout the Refuge asteroid colony in the Tenebrae
@@ -100,7 +97,6 @@
round_time = 60 * 10
/datum/news_announcement/food_riots/more
- channel_name = "Nyx Daily"
author = "Reporter Ro'kii Ar-Raqis"
headline = "Food Riots Continue Amid NT Withdrawl"
message = {"More on the Refuge food riots: The Refuge Council has condemned Nanotrasen's withdrawal from
diff --git a/code/datums/pipe_datums.dm b/code/datums/pipe_datums.dm
index 23c42723ae4..0ed899d2e6a 100644
--- a/code/datums/pipe_datums.dm
+++ b/code/datums/pipe_datums.dm
@@ -253,7 +253,6 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable
pipe_name = "bent h/e pipe"
pipe_id = PIPE_HE_BENT
pipe_icon = "he"
- bendy = TRUE
pipe_category = RPD_HEAT_PIPING
/datum/pipes/atmospheric/he_junction
@@ -356,9 +355,7 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable
pipe_name = "diagonal transit tube"
construction_type = /obj/structure/transit_tube_construction/diagonal
pipe_id = PIPE_TRANSIT_TUBE_DIAGONAL
- orientations = 2
pipe_icon = "transit_diagonal"
- rpd_dispensable = TRUE
/datum/pipes/transit/tube/curved
pipe_name = "curved transit tube"
@@ -366,7 +363,6 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable
pipe_id = PIPE_TRANSIT_TUBE_CURVED
orientations = 4
pipe_icon = "transit_curved"
- rpd_dispensable = TRUE
/datum/pipes/transit/tube/junction
pipe_name = "junction transit tube"
@@ -374,7 +370,6 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable
pipe_id = PIPE_TRANSIT_TUBE_JUNCTION
orientations = 4
pipe_icon = "transit_junction"
- rpd_dispensable = TRUE
/datum/pipes/transit/tube/terminus_dispenser_station
pipe_name = "terminus dispenser tube station"
@@ -382,7 +377,6 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable
pipe_id = PIPE_TRANSIT_TUBE_TERMINUS_DISPENSER
orientations = 4
pipe_icon = "transit_dispenser_terminus"
- rpd_dispensable = TRUE
/datum/pipes/transit/tube/dispenser_station
pipe_name = "dispenser tube station"
@@ -390,7 +384,6 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable
construction_type = /obj/structure/transit_tube_construction/station/dispenser
orientations = 4
pipe_icon = "transit_dispenser_station"
- rpd_dispensable = TRUE
/datum/pipes/transit/tube/station
pipe_name = "transit tube station"
@@ -398,7 +391,6 @@ GLOBAL_LIST_EMPTY(rpd_pipe_list) //Some pipes we don't want to be dispensable
pipe_id = PIPE_TRANSIT_TUBE_STATION
orientations = 4
pipe_icon = "transit_station"
- rpd_dispensable = TRUE
//Pipes the RPD can't dispense. Since these don't use an interface, we don't need to bother with setting an icon. We do, however, want to name these for other purposes
diff --git a/code/datums/spells/alien_spells/neurotoxin_spit.dm b/code/datums/spells/alien_spells/neurotoxin_spit.dm
index 376ffd2459b..4886e28a179 100644
--- a/code/datums/spells/alien_spells/neurotoxin_spit.dm
+++ b/code/datums/spells/alien_spells/neurotoxin_spit.dm
@@ -7,7 +7,6 @@
selection_deactivated_message = "You swallow your prepared neurotoxin."
var/neurotoxin_type = /obj/item/projectile/bullet/neurotoxin
action_icon_state = "alien_neurotoxin_0"
- active = FALSE
/datum/spell/alien_spell/neurotoxin/create_new_targeting()
return new /datum/spell_targeting/clicked_atom
@@ -36,7 +35,6 @@
return TRUE
/datum/spell/alien_spell/neurotoxin/death_to_xenos
- name = "Neurotoxin spit"
desc = "This ability allows you to fire some neurotoxin. Knocks aliens down."
neurotoxin_type = /obj/item/projectile/bullet/anti_alien_toxin
base_cooldown = 2 SECONDS
diff --git a/code/datums/spells/alien_spells/transfer_plasma.dm b/code/datums/spells/alien_spells/transfer_plasma.dm
index 4f9dc4f0338..4123f0334c4 100644
--- a/code/datums/spells/alien_spells/transfer_plasma.dm
+++ b/code/datums/spells/alien_spells/transfer_plasma.dm
@@ -24,7 +24,6 @@
name = "Syphon plasma"
desc = "Syphons 150 plasma from a nearby alien."
action_icon_state = "alien_transfer"
- plasma_cost = 0
base_cooldown = 10 SECONDS
/datum/spell/alien_spell/syphon_plasma/create_new_targeting()
diff --git a/code/datums/spells/aoe_spell.dm b/code/datums/spells/aoe_spell.dm
index 87da4ce5c7a..824ed658269 100644
--- a/code/datums/spells/aoe_spell.dm
+++ b/code/datums/spells/aoe_spell.dm
@@ -1,5 +1,4 @@
/datum/spell/aoe
- name = "Spell"
create_attack_logs = FALSE
create_custom_logs = TRUE
/// How far does it effect
diff --git a/code/datums/spells/banana_touch.dm b/code/datums/spells/banana_touch.dm
index 6fa785eb31a..af9dda07ae6 100644
--- a/code/datums/spells/banana_touch.dm
+++ b/code/datums/spells/banana_touch.dm
@@ -6,7 +6,6 @@
hand_path = /obj/item/melee/touch_attack/banana
base_cooldown = 30 SECONDS
- clothes_req = TRUE
cooldown_min = 100 //50 deciseconds reduction per rank
action_icon_state = "clown"
diff --git a/code/datums/spells/bloodcrawl.dm b/code/datums/spells/bloodcrawl.dm
index f8bdb5d333d..18ece11e502 100644
--- a/code/datums/spells/bloodcrawl.dm
+++ b/code/datums/spells/bloodcrawl.dm
@@ -3,7 +3,6 @@
desc = "Use pools of blood to phase out of existence."
base_cooldown = 1 SECONDS
clothes_req = FALSE
- cooldown_min = 0
should_recharge_after_cast = FALSE
overlay = null
action_icon_state = "bloodcrawl"
@@ -60,10 +59,7 @@
/// Can't use the wizard one, blocked by jaunt/slow
/obj/effect/dummy/slaughter
name = "odd blood"
- icon = 'icons/effects/effects.dmi'
icon_state = "nothing"
- density = FALSE
- anchored = TRUE
invisibility = 60
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
@@ -97,7 +93,6 @@
icon = 'icons/mob/mob.dmi'
icon_state = "blank" // Flicks are used instead
duration = 0.6 SECONDS
- layer = MOB_LAYER + 0.1
/obj/effect/temp_visual/dir_setting/bloodcrawl/Initialize(mapload, set_dir, animation_state)
. = ..()
diff --git a/code/datums/spells/chaplain_bless.dm b/code/datums/spells/chaplain_bless.dm
index 518f51207c8..fab3e98b5fd 100644
--- a/code/datums/spells/chaplain_bless.dm
+++ b/code/datums/spells/chaplain_bless.dm
@@ -6,7 +6,6 @@
base_cooldown = 6 SECONDS
clothes_req = FALSE
invocation = "none"
- invocation_type = "none"
antimagic_flags = NONE
selection_activated_message = "You prepare a blessing. Click on a target to start blessing."
diff --git a/code/datums/spells/cluwne.dm b/code/datums/spells/cluwne.dm
index 68e48c108eb..76de292c341 100644
--- a/code/datums/spells/cluwne.dm
+++ b/code/datums/spells/cluwne.dm
@@ -4,7 +4,6 @@
hand_path = /obj/item/melee/touch_attack/cluwne
base_cooldown = 1 MINUTES
- clothes_req = TRUE
cooldown_min = 200 //100 deciseconds reduction per rank
action_icon_state = "cluwne"
diff --git a/code/datums/spells/conjure_item.dm b/code/datums/spells/conjure_item.dm
index bc3cc721549..1e270e5ea88 100644
--- a/code/datums/spells/conjure_item.dm
+++ b/code/datums/spells/conjure_item.dm
@@ -1,7 +1,6 @@
/datum/spell/conjure_item
name = "Summon weapon"
desc = "A generic spell that should not exist. This summons an instance of a specific type of item, or if one already exists, un-summons it."
- invocation_type = "none"
clothes_req = FALSE
var/obj/item/item
var/item_type = /obj/item/banhammer
diff --git a/code/datums/spells/construct_spells.dm b/code/datums/spells/construct_spells.dm
index 76b4964e853..e1b2c59643e 100644
--- a/code/datums/spells/construct_spells.dm
+++ b/code/datums/spells/construct_spells.dm
@@ -2,7 +2,6 @@
/datum/spell/aoe/conjure/construct/lesser
base_cooldown = 1800
- action_icon_state = "artificer"
action_background_icon_state = "bg_cult"
/datum/spell/aoe/conjure/build
@@ -16,7 +15,6 @@
base_cooldown = 20
clothes_req = FALSE
invocation = "none"
- invocation_type = "none"
summon_type = list(/turf/simulated/floor/engine/cult)
centcom_cancast = FALSE //Stop crashing the server by spawning turfs on transit tiles
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
@@ -26,10 +24,8 @@
desc = "This spell constructs a cult wall."
action_icon_state = "cultforcewall"
action_background_icon_state = "bg_cult"
- base_cooldown = 100
clothes_req = FALSE
invocation = "none"
- invocation_type = "none"
summon_type = list(/turf/simulated/wall/cult/artificer) //we don't want artificer-based runed metal farms
centcom_cancast = FALSE //Stop crashing the server by spawning turfs on transit tiles
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
@@ -38,11 +34,6 @@
name = "Greater Construction"
desc = "This spell constructs a reinforced metal wall."
base_cooldown = 300
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
- centcom_cancast = FALSE //Stop crashing the server by spawning turfs on transit tiles
- holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
delay = 50
summon_type = list(/turf/simulated/wall/r_wall)
@@ -55,7 +46,6 @@
base_cooldown = 3000
clothes_req = FALSE
invocation = "none"
- invocation_type = "none"
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
summon_type = list(/obj/item/soulstone)
@@ -76,7 +66,6 @@
base_cooldown = 200
clothes_req = FALSE
invocation = "none"
- invocation_type = "none"
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
summon_type = list(/obj/structure/cult/functional/pylon)
@@ -90,7 +79,6 @@
base_cooldown = 300
clothes_req = FALSE
invocation = "none"
- invocation_type = "none"
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
summon_type = list(/obj/effect/forcefield/cult)
summon_lifespan = 200
@@ -109,8 +97,6 @@
action_background_icon_state = "bg_cult"
base_cooldown = 200
clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
jaunt_in_time = 12
jaunt_in_type = /obj/effect/temp_visual/dir_setting/wraith
@@ -132,7 +118,6 @@
/datum/spell/projectile/magic_missile/lesser
name = "Lesser Magic Missile"
- desc = "This spell fires several, slow moving, magic projectiles at nearby targets."
action_background_icon_state = "bg_cult"
base_cooldown = 400
clothes_req = FALSE
@@ -161,11 +146,6 @@
action_icon_state = "parasmoke"
action_background_icon_state = "bg_cult"
base_cooldown = 200
- clothes_req = FALSE
- invocation = "none"
- invocation_type = "none"
holy_area_cancast = FALSE //Stops cult magic from working on holy ground eg: chapel
- cooldown_min = 20 //25 deciseconds reduction per rank
smoke_type = SMOKE_SLEEPING
- smoke_amt = 10
diff --git a/code/datums/spells/disguise_self.dm b/code/datums/spells/disguise_self.dm
index adffa4f4205..6b847508499 100644
--- a/code/datums/spells/disguise_self.dm
+++ b/code/datums/spells/disguise_self.dm
@@ -6,7 +6,6 @@
base_cooldown = 3 SECONDS
clothes_req = FALSE
- invocation_type = "none"
level_max = 0 //cannot be improved
action_icon_state = "disguise_self"
sound = null
diff --git a/code/datums/spells/ethereal_jaunt.dm b/code/datums/spells/ethereal_jaunt.dm
index 8db9854f0a4..5779e346cd1 100644
--- a/code/datums/spells/ethereal_jaunt.dm
+++ b/code/datums/spells/ethereal_jaunt.dm
@@ -3,9 +3,7 @@
desc = "This spell creates your ethereal form, temporarily making you invisible and able to pass through walls."
base_cooldown = 300
- clothes_req = TRUE
invocation = "none"
- invocation_type = "none"
cooldown_min = 100 //50 deciseconds reduction per rank
nonabstract_req = TRUE
centcom_cancast = FALSE //Prevent people from getting to centcom
@@ -82,13 +80,10 @@
/obj/effect/dummy/spell_jaunt
name = "water"
- icon = 'icons/effects/effects.dmi'
icon_state = "nothing"
var/reappearing = 0
var/movedelay = 0
var/movespeed = 2
- density = FALSE
- anchored = TRUE
invisibility = 60
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm
index 42ec46f0c39..8c3ff442c3d 100644
--- a/code/datums/spells/horsemask.dm
+++ b/code/datums/spells/horsemask.dm
@@ -3,7 +3,6 @@
desc = "This spell triggers a curse on a target, causing them to wield an unremovable horse head mask. They will speak like a horse! Any masks they are wearing will be disintegrated. This spell does not require robes."
base_cooldown = 150
clothes_req = FALSE
- stat_allowed = CONSCIOUS
invocation = "KN'A FTAGHU, PUCK 'BTHNK!"
invocation_type = "shout"
cooldown_min = 30 //30 deciseconds reduction per rank
diff --git a/code/datums/spells/infinite_guns.dm b/code/datums/spells/infinite_guns.dm
index a7666232db5..133f5e99a11 100644
--- a/code/datums/spells/infinite_guns.dm
+++ b/code/datums/spells/infinite_guns.dm
@@ -1,10 +1,8 @@
/datum/spell/infinite_guns
name = "Lesser Summon Guns"
desc = "Why reload when you have infinite guns? Summons an unending stream of bolt action rifles. Requires both hands free to use."
- invocation_type = "none"
base_cooldown = 600
- clothes_req = TRUE
cooldown_min = 10 //Gun wizard
action_icon_state = "bolt_action"
var/gun_type = /obj/item/gun/projectile/shotgun/boltaction/enchanted
diff --git a/code/datums/spells/knock.dm b/code/datums/spells/knock.dm
index 816c529a0de..6610f421df4 100644
--- a/code/datums/spells/knock.dm
+++ b/code/datums/spells/knock.dm
@@ -2,7 +2,6 @@
name = "Knock"
desc = "This spell opens nearby doors and does not require wizard garb."
- base_cooldown = 100
clothes_req = FALSE
invocation = "AULIE OXIN FIERA"
invocation_type = "whisper"
diff --git a/code/datums/spells/lightning.dm b/code/datums/spells/lightning.dm
index c7e79e2e103..820138236f8 100644
--- a/code/datums/spells/lightning.dm
+++ b/code/datums/spells/lightning.dm
@@ -2,7 +2,6 @@
name = "Lightning Bolt"
desc = "Throws a lightning bolt at your enemies. Classic. When clicked will start to charge in power. Then click on a mob to send the bolt before it overloads with power."
base_cooldown = 30 SECONDS
- clothes_req = TRUE
invocation = "UN'LTD P'WAH!"
invocation_type = "shout"
cooldown_min = 3 SECONDS
diff --git a/code/datums/spells/magnet.dm b/code/datums/spells/magnet.dm
index bd16a7f3174..7d2386290e6 100644
--- a/code/datums/spells/magnet.dm
+++ b/code/datums/spells/magnet.dm
@@ -5,7 +5,6 @@
base_cooldown = 30 SECONDS
clothes_req = FALSE
invocation = "UN'LTD P'WAH!"
- invocation_type = "none"
cooldown_min = 3 SECONDS
charge_sound = new /sound('sound/magic/lightning_chargeup.ogg', channel = 7)
max_charge_time = 10 SECONDS
diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm
index eda8b982241..d5ec808cf01 100644
--- a/code/datums/spells/mime.dm
+++ b/code/datums/spells/mime.dm
@@ -67,7 +67,6 @@
invocation_emote_self = "You form a blockade in front of yourself."
base_cooldown = 60 SECONDS
sound = null
- clothes_req = FALSE
action_icon_state = "mime_bigwall"
action_background_icon_state = "bg_mime"
diff --git a/code/datums/spells/mime_malaise.dm b/code/datums/spells/mime_malaise.dm
index 85c3a94966b..f9130e2e62a 100644
--- a/code/datums/spells/mime_malaise.dm
+++ b/code/datums/spells/mime_malaise.dm
@@ -6,7 +6,6 @@
hand_path = /obj/item/melee/touch_attack/mime_malaise
base_cooldown = 300
- clothes_req = TRUE
cooldown_min = 100 //50 deciseconds reduction per rank
action_icon_state = "mime_curse"
diff --git a/code/datums/spells/mind_transfer.dm b/code/datums/spells/mind_transfer.dm
index 2e3bad262cf..c4d6f4d182a 100644
--- a/code/datums/spells/mind_transfer.dm
+++ b/code/datums/spells/mind_transfer.dm
@@ -5,7 +5,6 @@
base_cooldown = 600
clothes_req = FALSE
invocation = "GIN'YU CAPAN"
- invocation_type = "none" // shh
selection_activated_message = "You prepare to transfer your mind. Click on a target to cast the spell."
selection_deactivated_message = "You decide that your current form is good enough."
cooldown_min = 200 //100 deciseconds reduction per rank
diff --git a/code/datums/spells/rathens.dm b/code/datums/spells/rathens.dm
index 22969027c46..7f0bac2fe82 100644
--- a/code/datums/spells/rathens.dm
+++ b/code/datums/spells/rathens.dm
@@ -2,7 +2,6 @@
name = "Rathen's Secret"
desc = "Summons a powerful shockwave around you that tears the appendix out of enemies, and occasionally removes their limbs."
base_cooldown = 50 SECONDS
- clothes_req = TRUE
invocation = "APPEN NATH!"
invocation_type = "shout"
cooldown_min = 20 SECONDS
diff --git a/code/datums/spells/rod_form.dm b/code/datums/spells/rod_form.dm
index 774dcfd6273..cd24317033b 100644
--- a/code/datums/spells/rod_form.dm
+++ b/code/datums/spells/rod_form.dm
@@ -1,8 +1,6 @@
/datum/spell/rod_form
name = "Rod Form"
desc = "Take on the form of an immovable rod, destroying all in your path."
- clothes_req = TRUE
- human_req = FALSE
base_cooldown = 600
cooldown_min = 200
invocation = "CLANG!"
diff --git a/code/datums/spells/shapeshift.dm b/code/datums/spells/shapeshift.dm
index dedd0133b69..fee6e1197c3 100644
--- a/code/datums/spells/shapeshift.dm
+++ b/code/datums/spells/shapeshift.dm
@@ -2,7 +2,6 @@
name = "Shapechange"
desc = "Take on the shape of another for a time to use their natural abilities. Once you've made your choice it cannot be changed."
clothes_req = FALSE
- human_req = FALSE
base_cooldown = 200
cooldown_min = 50
invocation = "RAC'WA NO!"
diff --git a/code/datums/spells/spacetime_dist.dm b/code/datums/spells/spacetime_dist.dm
index da95d214f68..76c412591ae 100644
--- a/code/datums/spells/spacetime_dist.dm
+++ b/code/datums/spells/spacetime_dist.dm
@@ -8,7 +8,6 @@
action_icon_state = "spacetime"
base_cooldown = 30 SECONDS
- clothes_req = TRUE
invocation = "none"
centcom_cancast = FALSE //Prevent people from getting to centcom
cooldown_min = 30 SECONDS //No reduction, just more range.
@@ -75,7 +74,6 @@
/obj/effect/cross_action
name = "cross me"
desc = "for crossing."
- anchored = TRUE
/obj/effect/cross_action/spacetime_dist
name = "spacetime distortion"
diff --git a/code/datums/spells/summon_mob.dm b/code/datums/spells/summon_mob.dm
index 8cce12e9f7f..1ab8de630f0 100644
--- a/code/datums/spells/summon_mob.dm
+++ b/code/datums/spells/summon_mob.dm
@@ -1,7 +1,6 @@
/datum/spell/summonmob
name = "Summon Servant"
desc = "This spell can be used to call your servant, whenever you need it."
- base_cooldown = 10 SECONDS
clothes_req = FALSE
invocation = "JE VES"
invocation_type = "whisper"
diff --git a/code/datums/spells/summon_supermatter.dm b/code/datums/spells/summon_supermatter.dm
index 64ed0cfee85..32505003456 100644
--- a/code/datums/spells/summon_supermatter.dm
+++ b/code/datums/spells/summon_supermatter.dm
@@ -5,7 +5,6 @@
cooldown_min = 60 SECONDS
summon_type = list(/obj/machinery/atmospherics/supermatter_crystal/shard)
action_icon_state = "summon_supermatter"
- summon_amt = 1
aoe_range = 0
/datum/spell/aoe/conjure/summon_supermatter/cast(list/targets, mob/living/user = usr)
diff --git a/code/datums/spells/summonitem.dm b/code/datums/spells/summonitem.dm
index 753283d2cc9..d7e46b6e3fc 100644
--- a/code/datums/spells/summonitem.dm
+++ b/code/datums/spells/summonitem.dm
@@ -1,7 +1,6 @@
/datum/spell/summonitem
name = "Instant Summons"
desc = "This spell can be used to recall a previously marked item to your hand from anywhere in the universe."
- base_cooldown = 100
clothes_req = FALSE
invocation = "GAR YOK"
invocation_type = "whisper"
diff --git a/code/datums/spells/touch_attacks.dm b/code/datums/spells/touch_attacks.dm
index f3aca8ff3fc..5f041a9d72a 100644
--- a/code/datums/spells/touch_attacks.dm
+++ b/code/datums/spells/touch_attacks.dm
@@ -2,7 +2,6 @@
var/hand_path = /obj/item/melee/touch_attack
var/obj/item/melee/touch_attack/attached_hand = null
var/on_remove_message = TRUE
- invocation_type = "none" //you scream on connecting, not summoning
/datum/spell/touch/create_new_targeting()
return new /datum/spell_targeting/self
@@ -54,7 +53,6 @@
hand_path = /obj/item/melee/touch_attack/disintegrate
base_cooldown = 600
- clothes_req = TRUE
cooldown_min = 200 //100 deciseconds reduction per rank
action_icon_state = "gib"
@@ -65,7 +63,6 @@
hand_path = /obj/item/melee/touch_attack/fleshtostone
base_cooldown = 600
- clothes_req = TRUE
cooldown_min = 200 //100 deciseconds reduction per rank
action_icon_state = "statue"
@@ -76,7 +73,6 @@
hand_path = /obj/item/melee/touch_attack/plushify
base_cooldown = 600
- clothes_req = TRUE
cooldown_min = 200 //100 deciseconds reduction per rank
action_icon_state = "plush"
diff --git a/code/datums/spells/wizard_spells.dm b/code/datums/spells/wizard_spells.dm
index feda605ccc3..6d94d5fe0bc 100644
--- a/code/datums/spells/wizard_spells.dm
+++ b/code/datums/spells/wizard_spells.dm
@@ -3,7 +3,6 @@
desc = "This spell fires several, slow moving, magic projectiles at nearby targets."
base_cooldown = 200
- clothes_req = TRUE
invocation = "FORTI GY AMA"
invocation_type = "shout"
cooldown_min = 60 //35 deciseconds reduction per rank
@@ -86,7 +85,6 @@
desc = "This spell causes you to turn into a hulk and gain laser vision for a short while."
base_cooldown = 400
- clothes_req = TRUE
invocation = "BIRUZ BENNAR"
invocation_type = "shout"
message = "You feel strong! You feel a pressure building behind your eyes!"
@@ -113,7 +111,6 @@
base_cooldown = 120
clothes_req = FALSE
invocation = "none"
- invocation_type = "none"
cooldown_min = 20 //25 deciseconds reduction per rank
smoke_type = SMOKE_COUGHING
@@ -128,7 +125,6 @@
name = "Disable Tech"
desc = "This spell disables all weapons, cameras and most other technology in range."
base_cooldown = 40 SECONDS
- clothes_req = TRUE
invocation = "NEC CANTIO"
invocation_type = "shout"
cooldown_min = 200 //50 deciseconds reduction per rank
@@ -143,9 +139,7 @@
desc = "This spell randomly teleports you a short distance."
base_cooldown = 20
- clothes_req = TRUE
invocation = "none"
- invocation_type = "none"
cooldown_min = 5 //4 deciseconds reduction per rank
@@ -170,7 +164,6 @@
desc = "This spell teleports you to a type of area of your selection."
base_cooldown = 600
- clothes_req = TRUE
invocation = "SCYAR NILA"
invocation_type = "shout"
cooldown_min = 200 //100 deciseconds reduction per rank
@@ -189,7 +182,6 @@
desc = "This spell teleports you back to your teacher."
base_cooldown = 30 SECONDS
- clothes_req = TRUE
invocation = "SCYAR TESO"
invocation_type = "shout"
cooldown_min = 10 SECONDS
@@ -235,11 +227,9 @@
name = "Stop Time"
desc = "This spell stops time for everyone except for you, allowing you to move freely while your enemies and even projectiles are frozen."
base_cooldown = 50 SECONDS
- clothes_req = TRUE
invocation = "TOKI WO TOMARE"
invocation_type = "shout"
cooldown_min = 100
- summon_amt = 1
delay = 0
action_icon_state = "time"
@@ -252,7 +242,6 @@
desc = "This spell conjures a simple carp."
base_cooldown = 1200
- clothes_req = TRUE
invocation = "NOUK FHUNMM SACP RISSKA"
invocation_type = "shout"
@@ -268,7 +257,6 @@
base_cooldown = 600
clothes_req = FALSE
invocation = "none"
- invocation_type = "none"
summon_type = list(/obj/structure/constructshell)
@@ -340,7 +328,6 @@
action_icon_state = "fireball0"
sound = 'sound/magic/fireball.ogg'
- active = FALSE
/datum/spell/fireball/apprentice
centcom_cancast = FALSE
@@ -390,13 +377,11 @@
fireball_type = /obj/item/projectile/homing/magic/homing_fireball
selection_activated_message = "You prepare to cast your greater homing fireball spell! Left-click to cast at a target!"
- base_cooldown = 6 SECONDS
/datum/spell/aoe/repulse
name = "Repulse"
desc = "This spell throws everything around the user away."
base_cooldown = 40 SECONDS
- clothes_req = TRUE
invocation = "GITTAH WEIGH"
invocation_type = "shout"
cooldown_min = 150
@@ -476,7 +461,6 @@
name = "Corpse Explosion"
desc = "Fills a corpse with energy, causing it to explode violently."
base_cooldown = 5 SECONDS
- clothes_req = TRUE
invocation = "JAH ITH BER"
invocation_type = "whisper"
selection_activated_message = "You prepare to detonate a corpse. Click on a target to cast the spell."
diff --git a/code/datums/station_traits/neutral_traits.dm b/code/datums/station_traits/neutral_traits.dm
index b23210aa338..99fbdb174fb 100644
--- a/code/datums/station_traits/neutral_traits.dm
+++ b/code/datums/station_traits/neutral_traits.dm
@@ -1,20 +1,17 @@
/datum/station_trait/bananium_shipment
name = "Bananium Shipment"
- trait_type = STATION_TRAIT_NEUTRAL
weight = 5
report_message = "An unidentified benefactor has dispatched a mysterious shipment to your station's clown. It was reported to smell faintly of bananas."
trait_to_give = STATION_TRAIT_BANANIUM_SHIPMENTS
/datum/station_trait/tranquilite_shipment
name = "Tranquilite Shipment"
- trait_type = STATION_TRAIT_NEUTRAL
weight = 5
report_message = "Shipping records show an unmarked crate being delivered to your station's mime."
trait_to_give = STATION_TRAIT_TRANQUILITE_SHIPMENTS
/datum/station_trait/unique_ai
name = "Unique AI"
- trait_type = STATION_TRAIT_NEUTRAL
weight = 15
show_in_report = TRUE
report_message = "For experimental purposes, this station AI might show divergence from default lawset. Do not meddle with this experiment, we've removed \
@@ -25,7 +22,6 @@
/datum/station_trait/glitched_pdas
name = "PDA glitch"
- trait_type = STATION_TRAIT_NEUTRAL
weight = 15
show_in_report = TRUE
report_message = "Something seems to be wrong with the PDAs issued to you all this shift. Nothing too bad though."
@@ -33,7 +29,6 @@
/datum/station_trait/late_arrivals
name = "Late Arrivals"
- trait_type = STATION_TRAIT_NEUTRAL
weight = 5
show_in_report = TRUE
report_message = "Sorry for that, we didn't expect to fly into that vomiting goose while bringing you to your new station."
@@ -51,7 +46,6 @@
/datum/station_trait/hangover
name = "Hangover"
- trait_type = STATION_TRAIT_NEUTRAL
weight = 5
show_in_report = TRUE
report_message = "Ohh....Man....That mandatory office party from last shift...God that was awesome..I woke up in some random toilet 3 sectors away..."
@@ -68,7 +62,6 @@
/datum/station_trait/triple_ai
name = "AI Triumvirate"
- trait_type = STATION_TRAIT_NEUTRAL
weight = 1
show_in_report = TRUE
report_message = "As part of Operation Magi, your station has been equipped with three Nanotrasen Artificial Intelligence models. Please try not to break them."
@@ -84,7 +77,6 @@
/datum/station_trait/rave
name = "Rave"
- trait_type = STATION_TRAIT_NEUTRAL
weight = 5
show_in_report = TRUE
report_message = "Our workers have installed new 'Motivational' lighting for you."
@@ -103,7 +95,6 @@
/datum/station_trait/scryers
name = "Scryers"
- trait_type = STATION_TRAIT_NEUTRAL
weight = 5
show_in_report = TRUE
report_message = "Nanotrasen has chosen your station for an experiment - everyone has free scryers! Use these to talk to other people easily and privately."
diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm
index 834a79c5f67..115044e016b 100644
--- a/code/datums/status_effects/buffs.dm
+++ b/code/datums/status_effects/buffs.dm
@@ -2,7 +2,6 @@
/datum/status_effect/his_grace
id = "his_grace"
- duration = -1
tick_interval = 4
alert_type = /atom/movable/screen/alert/status_effect/his_grace
var/bloodlust = 0
@@ -240,7 +239,6 @@
/datum/status_effect/vampire_gladiator
id = "vampire_gladiator"
duration = 30 SECONDS
- tick_interval = 1 SECONDS
alert_type = /atom/movable/screen/alert/status_effect/vampire_gladiator
/atom/movable/screen/alert/status_effect/vampire_gladiator
@@ -326,8 +324,6 @@
//Hippocratic Oath: Applied when the Rod of Asclepius is activated.
/datum/status_effect/hippocratic_oath
id = "Hippocratic Oath"
- status_type = STATUS_EFFECT_UNIQUE
- duration = -1
tick_interval = 25
examine_text = "They seem to have an aura of healing and helpfulness about them."
alert_type = null
@@ -497,9 +493,7 @@
/datum/status_effect/fleshmend
id = "fleshmend"
- duration = -1
status_type = STATUS_EFFECT_REFRESH
- tick_interval = 1 SECONDS
alert_type = null
/// This diminishes the healing of fleshmend the higher it is.
var/tolerance = 1
@@ -546,8 +540,6 @@
/datum/status_effect/speedlegs
id = "speedlegs"
- duration = -1
- status_type = STATUS_EFFECT_UNIQUE
tick_interval = 4 SECONDS
alert_type = null
var/stacks = 0
@@ -640,8 +632,6 @@
/datum/status_effect/breaching_and_cleaving
id = "breaching_and_cleaving"
- duration = -1
- status_type = STATUS_EFFECT_UNIQUE
alert_type = /atom/movable/screen/alert/status_effect/breaching_and_cleaving
var/datum/armor/cleaving_armor_boost = new /datum/armor(0, 30, 30, 30, 0, 0, 50, 0, 0)
@@ -667,9 +657,7 @@
/datum/status_effect/hope
id = "hope"
- duration = -1
tick_interval = 2 SECONDS
- status_type = STATUS_EFFECT_UNIQUE
alert_type = /atom/movable/screen/alert/status_effect/hope
/atom/movable/screen/alert/status_effect/hope
@@ -723,8 +711,6 @@
/datum/status_effect/drill_payback
id = "drill_payback"
- duration = -1
- status_type = STATUS_EFFECT_UNIQUE
alert_type = null
var/drilled_successfully = FALSE
var/times_warned = 0
@@ -763,7 +749,6 @@
/datum/status_effect/thrall_net
id = "thrall_net"
tick_interval = 2 SECONDS
- duration = -1
alert_type = null
var/blood_cost_per_tick = 5
var/list/target_UIDs = list()
@@ -945,7 +930,6 @@
/datum/status_effect/flayer_rejuv
id = "rejuvination"
duration = 5 SECONDS
- tick_interval = 1 SECONDS
alert_type = /atom/movable/screen/alert/status_effect/flayer_rejuv
var/heal_amount = 5 // 25 total healing of both brute and burn at base
@@ -1034,7 +1018,6 @@
/datum/status_effect/terminator_form
id = "terminator_form"
duration = 1 MINUTES
- tick_interval = 1 SECONDS
status_type = STATUS_EFFECT_REFRESH
alert_type = /atom/movable/screen/alert/status_effect/terminator_form
var/mutable_appearance/eye
@@ -1060,9 +1043,6 @@
#define COMBUSTION_TEMPERATURE 500
/datum/status_effect/overclock
id = "overclock"
- duration = -1
- tick_interval = 1 SECONDS
- status_type = STATUS_EFFECT_UNIQUE
alert_type = /atom/movable/screen/alert/status_effect/overclock
/// How much do we heat up per tick?
var/heat_per_tick = 5
diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm
index 2c5acaf69cc..4f045b3cfbe 100644
--- a/code/datums/status_effects/debuffs.dm
+++ b/code/datums/status_effects/debuffs.dm
@@ -3,7 +3,6 @@
/// does minor damage over time unless holding His Grace
/datum/status_effect/his_wrath
id = "his_wrath"
- duration = -1
tick_interval = 4
alert_type = /atom/movable/screen/alert/status_effect/his_wrath
@@ -27,7 +26,6 @@
/// is a cult ghost and can't use manifest runes, can see ghosts and dies if too far from summoner
/datum/status_effect/cultghost
id = "cult_ghost"
- duration = -1
alert_type = null
var/damage = 7.5
var/source_UID
@@ -80,7 +78,6 @@
/datum/status_effect/saw_bleed
id = "saw_bleed"
- duration = -1 //removed under specific conditions
tick_interval = 6
alert_type = null
var/mutable_appearance/bleed_overlay
@@ -1004,7 +1001,6 @@
/datum/status_effect/cryo_beam
id = "cryo beam"
alert_type = null
- duration = -1 //Kill it, get out of sight, or be killed. Jump boots are *required*
tick_interval = 0.5 SECONDS
var/damage = 0.75
var/source_UID
@@ -1030,8 +1026,6 @@
/datum/status_effect/bubblegum_curse
id = "bubblegum curse"
alert_type = /atom/movable/screen/alert/status_effect/bubblegum_curse
- duration = -1 //Kill it. There is no other option.
- tick_interval = 1 SECONDS
/// The damage the status effect does per tick.
var/damage = 0.75
var/source_UID
@@ -1474,7 +1468,6 @@
/datum/status_effect/temporal_slash_finisher
id = "temporal_slash_finisher"
- status_type = STATUS_EFFECT_UNIQUE
alert_type = null
tick_interval = 0.25 SECONDS
/// How many times the user has been cut. Each cut adds a damage value below
diff --git a/code/datums/status_effects/gas.dm b/code/datums/status_effects/gas.dm
index fa1ed6ad2af..6375e03dca6 100644
--- a/code/datums/status_effects/gas.dm
+++ b/code/datums/status_effects/gas.dm
@@ -1,7 +1,6 @@
/datum/status_effect/freon
id = "frozen"
duration = 100
- status_type = STATUS_EFFECT_UNIQUE
alert_type = /atom/movable/screen/alert/status_effect/freon
var/icon/cube
var/can_melt = TRUE
diff --git a/code/datums/status_effects/magic_disguise.dm b/code/datums/status_effects/magic_disguise.dm
index 16f0fb65911..b864b51bec2 100644
--- a/code/datums/status_effects/magic_disguise.dm
+++ b/code/datums/status_effects/magic_disguise.dm
@@ -1,6 +1,5 @@
/datum/status_effect/magic_disguise
id = "magic_disguise"
- duration = -1
tick_interval = -1
alert_type = /atom/movable/screen/alert/status_effect/magic_disguise
status_type = STATUS_EFFECT_REPLACE
diff --git a/code/datums/status_effects/neutral.dm b/code/datums/status_effects/neutral.dm
index 2f1d5abad74..1b8c182b92b 100644
--- a/code/datums/status_effects/neutral.dm
+++ b/code/datums/status_effects/neutral.dm
@@ -3,8 +3,6 @@
/// tracks the damage dealt to this mob by kinetic crushers
/datum/status_effect/crusher_damage
id = "crusher_damage"
- duration = -1
- status_type = STATUS_EFFECT_UNIQUE
alert_type = null
var/total_damage = 0
@@ -294,7 +292,6 @@
/datum/status_effect/limited_bonus/revivable
id = "revivable"
alert_type = null
- status_type = STATUS_EFFECT_UNIQUE
duration = BASE_DEFIB_TIME_LIMIT
/datum/status_effect/limited_bonus/revivable/on_apply()
@@ -340,7 +337,6 @@
/datum/status_effect/lwap_scope
id = "lwap_scope"
alert_type = null
- duration = -1
tick_interval = 4
/// The number of people the gun has locked on to. Caps at 10 for sanity.
var/locks = 0
diff --git a/code/datums/status_effects/status_effect.dm b/code/datums/status_effects/status_effect.dm
index 086a4e21878..861e1242d2f 100644
--- a/code/datums/status_effects/status_effect.dm
+++ b/code/datums/status_effects/status_effect.dm
@@ -182,11 +182,9 @@
/datum/status_effect/stacking
id = "stacking_base"
- duration = -1 //removed under specific conditions
alert_type = null
var/stacks = 0 //how many stacks are accumulated, also is # of stacks that target will have when first applied
var/delay_before_decay //deciseconds until ticks start occuring, which removes stacks (first stack will be removed at this time plus tick_interval)
- tick_interval = 10 //deciseconds between decays once decay starts
var/stack_decay = 1 //how many stacks are lost per tick (decay trigger)
var/stack_threshold //special effects trigger when stacks reach this amount
var/max_stacks //stacks cannot exceed this amount
diff --git a/code/datums/uplink_items/uplink_general.dm b/code/datums/uplink_items/uplink_general.dm
index 88553cc4976..9c1aa48ef51 100644
--- a/code/datums/uplink_items/uplink_general.dm
+++ b/code/datums/uplink_items/uplink_general.dm
@@ -787,7 +787,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
reference = "MSTV"
item = /obj/item/mod/module/visor/thermal
cost = 15 // Don't forget, you need to get a modsuit to go with this
- surplus = 10 //You don't need more than
/datum/uplink_item/suits/night
name = "MODsuit Night Visor Module"
@@ -795,7 +794,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
reference = "MSNV"
item = /obj/item/mod/module/visor/night
cost = 5 // It's night vision, rnd pumps out those goggles for anyone man.
- surplus = 10 //You don't need more than one
/datum/uplink_item/suits/plate_compression
name = "MODsuit Plate Compression Module"
@@ -833,7 +831,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
reference = "FNAF"
item = /obj/item/mod/module/springlock/bite_of_87
cost = 5
- surplus = 10
/datum/uplink_item/suits/hidden_holster
name = "Hidden Holster Module"
@@ -841,7 +838,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
reference = "HHM"
item = /obj/item/mod/module/holster/hidden
cost = 5
- surplus = 10
/datum/uplink_item/suits/smoke_grenade
name = "Smoke Grenade Module"
@@ -849,7 +845,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
reference = "SGM"
item = /obj/item/mod/module/dispenser/smoke
cost = 10
- surplus = 10
////////////////////////////////////////
// MARK: IMPLANTS
diff --git a/code/datums/uplink_items/uplink_nuclear.dm b/code/datums/uplink_items/uplink_nuclear.dm
index 52972f245e7..8fa51decf7e 100644
--- a/code/datums/uplink_items/uplink_nuclear.dm
+++ b/code/datums/uplink_items/uplink_nuclear.dm
@@ -300,7 +300,6 @@
item = /obj/item/ammo_box/magazine/mm762x51
cost = 60
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
- surplus = 0
/datum/uplink_item/ammo/sniper
cost = 15
@@ -356,7 +355,6 @@
item = /obj/item/ammo_box/foambox/riot
cost = 10
uplinktypes = list(UPLINK_TYPE_NUCLEAR, UPLINK_TYPE_SST)
- surplus = 0
////////////////////////////////////////
// MARK: EXPLOSIVES
@@ -669,22 +667,17 @@
reference = "NSB"
cost = 55
excludefrom = list(UPLINK_TYPE_TRAITOR, UPLINK_TYPE_SIT)
- surplus = 0
hijack_only = FALSE
/datum/uplink_item/explosives/emp_bomb/nuke
reference = "NSBEMP"
cost = 50
excludefrom = list(UPLINK_TYPE_TRAITOR, UPLINK_TYPE_SIT)
- surplus = 0
- can_discount = FALSE
/datum/uplink_item/explosives/atmosfiregrenades/nuke
reference = "NAPG"
cost = 60
excludefrom = list(UPLINK_TYPE_TRAITOR, UPLINK_TYPE_SIT)
- surplus = 0
- hijack_only = TRUE
/datum/uplink_item/stealthy_tools/chameleon/nuke
reference = "NCHAM"
diff --git a/code/datums/weather/weather_types/floor_is_lava.dm b/code/datums/weather/weather_types/floor_is_lava.dm
index d0511f9faef..6348084f174 100644
--- a/code/datums/weather/weather_types/floor_is_lava.dm
+++ b/code/datums/weather/weather_types/floor_is_lava.dm
@@ -16,7 +16,6 @@
area_types = list(/area)
protected_areas = list(/area/space)
- target_trait = STATION_LEVEL
overlay_layer = ABOVE_OPEN_TURF_LAYER //Covers floors only
overlay_plane = FLOOR_PLANE
diff --git a/code/datums/weather/weather_types/lavaland_weather.dm b/code/datums/weather/weather_types/lavaland_weather.dm
index 755fe2c05d4..0b1161e29a3 100644
--- a/code/datums/weather/weather_types/lavaland_weather.dm
+++ b/code/datums/weather/weather_types/lavaland_weather.dm
@@ -7,7 +7,6 @@
desc = "An intense atmospheric storm lifts ash off of the planet's surface and billows it down across the area, dealing intense fire damage to the unprotected."
telegraph_message = "An eerie moan rises on the wind. Sheets of burning ash blacken the horizon. Seek shelter."
- telegraph_duration = 300
telegraph_overlay = "light_ash"
weather_message = "Smoldering clouds of scorching ash billow down around you! Get inside!"
@@ -16,7 +15,6 @@
weather_overlay = "ash_storm"
end_message = "The shrieking wind whips away the last of the ash and falls to its usual murmur. It should be safe to go outside now."
- end_duration = 300
end_overlay = "light_ash"
area_types = list(/area/lavaland/surface/outdoors, /area/lavaland/surface/gulag_rock)
@@ -114,7 +112,6 @@
end_sound = null
aesthetic = TRUE
- probability = 25
/// MARK: Volcano
/datum/weather/volcano
@@ -131,7 +128,6 @@
weather_sound = 'sound/weather/volcano/lavaland_volcano_eruption.ogg'
// No end message. Radar will give you the safety message on this one, or your instincts
- end_duration = 300
end_message = ""
area_types = list(/area/lavaland/surface/outdoors, /area/lavaland/surface/gulag_rock)
@@ -192,7 +188,6 @@
desc = "Get out of the way!"
layer = FLY_LAYER
randomdir = FALSE
- duration = ROCKFALL_DELAY
pixel_z = 270
/obj/effect/temp_visual/rockfall/Initialize(mapload)
@@ -206,7 +201,6 @@
icon_state = "sniper_zoom"
layer = BELOW_MOB_LAYER
light_range = 2
- duration = ROCKFALL_DELAY
/obj/effect/temp_visual/rock_target/ex_act()
return
@@ -263,7 +257,6 @@
weather_overlay = "acid_rain"
end_message = "The pitter of acidic dropples slows to silence. It should be safe to go outside now."
- end_duration = 300
end_overlay = "light_ash"
area_types = list(/area/lavaland/surface/outdoors, /area/lavaland/surface/gulag_rock)
@@ -381,7 +374,6 @@
weather_overlay = "wind"
end_message = "The wind calms into its normal rhythms, dust settling back to the ashen surface. It should be safe to go outside now."
- end_duration = 300
end_overlay = "light_ash"
area_types = list(/area/lavaland/surface/outdoors, /area/lavaland/surface/gulag_rock)
diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm
index 9437aec9161..541d98d3271 100644
--- a/code/datums/weather/weather_types/radiation_storm.dm
+++ b/code/datums/weather/weather_types/radiation_storm.dm
@@ -9,7 +9,6 @@
weather_message = "You feel waves of heat wash over you! Find shelter!"
weather_overlay = "ash_storm"
weather_duration_lower = 600
- weather_duration_upper = 1500
weather_color = "green"
weather_sound = 'sound/misc/bloblarm.ogg'
diff --git a/code/datums/weather/weather_types/snow_storm.dm b/code/datums/weather/weather_types/snow_storm.dm
index 927030046ac..6e9b0dfa7ad 100644
--- a/code/datums/weather/weather_types/snow_storm.dm
+++ b/code/datums/weather/weather_types/snow_storm.dm
@@ -4,13 +4,11 @@
// probability = 90
telegraph_message = "Drifting particles of snow begin to dust the surrounding area.."
- telegraph_duration = 300
telegraph_overlay = "light_snow"
weather_message = "Harsh winds pick up as dense snow begins to fall from the sky! Seek shelter!"
weather_overlay = "snow_storm"
weather_duration_lower = 600
- weather_duration_upper = 1500
end_duration = 100
end_message = "The snowfall dies down, it should be safe to go outside again."
diff --git a/code/defines/procs/announcer_datum.dm b/code/defines/procs/announcer_datum.dm
index 02273c747c9..06436880ef7 100644
--- a/code/defines/procs/announcer_datum.dm
+++ b/code/defines/procs/announcer_datum.dm
@@ -177,7 +177,6 @@ GLOBAL_DATUM_INIT(major_announcement, /datum/announcer, new(config_type = /datum
/datum/announcement_configuration/ptl
default_title = ANNOUNCE_KIND_PTL
- add_log = FALSE
sound = sound('sound/misc/notice2.ogg')
style = "major"
diff --git a/code/game/area/areas/mining_areas.dm b/code/game/area/areas/mining_areas.dm
index 62e75d15cca..71fc597393a 100644
--- a/code/game/area/areas/mining_areas.dm
+++ b/code/game/area/areas/mining_areas.dm
@@ -2,19 +2,16 @@
/area/mine
icon_state = "mining"
- has_gravity = TRUE
/area/mine/unexplored
name = "Mine"
icon_state = "unexplored"
always_unpowered = TRUE
- requires_power = TRUE
poweralm = FALSE
apc_starts_off = TRUE
outdoors = TRUE
ambientsounds = MINING_SOUNDS
sound_environment = SOUND_AREA_ASTEROID
- flags = NONE
min_ambience_cooldown = 70 SECONDS
max_ambience_cooldown = 220 SECONDS
@@ -46,7 +43,6 @@
/area/mine/outpost
name = "Mining Station"
- icon_state = "mining"
sound_environment = SOUND_AREA_STANDARD_STATION
request_console_name = "Mining Outpost"
request_console_flags = RC_SUPPLY
@@ -150,7 +146,6 @@
/area/lavaland
icon_state = "mining"
- has_gravity = TRUE
sound_environment = SOUND_AREA_LAVALAND
/area/lavaland/surface
@@ -159,7 +154,6 @@
always_unpowered = TRUE
poweralm = FALSE
apc_starts_off = TRUE
- requires_power = TRUE
ambientsounds = MINING_SOUNDS
min_ambience_cooldown = 70 SECONDS
max_ambience_cooldown = 220 SECONDS
diff --git a/code/game/area/areas/ruins/blackmarketpackers.dm b/code/game/area/areas/ruins/blackmarketpackers.dm
index ab3330a2c00..f0b3932931a 100644
--- a/code/game/area/areas/ruins/blackmarketpackers.dm
+++ b/code/game/area/areas/ruins/blackmarketpackers.dm
@@ -2,9 +2,7 @@
/area/ruin/unpowered/bmp_ship
name = "\improper BMP Asteroids"
- icon_state = "away"
report_alerts = FALSE
- requires_power = TRUE
/area/ruin/unpowered/bmp_ship/aft
name = "\improper BMP Aft Block"
diff --git a/code/game/area/areas/ruins/space_areas.dm b/code/game/area/areas/ruins/space_areas.dm
index efc9538b664..5655880967c 100644
--- a/code/game/area/areas/ruins/space_areas.dm
+++ b/code/game/area/areas/ruins/space_areas.dm
@@ -7,7 +7,6 @@
requires_power = FALSE
/area/ruin/space/unpowered
- always_unpowered = FALSE
/area/ruin/space/unpowered/no_grav
has_gravity = FALSE
@@ -65,7 +64,6 @@
/area/ruin/space/djstation/solars
name = "\improper Soviet DJ Station Solars"
- icon_state = "DJ"
//Methlab
/area/ruin/space/methlab
diff --git a/code/game/area/away_content_areas.dm b/code/game/area/away_content_areas.dm
index dcaccc16073..e9f75c1a707 100644
--- a/code/game/area/away_content_areas.dm
+++ b/code/game/area/away_content_areas.dm
@@ -9,11 +9,9 @@
/area/awaymission/example
name = "\improper Strange Station"
- icon_state = "away"
/area/awaymission/desert
name = "Mars"
- icon_state = "away"
/area/awaymission/beach
name = "Beach"
diff --git a/code/game/area/centcom_areas.dm b/code/game/area/centcom_areas.dm
index 7feeaf9dee4..ae64a5b402f 100644
--- a/code/game/area/centcom_areas.dm
+++ b/code/game/area/centcom_areas.dm
@@ -48,7 +48,6 @@
/area/centcom/docks
name = "\improper Central Command Docks"
- icon_state = "centcom"
// Admin areas
@@ -79,11 +78,9 @@
/area/tdome/arena_source
name = "\improper Thunderdome Arena Template"
- icon_state = "thunder"
/area/tdome/arena
name = "\improper Thunderdome Arena"
- icon_state = "thunder"
/area/tdome/tdomeadmin
name = "\improper Thunderdome (Admin.)"
@@ -99,7 +96,6 @@
name = "\improper Abductor Ship"
icon_state = "yellow"
requires_power = FALSE
- has_gravity = TRUE
/area/wizard_station
name = "\improper Wizard's Den"
@@ -133,7 +129,6 @@
name = "Ghost Bar"
icon_state = "observatory"
requires_power = FALSE
- has_gravity = TRUE
hide_attacklogs = TRUE
/area/backrooms
diff --git a/code/game/area/holodeck_areas.dm b/code/game/area/holodeck_areas.dm
index 8f845910ebf..b1cda04e3f6 100644
--- a/code/game/area/holodeck_areas.dm
+++ b/code/game/area/holodeck_areas.dm
@@ -11,7 +11,6 @@
/area/holodeck/source_plating
name = "\improper Holodeck - Off"
- icon_state = "Holodeck"
/area/holodeck/source_emptycourt
name = "\improper Holodeck - Empty Court"
@@ -27,7 +26,6 @@
/area/holodeck/source_beach
name = "\improper Holodeck - Beach"
- icon_state = "Holodeck" // Lazy.
/area/holodeck/source_burntest
name = "\improper Holodeck - Atmospheric Burn Test"
diff --git a/code/game/area/misc_areas.dm b/code/game/area/misc_areas.dm
index 6e5df61490d..fa52bbfa7a2 100644
--- a/code/game/area/misc_areas.dm
+++ b/code/game/area/misc_areas.dm
@@ -4,7 +4,6 @@
icon_state = "start"
requires_power = FALSE
dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
- has_gravity = TRUE
ambientsounds = null // No ambient sounds in the lobby
diff --git a/code/game/area/shuttle_areas.dm b/code/game/area/shuttle_areas.dm
index 25de11dce34..62df869e12f 100644
--- a/code/game/area/shuttle_areas.dm
+++ b/code/game/area/shuttle_areas.dm
@@ -96,10 +96,8 @@
/area/shuttle/administration/centcom
name = "\improper Nanotrasen Vessel Centcom"
- icon_state = "shuttlered"
/area/shuttle/administration/station
- name = "\improper Nanotrasen Vessel"
icon_state = "shuttlered2"
// === Trying to remove these areas:
diff --git a/code/game/area/ss13_areas/ai_areas.dm b/code/game/area/ss13_areas/ai_areas.dm
index f650b62404b..85a420dfae3 100644
--- a/code/game/area/ss13_areas/ai_areas.dm
+++ b/code/game/area/ss13_areas/ai_areas.dm
@@ -37,7 +37,6 @@
/area/station/turret_protected/aisat/interior
name = "\improper AI Satellite Antechamber"
- icon_state = "ai"
sound_environment = SOUND_AREA_LARGE_ENCLOSED
/area/station/turret_protected/aisat/interior/secondary
diff --git a/code/game/area/ss13_areas/engineering_areas.dm b/code/game/area/ss13_areas/engineering_areas.dm
index b2d739c6b11..f7abe08f717 100644
--- a/code/game/area/ss13_areas/engineering_areas.dm
+++ b/code/game/area/ss13_areas/engineering_areas.dm
@@ -7,12 +7,10 @@
/area/station/engineering/atmos/control
name = "Atmospherics Control Room"
icon_state = "atmosctrl"
- request_console_flags = RC_ASSIST | RC_SUPPLY
request_console_name = "Atmospherics"
/area/station/engineering/atmos/distribution
name = "Atmospherics Distribution Loop"
- icon_state = "atmos"
/area/station/engineering/atmos/storage
name = "Atmospherics Hardsuit Storage"
@@ -31,7 +29,6 @@
/area/station/engineering/atmos/asteroid_filtering
name = "Asteroid Filtering"
icon_state = "asteroid_atmos"
- sound_environment = SOUND_AREA_LARGE_ENCLOSED
/area/station/engineering/atmos/asteroid_core
name = "Asteroid Molten Core"
diff --git a/code/game/area/ss13_areas/legal_areas.dm b/code/game/area/ss13_areas/legal_areas.dm
index 551d542a39c..528f01cef1e 100644
--- a/code/game/area/ss13_areas/legal_areas.dm
+++ b/code/game/area/ss13_areas/legal_areas.dm
@@ -6,7 +6,6 @@
/area/station/legal/courtroom/gallery
name = "\improper Courtroom Gallery"
- icon_state = "courtroom"
request_console_name = "Courtroom"
/area/station/legal/lawoffice
diff --git a/code/game/area/ss13_areas/medical_areas.dm b/code/game/area/ss13_areas/medical_areas.dm
index 38efae8f9f2..4c19a60597f 100644
--- a/code/game/area/ss13_areas/medical_areas.dm
+++ b/code/game/area/ss13_areas/medical_areas.dm
@@ -71,7 +71,6 @@
/area/station/medical/virology/lab
name = "\improper Virology Laboratory"
- icon_state = "virology"
/area/station/medical/morgue
name = "\improper Morgue"
@@ -100,7 +99,6 @@
/area/station/medical/surgery/observation
name = "Surgery Observation"
- icon_state = "surgery"
/area/station/medical/cryo
name = "Cryogenics"
diff --git a/code/game/area/ss13_areas/public_areas.dm b/code/game/area/ss13_areas/public_areas.dm
index 13e38956841..062f3e5dfa0 100644
--- a/code/game/area/ss13_areas/public_areas.dm
+++ b/code/game/area/ss13_areas/public_areas.dm
@@ -89,15 +89,12 @@
icon_state = "hall_space"
/area/station/hallway/spacebridge/security
- icon_state = "hall_space"
name = "\improper Security Space Bridge"
/area/station/hallway/spacebridge/security/west
- icon_state = "hall_space"
name = "\improper Security West Space Bridge"
/area/station/hallway/spacebridge/security/south
- icon_state = "hall_space"
name = "\improper Security South Space Bridge"
/area/station/hallway/spacebridge/dockmed
@@ -189,7 +186,6 @@
/area/station/public/sleep/secondary
name = "\improper Secondary Cryogenic Dormitories"
- icon_state = "Sleep"
/area/station/public/locker
name = "\improper Locker Room"
@@ -255,7 +251,6 @@
/area/station/public/storage/emergency/port
name = "Port Emergency Storage"
- icon_state = "emergencystorage"
/area/station/public/storage/office
name = "Office Supplies"
diff --git a/code/game/area/ss13_areas/security_areas.dm b/code/game/area/ss13_areas/security_areas.dm
index 7e6db172b93..2db3ce91d8d 100644
--- a/code/game/area/ss13_areas/security_areas.dm
+++ b/code/game/area/ss13_areas/security_areas.dm
@@ -129,8 +129,6 @@
icon_state = "checkpoint1"
/area/station/security/checkpoint/secondary
- name = "\improper Security Checkpoint"
- icon_state = "checkpoint1"
request_console_flags = RC_ASSIST | RC_INFO
request_console_name = "Security"
diff --git a/code/game/area/ss13_areas/service_areas.dm b/code/game/area/ss13_areas/service_areas.dm
index f1e5b1e81f7..90b46c7942c 100644
--- a/code/game/area/ss13_areas/service_areas.dm
+++ b/code/game/area/ss13_areas/service_areas.dm
@@ -43,7 +43,6 @@
/area/station/service/chapel/office
name = "\improper Chapel Office"
icon_state = "chapeloffice"
- request_console_flags = RC_SUPPLY
request_console_name = "Chapel"
/area/station/service/clown
diff --git a/code/game/area/ss13_areas/supply_areas.dm b/code/game/area/ss13_areas/supply_areas.dm
index dd8303d5723..cb22786119b 100644
--- a/code/game/area/ss13_areas/supply_areas.dm
+++ b/code/game/area/ss13_areas/supply_areas.dm
@@ -11,7 +11,6 @@
/area/station/supply/sorting
name = "\improper Delivery Office"
icon_state = "cargomail"
- sound_environment = SOUND_AREA_STANDARD_STATION
request_console_flags = RC_SUPPLY
request_console_name = "Cargo Bay"
diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm
index ed0ebb93a1a..8d27e3633d8 100644
--- a/code/game/dna/dna_modifier.dm
+++ b/code/game/dna/dna_modifier.dm
@@ -304,10 +304,8 @@
/obj/machinery/computer/scan_consolenew
name = "\improper DNA Modifier access console"
desc = "Allows you to scan and modify DNA."
- icon = 'icons/obj/computer.dmi'
icon_screen = "dna"
icon_keyboard = "med_key"
- density = TRUE
circuit = /obj/item/circuitboard/scan_consolenew
var/selected_ui_block = 1.0
var/selected_ui_subblock = 1.0
@@ -323,7 +321,6 @@
var/obj/machinery/dna_scannernew/connected = null
var/obj/item/disk/data/disk = null
var/selected_menu_key = PAGE_UI
- anchored = TRUE
idle_power_consumption = 10
active_power_consumption = 400
diff --git a/code/game/dna/mutations/disabilities.dm b/code/game/dna/mutations/disabilities.dm
index c19f1693067..60063fa4a56 100644
--- a/code/game/dna/mutations/disabilities.dm
+++ b/code/game/dna/mutations/disabilities.dm
@@ -482,8 +482,6 @@
base_cooldown = 600
clothes_req = FALSE
- stat_allowed = CONSCIOUS
- invocation_type = "none"
var/list/compatible_mobs = list(/mob/living/carbon/human)
action_icon_state = "genetic_incendiary"
diff --git a/code/game/dna/mutations/mutation_powers.dm b/code/game/dna/mutations/mutation_powers.dm
index a79158b7003..4b9a4b319e7 100644
--- a/code/game/dna/mutations/mutation_powers.dm
+++ b/code/game/dna/mutations/mutation_powers.dm
@@ -301,12 +301,10 @@
base_cooldown = 1200
clothes_req = FALSE
- stat_allowed = CONSCIOUS
antimagic_flags = NONE
selection_activated_message = "Your mind grow cold. Click on a target to cast the spell."
selection_deactivated_message = "Your mind returns to normal."
- invocation_type = "none"
var/list/compatible_mobs = list(/mob/living/carbon/human)
action_icon_state = "genetic_cryo"
@@ -390,8 +388,6 @@
base_cooldown = 300
clothes_req = FALSE
- stat_allowed = CONSCIOUS
- invocation_type = "none"
antimagic_flags = NONE
action_icon_state = "genetic_eat"
@@ -538,8 +534,6 @@
base_cooldown = 60
clothes_req = FALSE
- stat_allowed = CONSCIOUS
- invocation_type = "none"
antimagic_flags = NONE
action_icon_state = "genetic_jump"
@@ -660,12 +654,10 @@
base_cooldown = 1800
clothes_req = FALSE
- stat_allowed = CONSCIOUS
selection_activated_message = "You body becomes unstable. Click on a target to cast transform into them."
selection_deactivated_message = "Your body calms down again."
- invocation_type = "none"
antimagic_flags = NONE
action_icon_state = "genetic_poly"
@@ -713,8 +705,6 @@
base_cooldown = 18 SECONDS
clothes_req = FALSE
human_req = TRUE
- stat_allowed = CONSCIOUS
- invocation_type = "none"
antimagic_flags = MAGIC_RESISTANCE_MIND
action_icon_state = "genetic_empath"
@@ -823,8 +813,6 @@
base_cooldown = 1800
clothes_req = FALSE
- stat_allowed = CONSCIOUS
- invocation_type = "none"
antimagic_flags = NONE
action_icon_state = "genetic_morph"
@@ -1014,8 +1002,6 @@
base_cooldown = 0
clothes_req = FALSE
- stat_allowed = CONSCIOUS
- invocation_type = "none"
antimagic_flags = MAGIC_RESISTANCE_MIND
action_icon_state = "genetic_project"
@@ -1050,9 +1036,7 @@
desc = "Offer people a chance to share their thoughts!"
base_cooldown = 0
clothes_req = FALSE
- stat_allowed = CONSCIOUS
antimagic_flags = MAGIC_RESISTANCE_MIND
- invocation_type = "none"
action_icon_state = "genetic_mindscan"
var/list/expanded_minds = list()
@@ -1135,11 +1119,8 @@
/datum/spell/remoteview
name = "Remote View"
desc = "Spy on people from any range!"
- base_cooldown = 10 SECONDS
clothes_req = FALSE
- stat_allowed = CONSCIOUS
- invocation_type = "none"
antimagic_flags = MAGIC_RESISTANCE_MIND
action_icon_state = "genetic_view"
diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm
index c4831ac28b4..fb880fd2dad 100644
--- a/code/game/gamemodes/changeling/traitor_chan.dm
+++ b/code/game/gamemodes/changeling/traitor_chan.dm
@@ -5,7 +5,6 @@
restricted_jobs = list("Cyborg")
secondary_restricted_jobs = list("AI") // Allows AI to roll traitor, but not changeling
required_players = 10
- required_enemies = 1 // how many of each type are required
recommended_enemies = 3
secondary_enemies_scaling = 0.025
species_to_mindflayer = list("Machine")
diff --git a/code/game/gamemodes/cult/blood_magic.dm b/code/game/gamemodes/cult/blood_magic.dm
index 6ae16d39b69..5366ffd69e0 100644
--- a/code/game/gamemodes/cult/blood_magic.dm
+++ b/code/game/gamemodes/cult/blood_magic.dm
@@ -264,7 +264,6 @@
return TRUE
/datum/spell/horror
- active = FALSE
ranged_mousepointer = 'icons/effects/cult_target.dmi'
var/datum/action/innate/cult/blood_spell/attached_action
@@ -376,7 +375,6 @@
flags = ABSTRACT | DROPDEL
w_class = WEIGHT_CLASS_HUGE
- throwforce = 0
throw_range = 0
throw_speed = 0
/// Does it have a source, AKA bloody empowerment.
diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm
index 975dff51867..0c832552ab1 100644
--- a/code/game/gamemodes/cult/cult_items.dm
+++ b/code/game/gamemodes/cult/cult_items.dm
@@ -2,7 +2,6 @@
name = "arcane tome"
desc = "An old, dusty tome with frayed edges and a sinister-looking cover."
icon_state = "tome"
- throw_speed = 2
throw_range = 5
w_class = WEIGHT_CLASS_SMALL
@@ -143,7 +142,6 @@
desc = "A bulky suit of armor, bristling with spikes. It looks space proof."
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/tome, /obj/item/melee/cultblade, /obj/item/tank/internals)
- slowdown = 1
armor = list(MELEE = 115, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 20, FIRE = 35, ACID = 150)
magical = TRUE
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
@@ -155,7 +153,6 @@
item_state = "cult_armour"
w_class = WEIGHT_CLASS_BULKY
armor = list(MELEE = 50, BULLET = 35, LASER = 50, ENERGY = 20, BOMB = 50, RAD = 20, FIRE = 50, ACID = 75)
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
allowed = list(/obj/item/tome, /obj/item/melee/cultblade)
hoodtype = /obj/item/clothing/head/hooded/cult_hoodie
@@ -164,7 +161,6 @@
desc = "An armored hood, heavily reinforced with dark metal. The inscriptions covering the interior fill you with confidence and determination."
icon_state = "cult_hoodalt"
armor = list(MELEE = 35, BULLET = 20, LASER = 35, ENERGY = 10, BOMB = 15, RAD = 0, FIRE = 5, ACID = 5)
- body_parts_covered = HEAD
flags = BLOCKHAIR
flags_inv = HIDEFACE
flags_cover = HEADCOVERSEYES
@@ -195,9 +191,7 @@
desc = "A set of blood-soaked robes inscribed with unholy sigils. Wearing them greatly increases movement speed, but the cursed fabrics will take an additional tithe when the wearer is hit."
icon_state = "flagellantrobe"
item_state = "flagellantrobe"
- flags_inv = HIDEJUMPSUIT
allowed = list(/obj/item/tome, /obj/item/melee/cultblade)
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
armor = list(MELEE = -25, BULLET = -25, LASER = -25, ENERGY = -25, BOMB = -25, RAD = -25, FIRE = 0, ACID = 0)
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
@@ -268,7 +262,6 @@
desc = "A thick blindfold made of dark cloth. The runes and sigils sewn into the fabric amplify the vision of the faithful."
icon_state = "blindfold"
item_state = "blindfold"
- see_in_dark = 8
invis_override = SEE_INVISIBLE_HIDDEN_RUNES
flash_protect = FLASH_PROTECTION_FLASH
prescription = TRUE
@@ -567,10 +560,8 @@
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
base_icon_state = "bloodspear"
icon_state = "bloodspear0"
- slot_flags = 0
force = 17
throwforce = 30
- throw_speed = 2
armour_penetration_percentage = 50
attack_verb = list("attacked", "impaled", "stabbed", "torn", "gored")
sharp = TRUE
@@ -643,7 +634,6 @@
/datum/action/innate/cult/spear
name = "Bloody Bond"
desc = "Recall the blood spear to your hand."
- button_background_icon_state = "bg_cult"
button_overlay_icon_state = "bloodspear"
default_button_position = "11:31,4:-2"
var/obj/item/cult_spear/spear
@@ -802,8 +792,6 @@
name = "eldritch portal"
desc = "An evil portal made by dark magics. Surprisingly stable."
icon_state = "portal1"
- failchance = 0
- precision = FALSE
var/obj/effect/cult_portal_exit/exit = null
/obj/effect/portal/cult/Initialize(mapload, target, creator, lifespan)
diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
index e27c265712d..84afcd86611 100644
--- a/code/game/gamemodes/cult/cult_structures.dm
+++ b/code/game/gamemodes/cult/cult_structures.dm
@@ -330,7 +330,6 @@ GLOBAL_LIST_INIT(blacklisted_pylon_turfs, typecacheof(list(
icon = 'icons/obj/cult.dmi'
icon_state = "hole"
density = TRUE
- anchored = TRUE
/obj/effect/gateway/singularity_act()
return
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index 8f3d4fb3395..3a9e83e937d 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -19,7 +19,6 @@ To draw a rune, use a ritual dagger.
desc = "An odd collection of symbols drawn in what seems to be blood."
/// Description that cultists see
var/cultist_desc = "a basic rune with no function." //This is shown to cultists who examine the rune in order to determine its true purpose.
- anchored = TRUE
icon = 'icons/obj/rune.dmi'
icon_state = "1"
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
@@ -260,9 +259,7 @@ structure_check() searches for nearby cultist structures required for the invoca
cultist_desc = "offers non-cultists on top of it to the Dark One, either converting or sacrificing them. Sacrifices with a soul will result in a captured soulshard. This can be done with brains as well."
invocation = "Mah'weyh pleggh at e'ntrath!"
icon_state = "offering"
- req_cultists = 1
allow_excess_invokers = TRUE
- rune_in_use = FALSE
/obj/effect/rune/convert/invoke(list/invokers)
if(rune_in_use)
@@ -815,7 +812,6 @@ structure_check() searches for nearby cultist structures required for the invoca
invoke_damage = 15
construct_invoke = FALSE
var/tick_damage = 10 // 30 burn damage total + damage taken by being on fire/overheating
- rune_in_use = FALSE
/obj/effect/rune/blood_boil/invoke(list/invokers)
if(rune_in_use)
diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm
index ea3ca4752f1..355431a38c8 100644
--- a/code/game/gamemodes/dynamic/dynamic.dm
+++ b/code/game/gamemodes/dynamic/dynamic.dm
@@ -3,7 +3,6 @@ GLOBAL_LIST_EMPTY(dynamic_forced_rulesets)
/datum/game_mode/dynamic
name = "Dynamic"
config_tag = "dynamic"
- required_players = 0
/// Non-implied rulesets in play
var/list/datum/ruleset/rulesets = list()
/// Implied rulesets that are in play
diff --git a/code/game/gamemodes/extended/extended.dm b/code/game/gamemodes/extended/extended.dm
index 3ccb08f7b93..3a3f83e31b6 100644
--- a/code/game/gamemodes/extended/extended.dm
+++ b/code/game/gamemodes/extended/extended.dm
@@ -1,7 +1,6 @@
/datum/game_mode/extended
name = "extended"
config_tag = "extended"
- required_players = 0
single_antag_positions = list()
/datum/game_mode/extended/announce()
diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm
index 8ccd218f1c2..eb64cbf6ebc 100644
--- a/code/game/gamemodes/malfunction/Malf_Modules.dm
+++ b/code/game/gamemodes/malfunction/Malf_Modules.dm
@@ -490,7 +490,6 @@
desc = "Overheats a machine, causing a moderately-sized explosion after a short time."
action_icon_state = "overload_machine"
uses = 4
- active = FALSE
ranged_mousepointer = 'icons/effects/cult_target.dmi'
selection_activated_message = "You tap into the station's powernet. Click on a machine to detonate it, or use the ability again to cancel."
selection_deactivated_message = "You release your hold on the powernet."
@@ -935,7 +934,6 @@
name = "Roll Over"
action_icon_state = "roll_over"
desc = "Allows you to roll over in the direction of your choosing, crushing anything in your way."
- auto_use_uses = FALSE
ranged_mousepointer = 'icons/effects/cult_target.dmi'
selection_activated_message = "Your inner servos shift as you prepare to roll around. Click adjacent tiles to roll into them!"
selection_deactivated_message = "You disengage your rolling protocols."
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
index 390b06419a7..27b9997be14 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm
@@ -240,7 +240,6 @@ CONTENTS:
item_state = "wonderprod"
slot_flags = ITEM_SLOT_BELT
origin_tech = "materials=4;combat=4;biotech=7;abductor=4"
- w_class = WEIGHT_CLASS_NORMAL
actions_types = list(/datum/action/item_action/toggle_mode)
/obj/item/abductor_baton/proc/toggle(mob/living/user = usr)
@@ -629,7 +628,6 @@ Congratulations! You are now trained for invasive xenobiology research!"}
name = "alien wrench"
desc = "A polarized wrench. It causes anything placed between the jaws to turn."
icon = 'icons/obj/abductor.dmi'
- icon_state = "wrench"
belt_icon = null
usesound = 'sound/effects/empulse.ogg'
toolspeed = 0.1
@@ -639,7 +637,6 @@ Congratulations! You are now trained for invasive xenobiology research!"}
name = "alien welding tool"
desc = "An alien welding tool. Whatever fuel it uses, it never runs out."
icon = 'icons/obj/abductor.dmi'
- icon_state = "welder"
belt_icon = null
toolspeed = 0.1
w_class = WEIGHT_CLASS_SMALL
@@ -653,7 +650,6 @@ Congratulations! You are now trained for invasive xenobiology research!"}
name = "alien crowbar"
desc = "A hard-light crowbar. It appears to pry by itself, without any effort required."
icon = 'icons/obj/abductor.dmi'
- icon_state = "crowbar"
belt_icon = null
usesound = 'sound/weapons/sonic_jackhammer.ogg'
toolspeed = 0.1
@@ -664,7 +660,6 @@ Congratulations! You are now trained for invasive xenobiology research!"}
name = "alien wirecutters"
desc = "Extremely sharp wirecutters, made out of a silvery-green metal."
icon = 'icons/obj/abductor.dmi'
- icon_state = "cutters"
belt_icon = null
toolspeed = 0.1
origin_tech = "materials=5;engineering=4;abductor=3"
@@ -678,7 +673,6 @@ Congratulations! You are now trained for invasive xenobiology research!"}
name = "alien multitool"
desc = "An omni-technological interface."
icon = 'icons/obj/abductor.dmi'
- icon_state = "multitool"
belt_icon = null
toolspeed = 0.1
w_class = WEIGHT_CLASS_SMALL
@@ -775,7 +769,6 @@ Congratulations! You are now trained for invasive xenobiology research!"}
mopcap = 100
origin_tech = "materials=3;engineering=3;abductor=2"
refill_rate = 50
- refill_reagent = "water"
mopspeed = 10
/obj/item/soap/syndie/abductor
@@ -852,7 +845,6 @@ Congratulations! You are now trained for invasive xenobiology research!"}
desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?"
icon = 'icons/obj/abductor.dmi'
buildstacktype = /obj/item/stack/sheet/mineral/abductor
- icon_state = "bed"
/obj/structure/table_frame/abductor
name = "alien table frame"
@@ -873,7 +865,6 @@ Congratulations! You are now trained for invasive xenobiology research!"}
base_icon_state = "alien_table"
buildstack = /obj/item/stack/sheet/mineral/abductor
framestack = /obj/item/stack/sheet/mineral/abductor
- buildstackamount = 1
framestackamount = 1
smoothing_groups = list(SMOOTH_GROUP_ABDUCTOR_TABLES)
canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_TABLES)
diff --git a/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm b/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm
index 9593ccc5c40..c753fd8c52f 100644
--- a/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm
+++ b/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm
@@ -11,8 +11,6 @@
/datum/surgery_step/generic/cauterize
)
possible_locs = list(BODY_ZONE_CHEST)
- requires_organic_bodypart = TRUE
- requires_bodypart = TRUE
/datum/surgery/organ_extraction/can_start(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/mob/living/carbon/human/H = user
@@ -36,8 +34,6 @@
/datum/surgery_step/generic/cauterize
)
possible_locs = list(BODY_ZONE_CHEST)
- requires_organic_bodypart = TRUE
- requires_bodypart = TRUE
/datum/surgery/organ_extraction_boneless/can_start(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
var/mob/living/carbon/human/H = user
@@ -122,7 +118,6 @@
)
possible_locs = list(BODY_ZONE_CHEST)
requires_organic_bodypart = FALSE
- requires_bodypart = TRUE
/datum/surgery_step/internal/extract_organ/synth
name = "remove cell"
diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm
index 10477b2f1e3..b169adc13d8 100644
--- a/code/game/gamemodes/miniantags/abduction/gland.dm
+++ b/code/game/gamemodes/miniantags/abduction/gland.dm
@@ -119,7 +119,6 @@
cooldown_high = 1200
uses = -1
icon_state = "slime"
- mind_control_uses = 1
mind_control_duration = 2400
/obj/item/organ/internal/heart/gland/slime/insert(mob/living/carbon/M, special = 0)
@@ -139,7 +138,6 @@
cooldown_high = 700
uses = -1
icon_state = "mindshock"
- mind_control_uses = 1
mind_control_duration = 6000
/obj/item/organ/internal/heart/gland/mindshock/trigger()
@@ -180,7 +178,6 @@
uses = 1
icon_state = "vent"
mind_control_uses = 4
- mind_control_duration = 1800
/obj/item/organ/internal/heart/gland/ventcrawling/trigger()
to_chat(owner, "You feel very stretchy.")
@@ -192,8 +189,6 @@
cooldown_high = 2400
uses = 1
icon_state = "viral"
- mind_control_uses = 1
- mind_control_duration = 1800
/obj/item/organ/internal/heart/gland/viral/trigger()
to_chat(owner, "You feel sick.")
@@ -230,7 +225,6 @@
uses = 10
icon_state = "emp"
mind_control_uses = 3
- mind_control_duration = 1800
/obj/item/organ/internal/heart/gland/emp/trigger()
to_chat(owner, "You feel a spike of pain in your head.")
@@ -251,12 +245,10 @@
S.master_commander = owner
/obj/item/organ/internal/heart/gland/egg
- cooldown_low = 300
cooldown_high = 400
uses = -1
icon_state = "egg"
mind_control_uses = 2
- mind_control_duration = 1800
/obj/item/organ/internal/heart/gland/egg/trigger()
owner.visible_message("[owner] [pick(EGG_LAYING_MESSAGES)]")
@@ -326,7 +318,6 @@
cooldown_high = 1800
origin_tech = "materials=4;biotech=4;plasmatech=6;abductor=3"
uses = -1
- mind_control_uses = 1
mind_control_duration = 800
/obj/item/organ/internal/heart/gland/plasma/trigger()
diff --git a/code/game/gamemodes/miniantags/demons/demon.dm b/code/game/gamemodes/miniantags/demons/demon.dm
index 91aa036212b..a012434a263 100644
--- a/code/game/gamemodes/miniantags/demons/demon.dm
+++ b/code/game/gamemodes/miniantags/demons/demon.dm
@@ -6,11 +6,9 @@
response_help = "thinks better of touching"
response_disarm = "flails at"
response_harm = "punches"
- speed = 1
a_intent = INTENT_HARM
mob_biotypes = MOB_ORGANIC | MOB_HUMANOID
stop_automated_movement = TRUE
- status_flags = CANPUSH
attack_sound = 'sound/misc/demon_attack1.ogg'
death_sound = 'sound/misc/demon_dies.ogg'
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
diff --git a/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm b/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm
index dedc9c679ee..96f4257fff6 100644
--- a/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm
+++ b/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm
@@ -24,7 +24,6 @@
You may use the blood crawl icon when on blood pools to travel through them, appearing and dissapearing from the station at will. \
Pulling a dead or critical mob while you enter a pool will pull them in with you, allowing you to feast. \
You move quickly upon leaving a pool of blood, but the material world will soon sap your strength and leave you sluggish. "
- del_on_death = TRUE
deathmessage = "screams in anger as it collapses into a puddle of viscera!"
@@ -107,7 +106,6 @@
desc = "Sense the location of heretics."
base_cooldown = 0
clothes_req = FALSE
- cooldown_min = 0
overlay = null
action_icon_state = "bloodcrawl"
action_background_icon_state = "bg_cult"
@@ -209,7 +207,6 @@
/obj/item/organ/internal/heart/demon
name = "demon heart"
desc = "Still it beats furiously, emanating an aura of utter hate."
- icon = 'icons/obj/surgery.dmi'
icon_state = "demon_heart"
origin_tech = "combat=5;biotech=7"
organ_datums = list(/datum/organ/heart/always_beating, /datum/organ/battery)
diff --git a/code/game/gamemodes/miniantags/guardian/guardian.dm b/code/game/gamemodes/miniantags/guardian/guardian.dm
index 72b73aebee1..adf830b6a06 100644
--- a/code/game/gamemodes/miniantags/guardian/guardian.dm
+++ b/code/game/gamemodes/miniantags/guardian/guardian.dm
@@ -26,7 +26,6 @@
maxHealth = INFINITY //The spirit itself is invincible
health = INFINITY
environment_smash = 0
- obj_damage = 40
melee_damage_lower = 15
melee_damage_upper = 15
AIStatus = AI_OFF
@@ -398,7 +397,6 @@
to_chat(user, "[G.magic_fluff_string].")
/obj/item/guardiancreator/choose
- random = FALSE
/obj/item/guardiancreator/tech
name = "holoparasite injector"
@@ -442,7 +440,6 @@
return !used
/obj/item/guardiancreator/tech/choose
- random = FALSE
/obj/item/guardiancreator/biological
name = "scarab egg cluster"
@@ -479,12 +476,10 @@
G.speak_emote = list("chitters")
/obj/item/guardiancreator/biological/choose
- random = FALSE
/obj/item/paper/guardian
name = "Holoparasite Guide"
- icon_state = "paper"
info = {"A list of Holoparasite Types
diff --git a/code/game/gamemodes/miniantags/guardian/types/explosive_guardian.dm b/code/game/gamemodes/miniantags/guardian/types/explosive_guardian.dm
index 70121417183..d5da7e6c075 100644
--- a/code/game/gamemodes/miniantags/guardian/types/explosive_guardian.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/explosive_guardian.dm
@@ -1,6 +1,4 @@
/mob/living/simple_animal/hostile/guardian/bomb
- melee_damage_lower = 15
- melee_damage_upper = 15
damage_transfer = 0.6
range = 13
playstyle_string = "As an Explosive type, you have only moderate close combat abilities, but are capable of converting any adjacent item into a disguised bomb via alt click even when not manifested."
diff --git a/code/game/gamemodes/miniantags/guardian/types/healer.dm b/code/game/gamemodes/miniantags/guardian/types/healer.dm
index 845cea11d5b..bc043c8792e 100644
--- a/code/game/gamemodes/miniantags/guardian/types/healer.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/healer.dm
@@ -4,10 +4,7 @@
/mob/living/simple_animal/hostile/guardian/healer
friendly = "heals"
- speed = 0
damage_transfer = 0.7
- melee_damage_lower = 15
- melee_damage_upper = 15
playstyle_string = "As a Support type, you may toggle your basic attacks to a healing mode, or a surgical mode. In addition, Alt-Clicking on an adjacent mob will warp them to your bluespace beacon after a short delay."
magic_fluff_string = "..And draw the CMO, a potent force of life...and death."
tech_fluff_string = "Boot sequence complete. Medical modules active. Bluespace modules activated. Holoparasite swarm online."
@@ -27,8 +24,6 @@
icon_state = "seal"
attacktext = "slaps"
speak_emote = list("barks")
- friendly = "heals"
- speed = 0
melee_damage_lower = 0
melee_damage_upper = 0
melee_damage_type = STAMINA
diff --git a/code/game/gamemodes/miniantags/guardian/types/protector.dm b/code/game/gamemodes/miniantags/guardian/types/protector.dm
index 09bc1a9fd3b..39db9deeb97 100644
--- a/code/game/gamemodes/miniantags/guardian/types/protector.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/protector.dm
@@ -2,8 +2,6 @@
#define RIGHT_SHEILD TRUE
/mob/living/simple_animal/hostile/guardian/protector
- melee_damage_lower = 15
- melee_damage_upper = 15
range = 15 //worse for it due to how it leashes
damage_transfer = 0.4
playstyle_string = "As a Protector type you cause your summoner to leash to you instead of you leashing to them and have two modes; Combat Mode, where you do and take medium damage, and Protection Mode, where you do and take almost no damage, but move slightly slower, as well as have a protective shield. Nobody can walk through your shield, but you can still move your shield through them."
@@ -112,7 +110,6 @@
/obj/effect/guardianshield
name = "guardian's shield"
desc = "A guardian's defensive wall."
- icon = 'icons/effects/effects.dmi'
icon_state = "shield-grey"
can_be_hit = TRUE
var/mob/living/simple_animal/hostile/guardian/protector/linked_guardian
diff --git a/code/game/gamemodes/miniantags/guardian/types/ranged.dm b/code/game/gamemodes/miniantags/guardian/types/ranged.dm
index 862fe56ff11..d4d9d7cf16f 100644
--- a/code/game/gamemodes/miniantags/guardian/types/ranged.dm
+++ b/code/game/gamemodes/miniantags/guardian/types/ranged.dm
@@ -2,14 +2,12 @@
name = "crystal spray"
icon_state = "guardian"
damage = 20
- damage_type = BRUTE
armour_penetration_percentage = 100
/mob/living/simple_animal/hostile/guardian/ranged
friendly = "quietly assesses"
melee_damage_lower = 10
melee_damage_upper = 10
- damage_transfer = 1
projectiletype = /obj/item/projectile/guardian
ranged_cooldown_time = 5 //fast!
projectilesound = 'sound/effects/hit_on_shattered_glass.ogg'
diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm
index 346f7af7023..139ded6b2dc 100644
--- a/code/game/gamemodes/miniantags/morph/morph.dm
+++ b/code/game/gamemodes/miniantags/morph/morph.dm
@@ -7,14 +7,12 @@
desc = "A revolting, pulsating pile of flesh."
speak_emote = list("gurgles")
emote_hear = list("gurgles")
- icon = 'icons/mob/animal.dmi'
icon_state = "morph"
icon_living = "morph"
icon_dead = "morph_dead"
speed = 1.5
a_intent = INTENT_HARM
stop_automated_movement = TRUE
- status_flags = CANPUSH
pass_flags = PASSTABLE
move_resist = MOVE_FORCE_STRONG // Fat being
ventcrawler = VENTCRAWLER_ALWAYS
@@ -24,7 +22,6 @@
minbodytemp = 0
maxHealth = 150
health = 150
- environment_smash = 1
obj_damage = 50
melee_damage_lower = 15
melee_damage_upper = 15
diff --git a/code/game/gamemodes/miniantags/morph/spells/ambush.dm b/code/game/gamemodes/miniantags/morph/spells/ambush.dm
index 98c79ea1e7a..8f25fdbc276 100644
--- a/code/game/gamemodes/miniantags/morph/spells/ambush.dm
+++ b/code/game/gamemodes/miniantags/morph/spells/ambush.dm
@@ -38,7 +38,6 @@
/datum/status_effect/morph_ambush
id = "morph_ambush"
- duration = -1
tick_interval = MORPH_AMBUSH_PERFECTION_TIME
alert_type = /atom/movable/screen/alert/status_effect/morph_ambush
diff --git a/code/game/gamemodes/miniantags/morph/spells/open_vent.dm b/code/game/gamemodes/miniantags/morph/spells/open_vent.dm
index 6d198248d03..6337bbe29e4 100644
--- a/code/game/gamemodes/miniantags/morph/spells/open_vent.dm
+++ b/code/game/gamemodes/miniantags/morph/spells/open_vent.dm
@@ -2,7 +2,6 @@
name = "Open Vents"
desc = "Spit out acidic puke on nearby vents or scrubbers. Will take a little while for the acid to take effect. Not usable from inside a vent."
action_icon_state = "acid_vent"
- base_cooldown = 10 SECONDS
hunger_cost = 10
/datum/spell/morph_spell/open_vent/create_new_targeting()
diff --git a/code/game/gamemodes/miniantags/morph/spells/pass_airlock.dm b/code/game/gamemodes/miniantags/morph/spells/pass_airlock.dm
index 847ee5cce00..a13e75b8422 100644
--- a/code/game/gamemodes/miniantags/morph/spells/pass_airlock.dm
+++ b/code/game/gamemodes/miniantags/morph/spells/pass_airlock.dm
@@ -2,11 +2,8 @@
/datum/spell/morph_spell/pass_airlock
name = "Pass Airlock"
desc = "Reform yourself so you can fit through a non bolted airlock. Takes a while to do and can only be used in a non disguised form."
- action_background_icon_state = "bg_morph"
action_icon_state = "morph_airlock"
- clothes_req = FALSE
antimagic_flags = NONE
- base_cooldown = 10 SECONDS
selection_activated_message = "Click on an airlock to try pass it."
/datum/spell/morph_spell/pass_airlock/create_new_targeting()
diff --git a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
index 526b6fcd444..e81ec0d03ae 100644
--- a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
+++ b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
@@ -21,7 +21,6 @@
emote_hear = list("vibrates", "sizzles")
speak_emote = list("modulates")
- icon = 'icons/mob/animal.dmi'
icon_state = "pulsedem"
icon_living = "pulsedem"
icon_dead = "pulsedem"
@@ -38,16 +37,13 @@
speed = -0.3
mob_size = MOB_SIZE_TINY
density = FALSE
- del_on_death = TRUE
attacktext = "electrocutes"
attack_sound = "sparks"
- a_intent = INTENT_HARM
harm_intent_damage = 0
melee_damage_lower = 0
melee_damage_upper = 0
pass_flags = PASSDOOR
- stop_automated_movement = TRUE
has_unlimited_silicon_privilege = TRUE
// this makes the demon able to speak through holopads, due to the overriden say, PD cannot speak normally regardless
universal_speak = TRUE
diff --git a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm
index 1bb1504bdaf..3731775c8bf 100644
--- a/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm
+++ b/code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm
@@ -20,7 +20,6 @@
var/revealing = FALSE
var/reveal_time = 10 SECONDS
base_cooldown = 20 SECONDS
- level_max = 4
/datum/spell/pulse_demon/New()
. = ..()
@@ -195,7 +194,6 @@
unlock_cost = 8
cast_cost = 1000 KJ
upgrade_cost = 4
- level_max = 4
requires_area = TRUE
revealing = TRUE
base_cooldown = 60 SECONDS
@@ -379,9 +377,7 @@
desc = "Toggle whether to use 200 KJ of energy to bypass electric-resistant victims immunity when attacking."
base_message = "use strong shocks when attacking."
action_icon_state = "pd_strong_shocks"
- locked = TRUE
unlock_cost = 4
- cast_cost = 0
level_max = 0
/datum/spell/pulse_demon/toggle/penetrating_shock/create_new_targeting()
diff --git a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
index 7aaec9042e9..dc75a74b1da 100644
--- a/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
+++ b/code/game/gamemodes/miniantags/revenant/revenant_abilities.dm
@@ -153,7 +153,6 @@
to_chat(M, "An alien voice resonates from all around... [msg]")
/datum/spell/aoe/revenant
- name = "Spell"
clothes_req = FALSE
action_background_icon_state = "bg_revenant"
/// How long it reveals the revenant in deciseconds
@@ -319,10 +318,8 @@
action_icon_state = "haunt"
base_cooldown = 60 SECONDS
unlock_amount = 150
- cast_amount = 50
stun = 3 SECONDS
reveal = 10 SECONDS
- aoe_range = 7
/// The maximum number of objects to haunt
var/max_targets = 7
/// A list of all attack timers started by this spell being cast
diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm
index fd6e062cb5b..a5adadec263 100644
--- a/code/game/gamemodes/nuclear/pinpointer.dm
+++ b/code/game/gamemodes/nuclear/pinpointer.dm
@@ -275,7 +275,6 @@
///////////////////////
/obj/item/pinpointer/nukeop
var/obj/docking_port/mobile/home = null
- slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_PDA
syndicate = TRUE
modes = list(MODE_DISK, MODE_NUKE)
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index cd5309db00c..0d3140de4e3 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -290,7 +290,6 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
/datum/objective/maroon
name = "Maroon"
- martyr_compatible = FALSE
delayed_objective_text = "Your objective is to make sure another crewmember doesn't leave on the Escape Shuttle. You will receive further information in a few minutes."
/datum/objective/maroon/update_explanation_text()
@@ -316,7 +315,6 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
/// I want braaaainssss
/datum/objective/debrain
name = "Debrain"
- martyr_compatible = FALSE
delayed_objective_text = "Your objective is to steal another crewmember's brain. You will receive further information in a few minutes."
/datum/objective/debrain/is_invalid_target(datum/mind/possible_target)
@@ -384,7 +382,6 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
/datum/objective/hijack
name = "Hijack"
- martyr_compatible = FALSE //Technically you won't get both anyway.
explanation_text = "Hijack the shuttle by escaping on it with no loyalist Nanotrasen crew on board and free. \
Syndicate agents, other enemies of Nanotrasen, cyborgs, pets, and cuffed/restrained hostages may be allowed on the shuttle alive. \
Alternatively, hack the shuttle console multiple times (by alt clicking on it) until the shuttle directions are corrupted."
@@ -401,7 +398,6 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
/datum/objective/hijackclone
name = "Hijack (with clones)"
explanation_text = "Hijack the shuttle by ensuring only you (or your copies) escape."
- martyr_compatible = FALSE
needs_target = FALSE
// This objective should only be given to a single owner, because the "copies" can only copy one person.
@@ -436,7 +432,6 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
explanation_text = "Hijack the shuttle by alt-clicking on the shuttle console. Do not let the crew wipe you off of it! \
Crew and agents can be on the shuttle when you do this, and may try to wipe you! \
Using the doomsday device successfully is also an option."
- martyr_compatible = FALSE
needs_target = FALSE
/datum/objective/block/check_completion()
@@ -574,7 +569,6 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
/datum/objective/steal
name = "Steal Item"
- martyr_compatible = FALSE
delayed_objective_text = "Your objective is to steal a high-value item. You will receive further information in a few minutes."
var/theft_area
var/datum/theft_objective/steal_target
diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index 434477c558d..718267cd90c 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -3,7 +3,6 @@
config_tag = "traitor"
restricted_jobs = list("Cyborg")//They are part of the AI if he is traitor so are they, they use to get double chances
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Trans-Solar Federation General", "Nanotrasen Career Trainer", "Research Director", "Head of Personnel", "Chief Medical Officer", "Chief Engineer", "Quartermaster")
- required_players = 0
required_enemies = 1
recommended_enemies = 4
/// Hard limit on traitors if scaling is turned off.
diff --git a/code/game/gamemodes/vampire/traitor_vamp.dm b/code/game/gamemodes/vampire/traitor_vamp.dm
index 813ead44caa..0077c777dbb 100644
--- a/code/game/gamemodes/vampire/traitor_vamp.dm
+++ b/code/game/gamemodes/vampire/traitor_vamp.dm
@@ -6,7 +6,6 @@
restricted_jobs = list("Cyborg")
secondary_restricted_jobs = list("AI", "Chaplain")
required_players = 10
- required_enemies = 1 // how many of each type are required
recommended_enemies = 3
secondary_enemies_scaling = 0.025
species_to_mindflayer = list("Machine")
diff --git a/code/game/gamemodes/vampire/vampire_chan.dm b/code/game/gamemodes/vampire/vampire_chan.dm
index 1a09ff5aadc..bf181421163 100644
--- a/code/game/gamemodes/vampire/vampire_chan.dm
+++ b/code/game/gamemodes/vampire/vampire_chan.dm
@@ -4,8 +4,6 @@
restricted_jobs = list("AI", "Cyborg")
protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Blueshield", "Nanotrasen Representative", "Magistrate", "Chaplain", "Internal Affairs Agent", "Nanotrasen Career Trainer", "Nanotrasen Navy Officer", "Special Operations Officer", "Syndicate Officer", "Solar Federation General", "Research Director", "Head of Personnel", "Chief Medical Officer", "Chief Engineer", "Quartermaster")
species_to_mindflayer = list("Machine")
- required_players = 15
- required_enemies = 1
recommended_enemies = 3
secondary_enemies_scaling = 0.025
vampire_penalty = 0.4 // Cut out 40% of the vampires since we'll replace some with changelings
diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm
index 08a58c36692..85c82e23927 100644
--- a/code/game/gamemodes/wizard/artefact.dm
+++ b/code/game/gamemodes/wizard/artefact.dm
@@ -80,7 +80,6 @@
item_state = "render"
force = 15
throwforce = 10
- w_class = WEIGHT_CLASS_NORMAL
hitsound = 'sound/weapons/bladeslice.ogg'
var/charged = 1
var/spawn_type = /obj/singularity/narsie/wizard
@@ -103,7 +102,6 @@
icon = 'icons/obj/biomass.dmi'
icon_state = "rift"
density = TRUE
- anchored = TRUE
var/spawn_path = /mob/living/basic/cow //defaulty cows to prevent unintentional narsies
var/spawn_amt_left = 20
@@ -835,10 +833,7 @@ GLOBAL_LIST_EMPTY(multiverse)
/obj/item/necromantic_stone/nya
name = "nya-cromantic stone"
desc = "A shard capable of resurrecting humans as creatures of Vile Heresy. Even the Wizard Federation fears it.."
- icon = 'icons/obj/wizard.dmi'
icon_state = "nyacrostone"
- item_state = "electronic"
- origin_tech = "bluespace=4;materials=4"
heresy = TRUE
unlimited = TRUE
diff --git a/code/game/gamemodes/wizard/godhand.dm b/code/game/gamemodes/wizard/godhand.dm
index f75c5a692b8..c667380bbad 100644
--- a/code/game/gamemodes/wizard/godhand.dm
+++ b/code/game/gamemodes/wizard/godhand.dm
@@ -11,8 +11,6 @@
item_state = null
flags = ABSTRACT | NODROP | DROPDEL
w_class = WEIGHT_CLASS_HUGE
- force = 0
- throwforce = 0
throw_range = 0
throw_speed = 0
new_attack_chain = TRUE
@@ -63,7 +61,6 @@
desc = "This hand of mine glows with an awesome power!"
catchphrase = "EI NATH!!"
on_use_sound = 'sound/magic/disintegrate.ogg'
- icon_state = "disintegrate"
item_state = "disintegrate"
@@ -99,7 +96,6 @@
desc = "The power to sew your foes into a doom cut from the fabric of fate."
catchphrase = "MAHR-XET 'ABL"
on_use_sound = 'sound/magic/smoke.ogg'
- icon_state = "disintegrate"
item_state = "disintegrate"
color = COLOR_PURPLE
@@ -118,7 +114,6 @@
desc = "This hand of mine glows with an awesome power! Ok, maybe just batteries."
catchphrase = "EI NATH!!"
on_use_sound = 'sound/magic/disintegrate.ogg'
- icon_state = "disintegrate"
item_state = "disintegrate"
needs_permit = FALSE
diff --git a/code/game/gamemodes/wizard/magic_tarot.dm b/code/game/gamemodes/wizard/magic_tarot.dm
index 9b93c8e0525..4f3f0795a0f 100644
--- a/code/game/gamemodes/wizard/magic_tarot.dm
+++ b/code/game/gamemodes/wizard/magic_tarot.dm
@@ -79,8 +79,6 @@
w_class = WEIGHT_CLASS_TINY
throw_speed = 3
throw_range = 10
- throwforce = 0
- force = 0
resistance_flags = FLAMMABLE
/// If a person can choose what the card produces. No cost if they can choose.
var/let_people_choose = FALSE
@@ -136,8 +134,6 @@
w_class = WEIGHT_CLASS_TINY
throw_speed = 3
throw_range = 10
- throwforce = 0
- force = 0
resistance_flags = FLAMMABLE
/// The deck that created us. Notifies it we have been deleted on use.
var/obj/item/tarot_generator/creator_deck
@@ -270,10 +266,6 @@
/obj/effect/temp_visual/card_preview/tarot
name = "a tarot card"
- icon = 'icons/obj/playing_cards.dmi'
- icon_state = "tarot_the_unknown"
- pixel_y = 20
- duration = 1.5 SECONDS
/obj/effect/temp_visual/card_preview/tarot/flourish()
var/new_filter = isnull(get_filter("ray"))
diff --git a/code/game/gamemodes/wizard/raginmages.dm b/code/game/gamemodes/wizard/raginmages.dm
index d8cc9a371f7..712f341be30 100644
--- a/code/game/gamemodes/wizard/raginmages.dm
+++ b/code/game/gamemodes/wizard/raginmages.dm
@@ -1,7 +1,6 @@
/datum/game_mode/wizard/raginmages
name = "ragin' mages"
config_tag = "raginmages"
- required_players = 20
but_wait_theres_more = TRUE
var/max_mages = 0
var/making_mage = FALSE
diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm
index 3f9efb600d9..ace93d72b8f 100644
--- a/code/game/gamemodes/wizard/spellbook.dm
+++ b/code/game/gamemodes/wizard/spellbook.dm
@@ -97,19 +97,16 @@
/datum/spellbook_entry/blind
name = "Blind"
spell_type = /datum/spell/blind
- category = "Offensive"
cost = 1
/datum/spellbook_entry/lightningbolt
name = "Lightning Bolt"
spell_type = /datum/spell/charge_up/bounce/lightning
- category = "Offensive"
cost = 1
/datum/spellbook_entry/cluwne
name = "Curse of the Cluwne"
spell_type = /datum/spell/touch/cluwne
- category = "Offensive"
/datum/spellbook_entry/banana_touch
name = "Banana Touch"
@@ -124,53 +121,43 @@
/datum/spellbook_entry/horseman
name = "Curse of the Horseman"
spell_type = /datum/spell/horsemask
- category = "Offensive"
/datum/spellbook_entry/disintegrate
name = "Disintegrate"
spell_type = /datum/spell/touch/disintegrate
- category = "Offensive"
/datum/spellbook_entry/corpse_explosion
name = "Corpse Explosion"
spell_type = /datum/spell/corpse_explosion
- category = "Offensive"
/datum/spellbook_entry/fireball
name = "Fireball"
spell_type = /datum/spell/fireball
- category = "Offensive"
/datum/spellbook_entry/summon_toolbox
name = "Homing Toolbox"
spell_type = /datum/spell/fireball/toolbox
- category = "Offensive"
cost = 1
/datum/spellbook_entry/fleshtostone
name = "Flesh to Stone"
spell_type = /datum/spell/touch/flesh_to_stone
- category = "Offensive"
/datum/spellbook_entry/plushify
name = "Plushify"
spell_type = /datum/spell/touch/plushify
- category = "Offensive"
/datum/spellbook_entry/mutate
name = "Mutate"
spell_type = /datum/spell/genetic/mutate
- category = "Offensive"
/datum/spellbook_entry/rod_form
name = "Rod Form"
spell_type = /datum/spell/rod_form
- category = "Offensive"
/datum/spellbook_entry/infinite_guns
name = "Lesser Summon Guns"
spell_type = /datum/spell/infinite_guns
- category = "Offensive"
//Defensive
/datum/spellbook_entry/disabletech
@@ -189,7 +176,6 @@
name = "Rathen's Secret"
spell_type = /datum/spell/rathens
category = "Defensive"
- cost = 2
/datum/spellbook_entry/repulse
name = "Repulse"
@@ -360,7 +346,6 @@
/datum/spellbook_entry/summon/slience_ghosts
name = "Silence Ghosts"
desc = "Tired of people talking behind your back, and spooking you? Why not silence them, and make the dead deader."
- cost = 2
is_ragin_restricted = TRUE //Salt needs to flow here, to be honest
/datum/spellbook_entry/summon/slience_ghosts/Buy(mob/living/carbon/human/user, obj/item/spellbook/book)
@@ -496,7 +481,6 @@
Capable of producing magic tarot cards of the 22 major arcana, both normal and reversed. Each card has a different effect. \
Throw the card at someone to use it on them, or use it in hand to apply it to yourself. Unlimited uses, 12 second cooldown, can have up to 5 cards in the world."
item_path = /obj/item/tarot_generator/wizard
- cost = 2
category = "Artefacts"
//Weapons and Armors
@@ -711,7 +695,6 @@
desc = "The legendary book of spells of the wizard."
icon = 'icons/obj/library.dmi'
icon_state = "spellbook"
- throw_speed = 2
throw_range = 5
w_class = WEIGHT_CLASS_TINY
var/uses = 10
diff --git a/code/game/jobs/departments.dm b/code/game/jobs/departments.dm
index 460214f334e..605d3fd7dc6 100644
--- a/code/game/jobs/departments.dm
+++ b/code/game/jobs/departments.dm
@@ -80,7 +80,6 @@
department_name = DEPARTMENT_SECURITY
account_starting_balance = DEPARTMENT_BALANCE_HIGH
- account_base_pay = DEPARTMENT_BASE_PAY_MEDIUM
account_access = list(ACCESS_HOS)
department_roles = list(
"Head of Security",
@@ -153,7 +152,6 @@
department_name = DEPARTMENT_ENGINEERING
account_starting_balance = DEPARTMENT_BALANCE_LOW
- account_base_pay = DEPARTMENT_BASE_PAY_MEDIUM
account_access = list(ACCESS_CE)
department_roles = list(
"Chief Engineer",
diff --git a/code/game/jobs/job/assistant.dm b/code/game/jobs/job/assistant.dm
index d80831349ba..ac132bdd5ad 100644
--- a/code/game/jobs/job/assistant.dm
+++ b/code/game/jobs/job/assistant.dm
@@ -10,7 +10,6 @@
access = list() //See /datum/job/assistant/get_access()
alt_titles = list("Off-Duty", "Retired", "Intern")
outfit = /datum/outfit/job/assistant
- standard_paycheck = CREW_PAY_ASSISTANT
/datum/job/assistant/get_access()
if(GLOB.configuration.jobs.assistant_maint_access)
@@ -23,7 +22,6 @@
jobtype = /datum/job/assistant
uniform = /obj/item/clothing/under/color/random
- shoes = /obj/item/clothing/shoes/black
id = /obj/item/card/id/assistant
diff --git a/code/game/jobs/job/medical_jobs.dm b/code/game/jobs/job/medical_jobs.dm
index 0dd046c8486..98faecadf42 100644
--- a/code/game/jobs/job/medical_jobs.dm
+++ b/code/game/jobs/job/medical_jobs.dm
@@ -380,7 +380,6 @@
jobtype = /datum/job/paramedic
uniform = /obj/item/clothing/under/rank/medical/paramedic
- shoes = /obj/item/clothing/shoes/black
head = /obj/item/clothing/head/soft/paramedic
mask = /obj/item/clothing/mask/cigarette
l_ear = /obj/item/radio/headset/headset_med/para
diff --git a/code/game/jobs/job/science_jobs.dm b/code/game/jobs/job/science_jobs.dm
index f1573685c0a..17631ce2457 100644
--- a/code/game/jobs/job/science_jobs.dm
+++ b/code/game/jobs/job/science_jobs.dm
@@ -209,7 +209,6 @@
uniform = /obj/item/clothing/under/rank/rnd/roboticist
suit = /obj/item/clothing/suit/storage/labcoat/robowhite
belt = /obj/item/storage/belt/utility/full
- shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/radio/headset/headset_sci
id = /obj/item/card/id/roboticist
pda = /obj/item/pda/roboticist
diff --git a/code/game/jobs/job/silicon_jobs.dm b/code/game/jobs/job/silicon_jobs.dm
index 9fdfc71b5f7..4ef6ba45e1d 100644
--- a/code/game/jobs/job/silicon_jobs.dm
+++ b/code/game/jobs/job/silicon_jobs.dm
@@ -2,7 +2,6 @@
title = "AI"
flag = JOB_AI
department_flag = JOBCAT_ENGSEC
- total_positions = 0 // Not used for AI, see is_position_available below and modules/mob/living/silicon/ai/latejoin.dm
spawn_positions = 1
selection_color = "#ccffcc"
supervisors = "your laws"
diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm
index 5dd85f39860..0119a7275f4 100644
--- a/code/game/jobs/job/supervisor.dm
+++ b/code/game/jobs/job/supervisor.dm
@@ -469,7 +469,6 @@
action_icon = 'icons/obj/clothing/accessories.dmi'
action_icon_state = "gold"
sound = null
- invocation_type = "none"
invocation = null
clothes_req = FALSE
diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm
index e700c8669d8..2ffc85bcdac 100644
--- a/code/game/jobs/job/support.dm
+++ b/code/game/jobs/job/support.dm
@@ -86,7 +86,6 @@
jobtype = /datum/job/cargo_tech
uniform = /obj/item/clothing/under/rank/cargo/tech
- shoes = /obj/item/clothing/shoes/black
l_pocket = /obj/item/mail_scanner
l_ear = /obj/item/radio/headset/headset_cargo
id = /obj/item/card/id/supply
@@ -183,7 +182,6 @@
ADD_TRAIT(H.mind, TRAIT_BUTCHER, JOB_TRAIT)
/datum/outfit/job/mining/equipped
- name = "Shaft Miner"
suit = /obj/item/clothing/suit/hooded/explorer
mask = /obj/item/clothing/mask/gas/explorer
@@ -279,7 +277,6 @@
uniform = /obj/item/clothing/under/rank/civilian/bartender
suit = /obj/item/clothing/suit/armor/vest
belt = /obj/item/storage/belt/bandolier/full
- shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/radio/headset/headset_service
glasses = /obj/item/clothing/glasses/sunglasses/reagent
id = /obj/item/card/id/bartender
@@ -328,7 +325,6 @@
uniform = /obj/item/clothing/under/rank/civilian/chef
suit = /obj/item/clothing/suit/chef
belt = /obj/item/storage/belt/chef
- shoes = /obj/item/clothing/shoes/black
head = /obj/item/clothing/head/chefhat
l_ear = /obj/item/radio/headset/headset_service
id = /obj/item/card/id/chef
@@ -370,7 +366,6 @@
suit = /obj/item/clothing/suit/apron
belt = /obj/item/storage/belt/botany/full
gloves = /obj/item/clothing/gloves/botanic_leather
- shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/radio/headset/headset_service
l_pocket = /obj/item/storage/bag/plants/portaseeder
pda = /obj/item/pda/botanist
@@ -507,7 +502,6 @@
suit = /obj/item/clothing/suit/suspenders
back = /obj/item/storage/backpack/mime
gloves = /obj/item/clothing/gloves/color/white
- shoes = /obj/item/clothing/shoes/black
head = /obj/item/clothing/head/beret
mask = /obj/item/clothing/mask/gas/mime
l_ear = /obj/item/radio/headset/headset_service
@@ -564,7 +558,6 @@
jobtype = /datum/job/janitor
uniform = /obj/item/clothing/under/rank/civilian/janitor
- shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/radio/headset/headset_service
id = /obj/item/card/id/janitor
pda = /obj/item/pda/janitor
@@ -604,7 +597,6 @@
jobtype = /datum/job/librarian
uniform = /obj/item/clothing/under/rank/civilian/librarian
- shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/radio/headset/headset_service
l_pocket = /obj/item/laser_pointer
r_pocket = /obj/item/barcodescanner
diff --git a/code/game/jobs/job/support_chaplain.dm b/code/game/jobs/job/support_chaplain.dm
index 2dbf0662ae3..dcb6fcbabae 100644
--- a/code/game/jobs/job/support_chaplain.dm
+++ b/code/game/jobs/job/support_chaplain.dm
@@ -23,7 +23,6 @@
jobtype = /datum/job/chaplain
uniform = /obj/item/clothing/under/rank/civilian/chaplain
- shoes = /obj/item/clothing/shoes/black
l_ear = /obj/item/radio/headset/headset_service
id = /obj/item/card/id/chaplain
pda = /obj/item/pda/chaplain
diff --git a/code/game/jobs/job/syndicate_jobs.dm b/code/game/jobs/job/syndicate_jobs.dm
index 99418e9aa27..9dbc283dbd9 100644
--- a/code/game/jobs/job/syndicate_jobs.dm
+++ b/code/game/jobs/job/syndicate_jobs.dm
@@ -19,7 +19,6 @@
jobtype = /datum/job/syndicateofficer
uniform = /obj/item/clothing/under/syndicate
- back = /obj/item/storage/backpack
head = /obj/item/clothing/head/beret
gloves = /obj/item/clothing/gloves/combat
shoes = /obj/item/clothing/shoes/magboots/elite
diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm
index f53ffc6c786..426052de2ef 100644
--- a/code/game/machinery/PDApainter.dm
+++ b/code/game/machinery/PDApainter.dm
@@ -5,7 +5,6 @@
icon_state = "pdapainter"
density = TRUE
anchored = TRUE
- max_integrity = 200
var/obj/item/pda/storedpda = null
/// List of possible PDA colors to choose from
var/list/colorlist = list()
diff --git a/code/game/machinery/ai_display.dm b/code/game/machinery/ai_display.dm
index 155d67d7238..0112cf0ed35 100644
--- a/code/game/machinery/ai_display.dm
+++ b/code/game/machinery/ai_display.dm
@@ -6,7 +6,6 @@ GLOBAL_LIST_EMPTY(ai_displays)
icon_state = "frame"
name = "AI display"
anchored = TRUE
- density = FALSE
/// Current mode
var/mode = AI_DISPLAY_MODE_BLANK
diff --git a/code/game/machinery/ai_resource.dm b/code/game/machinery/ai_resource.dm
index 0134ef7aafd..591a22f856a 100644
--- a/code/game/machinery/ai_resource.dm
+++ b/code/game/machinery/ai_resource.dm
@@ -220,8 +220,6 @@ GLOBAL_LIST_EMPTY(ai_nodes)
/obj/machinery/ai_node/processing_node
name = "processing node"
desc = "A rack of processors with a manual on/off switch. While running, it grants an AI memory."
- icon = 'icons/obj/machines/ai_machinery.dmi'
- icon_state = "processor-off"
resource_key = "memory"
icon_base = "processor"
@@ -241,7 +239,6 @@ GLOBAL_LIST_EMPTY(ai_nodes)
/obj/machinery/ai_node/network_node
name = "network node"
desc = "A rack of servers with a manual on/off switch. While running, it grants an AI bandwidth."
- icon = 'icons/obj/machines/ai_machinery.dmi'
icon_state = "network-off"
resource_key = "bandwidth"
icon_base = "network"
@@ -269,7 +266,6 @@ GLOBAL_LIST_EMPTY(ai_nodes)
/obj/machinery/computer/ai_resource
name = "AI Resource Control Console"
desc = "Used to reassign memory and bandwidth between multiple AI units."
- icon = 'icons/obj/computer.dmi'
icon_keyboard = "rd_key"
icon_screen = "ai_resource"
req_access = list(ACCESS_RD)
diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm
index 0007ecc23ff..f236ac18e91 100644
--- a/code/game/machinery/ai_slipper.dm
+++ b/code/game/machinery/ai_slipper.dm
@@ -5,7 +5,6 @@
layer = 3
plane = FLOOR_PLANE
anchored = TRUE
- max_integrity = 200
armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, rad = 0, fire = 50, acid = 30)
var/uses = 20
var/cooldown_time = 10 SECONDS
diff --git a/code/game/machinery/airlock_control/airlock_button.dm b/code/game/machinery/airlock_control/airlock_button.dm
index f4f85636bda..0af536f76c5 100644
--- a/code/game/machinery/airlock_control/airlock_button.dm
+++ b/code/game/machinery/airlock_control/airlock_button.dm
@@ -8,7 +8,6 @@ GLOBAL_LIST_EMPTY(all_airlock_access_buttons)
layer = ON_EDGED_TURF_LAYER
anchored = TRUE
power_channel = PW_CHANNEL_ENVIRONMENT
- power_state = IDLE_POWER_USE
/// Id to be used by the controller to grab us on spawn
var/autolink_id
/// UID of the airlock controller that owns us
diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm
index f65c68866e5..d151cc5337b 100644
--- a/code/game/machinery/camera/camera_assembly.dm
+++ b/code/game/machinery/camera/camera_assembly.dm
@@ -11,7 +11,6 @@
icon = 'icons/obj/monitors.dmi'
icon_state = "cameracase"
w_class = WEIGHT_CLASS_SMALL
- anchored = FALSE
materials = list(MAT_METAL=400, MAT_GLASS=250)
// Motion, EMP-Proof
var/list/obj/item/possible_upgrades = list(/obj/item/assembly/prox_sensor, /obj/item/stack/sheet/mineral/plasma)
diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index b60930e4be3..37ae32d0a37 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -6,7 +6,6 @@
anchored = TRUE
idle_power_consumption = 5
active_power_consumption = 60
- power_channel = PW_CHANNEL_EQUIPMENT
pass_flags = PASSTABLE
var/obj/item/stock_parts/cell/charging = null
var/chargelevel = -1
diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm
index ac004eec813..c9e23857425 100644
--- a/code/game/machinery/computer/HolodeckControl.dm
+++ b/code/game/machinery/computer/HolodeckControl.dm
@@ -241,7 +241,6 @@
footstep = FOOTSTEP_CARPET
barefootstep = FOOTSTEP_CARPET_BAREFOOT
clawfootstep = FOOTSTEP_CARPET_BAREFOOT
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
/turf/simulated/floor/holofloor/carpet/Initialize(mapload)
. = ..()
@@ -302,14 +301,9 @@
item_chair = null
/obj/item/clothing/gloves/boxing/hologlove
- name = "boxing gloves"
- desc = "Because you really needed another excuse to punch your crewmates."
- icon_state = "boxing"
- item_state = "boxing"
/obj/structure/holowindow
name = "reinforced window"
- icon = 'icons/obj/structures.dmi'
icon_state = "rwindow"
desc = "A window."
density = TRUE
@@ -369,7 +363,6 @@
force = 3.0
throw_speed = 1
throw_range = 5
- throwforce = 0
w_class = WEIGHT_CLASS_SMALL
armour_penetration_percentage = 50
var/active = FALSE
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm
index 5cbf7b2f80a..00207d8c09e 100644
--- a/code/game/machinery/computer/Operating.dm
+++ b/code/game/machinery/computer/Operating.dm
@@ -2,8 +2,6 @@
/obj/machinery/computer/operating
name = "operating computer"
- density = TRUE
- anchored = TRUE
icon_keyboard = "med_key"
icon_screen = "crew"
circuit = /obj/item/circuitboard/operating
diff --git a/code/game/machinery/computer/ai_core.dm b/code/game/machinery/computer/ai_core.dm
index 1378b797a8a..7a2047fb0a1 100644
--- a/code/game/machinery/computer/ai_core.dm
+++ b/code/game/machinery/computer/ai_core.dm
@@ -1,6 +1,5 @@
/obj/structure/ai_core
density = TRUE
- anchored = FALSE
name = "AI core"
icon = 'icons/mob/AI.dmi'
icon_state = "0"
diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm
index 0e3e32c3de8..d6745d76ece 100644
--- a/code/game/machinery/computer/aifixer.dm
+++ b/code/game/machinery/computer/aifixer.dm
@@ -1,6 +1,5 @@
/obj/machinery/computer/aifixer
name = "\improper AI system integrity restorer"
- icon = 'icons/obj/computer.dmi'
icon_keyboard = "rd_key"
icon_screen = "ai-fixer"
circuit = /obj/item/circuitboard/aifixer
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 3f9b21e95b5..b42333bf4b5 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -1,7 +1,6 @@
/obj/machinery/computer/arcade
name = "random arcade"
desc = "random arcade machine."
- icon = 'icons/obj/computer.dmi'
icon_state = "arcade"
icon_keyboard = null
icon_screen = "invaders"
@@ -51,7 +50,6 @@
/obj/machinery/computer/arcade/battle
name = "arcade machine"
desc = "Does not support Pinball."
- icon = 'icons/obj/computer.dmi'
icon_state = "battle_arcade"
icon_screen = "battle"
circuit = /obj/item/circuitboard/arcade/battle
@@ -280,7 +278,6 @@
/obj/machinery/computer/arcade/orion_trail
name = "The Orion Trail"
desc = "Learn how our ancestors got to Orion, and have fun in the process!"
- icon_state = "arcade"
icon_screen = "orion"
circuit = /obj/item/circuitboard/arcade/orion_trail
var/busy = FALSE //prevent clickspam that allowed people to ~speedrun~ the game.
@@ -974,7 +971,6 @@
desc = "Premier corporate security forces for all spaceports found along the Orion Trail."
faction = list("orion")
loot = list()
- del_on_death = TRUE
/obj/item/orion_ship
name = "model settler ship"
diff --git a/code/game/machinery/computer/atmos_controllers.dm b/code/game/machinery/computer/atmos_controllers.dm
index 22ae8b746b2..5dc70d59b80 100644
--- a/code/game/machinery/computer/atmos_controllers.dm
+++ b/code/game/machinery/computer/atmos_controllers.dm
@@ -9,12 +9,9 @@ GLOBAL_LIST_EMPTY(gas_sensors)
#define SENSOR_N2O (1<<6)
/obj/machinery/atmospherics/air_sensor
- icon = 'icons/obj/stationobjs.dmi'
icon_state = "gsensor1"
- resistance_flags = FIRE_PROOF
name = "gas sensor"
- anchored = TRUE
var/state = 0
var/bolts = TRUE
@@ -105,7 +102,6 @@ GLOBAL_LIST_EMPTY(gas_sensors)
/obj/machinery/computer/general_air_control
name = "air sensor monitor"
- icon = 'icons/obj/computer.dmi'
icon_screen = "tank"
icon_keyboard = "atmos_key"
circuit = /obj/item/circuitboard/air_management
@@ -666,7 +662,6 @@ GLOBAL_LIST_EMPTY(gas_sensors)
// Central atmos control //
/obj/machinery/computer/atmoscontrol
name = "central atmospherics computer"
- icon = 'icons/obj/computer.dmi'
icon_keyboard = "atmos_key"
icon_screen = "tank"
light_color = LIGHT_COLOR_CYAN
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 477942f8baa..7806fbbcf0c 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -15,7 +15,6 @@
var/list/req_components = null
/obj/item/circuitboard/computer
- board_type = "computer"
/obj/item/circuitboard/machine
board_type = "machine"
@@ -45,7 +44,6 @@
board_name = "Message Monitor"
icon_state = "engineering"
build_path = /obj/machinery/computer/message_monitor
- origin_tech = "programming=2"
/obj/item/circuitboard/camera
board_name = "Camera Monitor"
@@ -82,7 +80,6 @@
/obj/item/circuitboard/camera/telescreen
board_name = "Telescreen"
- icon_state = "security"
build_path = /obj/machinery/computer/security/telescreen
/obj/item/circuitboard/camera/engine
@@ -102,12 +99,10 @@
/obj/item/circuitboard/camera/prison
board_name = "Prison Monitor"
- icon_state = "security"
build_path = /obj/machinery/computer/security/telescreen/prison
/obj/item/circuitboard/camera/interrogation
board_name = "Interrogation Monitor"
- icon_state = "security"
build_path = /obj/machinery/computer/security/telescreen/interrogation
/obj/item/circuitboard/camera/minisat
@@ -132,7 +127,6 @@
/obj/item/circuitboard/camera/wooden_tv
board_name = "Wooden TV"
- icon_state = "security"
build_path = /obj/machinery/computer/security/wooden_tv
/obj/item/circuitboard/camera/mining
@@ -211,7 +205,6 @@
/obj/item/circuitboard/card/minor
board_name = "Dept ID Computer"
- icon_state = "command"
build_path = /obj/machinery/computer/card/minor
var/target_dept = TARGET_DEPT_GENERIC
@@ -246,7 +239,6 @@
/obj/item/circuitboard/card/centcom
board_name = "CentComm ID Computer"
- icon_state = "command"
build_path = /obj/machinery/computer/card/centcom
/obj/item/circuitboard/teleporter
@@ -336,9 +328,7 @@
/obj/item/circuitboard/powermonitor/secret
board_name = "Outdated Power Monitor"
- icon_state = "engineering"
build_path = /obj/machinery/computer/monitor/secret
- origin_tech = "programming=2;powerstorage=2"
/obj/item/circuitboard/prisoner
board_name = "Prisoner Management"
@@ -441,7 +431,6 @@
/obj/item/circuitboard/labor_shuttle/one_way
board_name = "Prisoner Shuttle Console"
- icon_state = "security"
build_path = /obj/machinery/computer/shuttle/labor/one_way
/obj/item/circuitboard/ferry
@@ -465,22 +454,18 @@
/obj/item/circuitboard/shuttle/syndicate
board_name = "Syndicate Shuttle"
- icon_state = "generic"
build_path = /obj/machinery/computer/shuttle/syndicate
/obj/item/circuitboard/shuttle/syndicate/recall
board_name = "Syndicate Shuttle Recall Terminal"
- icon_state = "generic"
build_path = /obj/machinery/computer/shuttle/syndicate/recall
/obj/item/circuitboard/shuttle/syndicate/drop_pod
board_name = "Syndicate Drop Pod"
- icon_state = "generic"
build_path = /obj/machinery/computer/shuttle/syndicate/drop_pod
/obj/item/circuitboard/shuttle/golem_ship
board_name = "Golem Ship"
- icon_state = "generic"
build_path = /obj/machinery/computer/shuttle/golem_ship
/obj/item/circuitboard/holodeck_control
@@ -499,7 +484,6 @@
board_name = "Area Air Control"
icon_state = "engineering"
build_path = /obj/machinery/computer/area_atmos
- origin_tech = "programming=2"
/obj/item/circuitboard/telesci_console
board_name = "Telepad Control Console"
diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm
index 922a877025e..f6514040be0 100644
--- a/code/game/machinery/computer/camera_console.dm
+++ b/code/game/machinery/computer/camera_console.dm
@@ -240,9 +240,7 @@
icon_state = "entertainment_console"
icon_screen = "entertainment_off"
light_color = "#FFEEDB"
- light_range_on = 0
network = list("news")
- luminosity = 0
circuit = null
/// Icon utilised when feeds_on is true
var/icon_screen_on = "entertainment"
diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm
index 6e4988b97f0..a9500e156e7 100644
--- a/code/game/machinery/computer/cloning.dm
+++ b/code/game/machinery/computer/cloning.dm
@@ -3,7 +3,6 @@
/obj/machinery/computer/cloning
name = "cloning console"
- icon = 'icons/obj/computer.dmi'
icon_keyboard = "med_key"
icon_screen = "dna"
circuit = /obj/item/circuitboard/cloning
diff --git a/code/game/machinery/computer/computer.dm b/code/game/machinery/computer/computer.dm
index 5d4752144d4..fac6352d1b9 100644
--- a/code/game/machinery/computer/computer.dm
+++ b/code/game/machinery/computer/computer.dm
@@ -6,7 +6,6 @@
anchored = TRUE
idle_power_consumption = 300
active_power_consumption = 300
- max_integrity = 200
integrity_failure = 100
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 40, ACID = 20)
var/obj/item/circuitboard/circuit = null //if circuit==null, computer can't disassembly
diff --git a/code/game/machinery/computer/depot_consoles.dm b/code/game/machinery/computer/depot_consoles.dm
index a59eb62726b..444b53d87ae 100644
--- a/code/game/machinery/computer/depot_consoles.dm
+++ b/code/game/machinery/computer/depot_consoles.dm
@@ -8,7 +8,6 @@
/obj/machinery/computer/syndicate_depot
name = "depot computer"
- icon = 'icons/obj/computer.dmi'
icon_keyboard = "syndie_key"
icon_screen = "tcboss"
light_color = LIGHT_COLOR_PURE_CYAN
diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm
index 9da3b2c4e3a..7a053ba1936 100644
--- a/code/game/machinery/computer/law.dm
+++ b/code/game/machinery/computer/law.dm
@@ -9,7 +9,6 @@
var/mob/living/silicon/ai/current = null
var/opened = FALSE
light_color = LIGHT_COLOR_WHITE
- light_range_on = 2
/// sets the cooldown time between uploads when emag'd
var/cooldown = 0
/// holds the value for when the inherent_laws are counted in countlaws()
diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm
index 4778ba8a823..a4fc2777935 100644
--- a/code/game/machinery/computer/prisoner.dm
+++ b/code/game/machinery/computer/prisoner.dm
@@ -2,7 +2,6 @@
/obj/machinery/computer/prisoner
name = "labor camp points manager"
- icon = 'icons/obj/computer.dmi'
icon_keyboard = "security_key"
icon_screen = "explosive"
req_access = list(ACCESS_BRIG)
diff --git a/code/game/machinery/computer/robot_control.dm b/code/game/machinery/computer/robot_control.dm
index d9f96e0a991..23403c0b86b 100644
--- a/code/game/machinery/computer/robot_control.dm
+++ b/code/game/machinery/computer/robot_control.dm
@@ -1,7 +1,6 @@
/obj/machinery/computer/robotics
name = "robotics control console"
desc = "Used to remotely lockdown or detonate linked Cyborgs."
- icon = 'icons/obj/computer.dmi'
icon_keyboard = "tech_key"
icon_screen = "robot"
req_access = list(ACCESS_RD)
diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm
index d545b1c6e13..5d7faf3c9c4 100644
--- a/code/game/machinery/dance_machine.dm
+++ b/code/game/machinery/dance_machine.dm
@@ -3,7 +3,6 @@
desc = "The first three prototypes were discontinued after mass casualty incidents."
icon = 'icons/obj/lighting.dmi'
icon_state = "disco0"
- anchored = FALSE
atom_say_verb = "states"
density = TRUE
var/active = FALSE
diff --git a/code/game/machinery/defib_mount.dm b/code/game/machinery/defib_mount.dm
index 6edc2deb731..8e4af54bc76 100644
--- a/code/game/machinery/defib_mount.dm
+++ b/code/game/machinery/defib_mount.dm
@@ -6,10 +6,8 @@
desc = "Holds and recharges defibrillators. You can grab the paddles if one is mounted."
icon = 'icons/obj/machines/defib_mount.dmi'
icon_state = "defibrillator_mount"
- density = FALSE
anchored = TRUE
idle_power_consumption = 1
- power_channel = PW_CHANNEL_EQUIPMENT
req_one_access = list(ACCESS_MEDICAL, ACCESS_HEADS) //used to control clamps
var/obj/item/defibrillator/defib //this mount's defibrillator
var/clamps_locked = FALSE //if true, and a defib is loaded, it can't be removed without unlocking the clamps
diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm
index 5bf68dd388d..6cfb8a0ee86 100644
--- a/code/game/machinery/deployable.dm
+++ b/code/game/machinery/deployable.dm
@@ -88,7 +88,6 @@
/obj/structure/barricade/wooden
name = "wooden barricade"
desc = "This space is blocked off by a wooden barricade."
- icon = 'icons/obj/structures.dmi'
icon_state = "woodenbarricade"
bar_material = WOOD
stacktype = /obj/item/stack/sheet/wood
@@ -179,7 +178,6 @@
/obj/item/grenade/barrier
name = "barrier grenade"
desc = "Instant cover."
- icon = 'icons/obj/grenade.dmi'
icon_state = "wallbang"
item_state = "flashbang"
actions_types = list(/datum/action/item_action/toggle_barrier_spread)
@@ -464,7 +462,6 @@
/obj/item/grenade/turret
name = "Pop-Up Turret grenade"
desc = "Inflates into a Pop-Up turret, shoots everyone on sight who wasn't the primer."
- icon = 'icons/obj/grenade.dmi'
icon_state = "wallbang"
item_state = "flashbang"
var/owner_uid
diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm
index 0a35e1e34b7..cabf1c2a342 100644
--- a/code/game/machinery/dish_drive.dm
+++ b/code/game/machinery/dish_drive.dm
@@ -7,8 +7,6 @@
icon_state = "synthesizer"
idle_power_consumption = 8 //5 with default parts
active_power_consumption = 13 //10 with default parts
- anchored = FALSE
- density = FALSE
pass_flags = PASSTABLE
var/static/list/collectable_items = list(/obj/item/trash/waffles,
/obj/item/trash/plate,
diff --git a/code/game/machinery/door_control.dm b/code/game/machinery/door_control.dm
index 4143930ec3c..7e56826416c 100644
--- a/code/game/machinery/door_control.dm
+++ b/code/game/machinery/door_control.dm
@@ -1,7 +1,6 @@
/obj/machinery/door_control
name = "remote door-control"
desc = "A remote control-switch for a door."
- icon = 'icons/obj/stationobjs.dmi'
icon_state = "doorctrl0"
power_channel = PW_CHANNEL_ENVIRONMENT
var/id = null
@@ -136,7 +135,6 @@
/obj/machinery/door_control/no_emag/no_cyborg
desc = "A remote control-switch for a door. Looks strangely analog in design."
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
/obj/machinery/door_control/no_emag/no_cyborg/attack_ai(mob/user)
to_chat(user, "Error, no route to host.")
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index 990b09898b8..3f7a56fb144 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -51,7 +51,6 @@ GLOBAL_LIST_EMPTY(airlock_emissive_underlays)
desc = "An airlock door keeping you safe from the vacuum of space. Only works if closed."
icon = 'icons/obj/doors/airlocks/station/public.dmi'
icon_state = "closed"
- anchored = TRUE
max_integrity = 300
integrity_failure = 70
damage_deflection = AIRLOCK_DAMAGE_DEFLECTION_N
diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm
index 044482c6d8d..7f366936767 100644
--- a/code/game/machinery/doors/airlock_electronics.dm
+++ b/code/game/machinery/doors/airlock_electronics.dm
@@ -6,7 +6,6 @@
materials = list(MAT_METAL = 100, MAT_GLASS = 100)
origin_tech = "engineering=2;programming=1"
req_access = list(ACCESS_ENGINE)
- toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
/// List of accesses currently set
var/list/selected_accesses = list()
diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm
index 5d6de127162..2f2c2418354 100644
--- a/code/game/machinery/doors/airlock_types.dm
+++ b/code/game/machinery/doors/airlock_types.dm
@@ -321,7 +321,6 @@
/obj/machinery/door/airlock/centcom
icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
overlays_file = 'icons/obj/doors/airlocks/centcom/overlays.dmi'
- opacity = TRUE
explosion_block = 2
assemblytype = /obj/structure/door_assembly/door_assembly_centcom
normal_integrity = 1000
diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm
index 061bc9725f8..4334e86045f 100644
--- a/code/game/machinery/doors/brigdoors.dm
+++ b/code/game/machinery/doors/brigdoors.dm
@@ -15,7 +15,6 @@
desc = "A remote control for a door."
req_access = list(ACCESS_BRIG)
anchored = TRUE // can't pick it up
- density = FALSE // can walk through it.
layer = WALL_OBJ_LAYER
var/id = null // id of door it controls.
var/releasetime = 0 // when world.timeofday reaches it - release the prisoner
@@ -27,7 +26,6 @@
var/printed = 0
var/datum/data/record/prisoner
maptext_height = 26
- maptext_width = 32
maptext_y = -1
var/occupant = CELL_NONE
var/crimes = CELL_NONE
diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index d7205cd9925..b5f4bb4cbd0 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -13,7 +13,6 @@
density = FALSE
max_integrity = 300
resistance_flags = FIRE_PROOF
- heat_proof = FALSE
glass = TRUE
explosion_block = 1
safe = FALSE
@@ -373,7 +372,6 @@
w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL = 100, MAT_GLASS = 100)
origin_tech = "engineering=2;programming=1"
- toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
/obj/structure/firelock_frame
@@ -381,7 +379,6 @@
desc = "A partially completed firelock."
icon = 'icons/obj/doors/doorfire.dmi'
icon_state = "frame1"
- anchored = FALSE
density = TRUE
cares_about_temperature = TRUE
var/constructionStep = CONSTRUCTION_NOCIRCUIT
diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index f8f54b8c5aa..ecd705f3b6c 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -91,7 +91,6 @@
name = "large pod door"
icon = 'icons/obj/doors/blastdoor_1x2.dmi'
layer = CLOSED_BLASTDOOR_LAYER
- closingLayer = CLOSED_BLASTDOOR_LAYER
width = 2
/obj/machinery/door/poddoor/multi_tile/triple
@@ -104,10 +103,8 @@
/obj/machinery/door/poddoor/multi_tile/impassable
desc = "A heavy duty blast door that opens mechanically. Looks even tougher than usual."
- icon = 'icons/obj/doors/blastdoor_1x2.dmi'
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
move_resist = INFINITY
- width = 2
/obj/machinery/door/poddoor/multi_tile/impassable/hostile_lockdown()
return
diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm
index 5fb55e4abb4..076786b641e 100644
--- a/code/game/machinery/doors/shutters.dm
+++ b/code/game/machinery/doors/shutters.dm
@@ -17,7 +17,6 @@
name = "radiation shutters"
desc = "Lead-lined shutters with a radiation hazard symbol. Whilst this won't stop you getting irradiated, especially by a supermatter crystal, it will stop radiation travelling as far."
icon = 'icons/obj/doors/shutters_radiation.dmi'
- icon_state = "closed"
rad_insulation_beta = RAD_BETA_BLOCKER
rad_insulation_gamma = RAD_VERY_EXTREME_INSULATION
diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm
index dd395c2c9a6..71061ea12a9 100644
--- a/code/game/machinery/doors/windowdoor.dm
+++ b/code/game/machinery/doors/windowdoor.dm
@@ -9,10 +9,8 @@
flags = ON_BORDER
opacity = FALSE
max_integrity = 150 //If you change this, consider changing ../door/window/brigdoor/ max_integrity at the bottom of this .dm file
- integrity_failure = 0
armor = list(MELEE = 20, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 10, RAD = 100, FIRE = 70, ACID = 100)
glass = TRUE // Used by polarized helpers. Windoors are always glass.
- superconductivity = WINDOW_HEAT_TRANSFER_COEFFICIENT
cares_about_temperature = TRUE
var/obj/item/airlock_electronics/electronics
var/base_state = "left"
@@ -422,19 +420,11 @@
/obj/machinery/door/window/reinforced/normal
name = ".custom placement"
- icon_state = "leftsecure"
- base_state = "leftsecure"
- max_integrity = 300 //Stronger doors for prison (regular window door health is 200)
- reinf = TRUE
- explosion_block = 1
/obj/machinery/door/window/reinforced/reversed
name = ".custom placement"
icon_state = "rightsecure"
base_state = "rightsecure"
- max_integrity = 300 //Stronger doors for prison (regular window door health is 200)
- reinf = TRUE
- explosion_block = 1
/obj/machinery/door/window/classic
name = "Branch, do not add stuff here"
diff --git a/code/game/machinery/dye_generator.dm b/code/game/machinery/dye_generator.dm
index 29da54caf56..69478a0298f 100644
--- a/code/game/machinery/dye_generator.dm
+++ b/code/game/machinery/dye_generator.dm
@@ -73,12 +73,8 @@
/obj/item/hair_dye_bottle
name = "hair dye bottle"
desc = "A refillable bottle used for holding hair dyes of all sorts of colors."
- icon = 'icons/obj/items.dmi'
icon_state = "hairdyebottle"
- throwforce = 0
throw_speed = 4
- throw_range = 7
- force = 0
w_class = WEIGHT_CLASS_TINY
var/dye_color = "#FFFFFF"
diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm
index dcbd732a6b6..5477ea65108 100644
--- a/code/game/machinery/firealarm.dm
+++ b/code/game/machinery/firealarm.dm
@@ -356,7 +356,6 @@ Just a object used in constructing fire alarms
w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL = 100, MAT_GLASS = 100)
origin_tech = "engineering=2;programming=1"
- toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
#undef FIRE_ALARM_FRAME
diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm
index 445d3731b57..9de96a3d86d 100644
--- a/code/game/machinery/flasher.dm
+++ b/code/game/machinery/flasher.dm
@@ -3,7 +3,6 @@
/obj/machinery/flasher
name = "Mounted flash"
desc = "A wall-mounted flashbulb device."
- icon = 'icons/obj/stationobjs.dmi'
icon_state = "mflash1"
max_integrity = 250
integrity_failure = 100
diff --git a/code/game/machinery/floodlight.dm b/code/game/machinery/floodlight.dm
index 1fe57a9a86a..bb6024b8d50 100644
--- a/code/game/machinery/floodlight.dm
+++ b/code/game/machinery/floodlight.dm
@@ -3,7 +3,6 @@
desc = "An artificial sun, except a lot smaller and a lot less powerful."
icon = 'icons/obj/machines/floodlight.dmi'
icon_state = "flood00"
- anchored = FALSE
density = TRUE
max_integrity = 100
integrity_failure = 80
diff --git a/code/game/machinery/floor_igniter.dm b/code/game/machinery/floor_igniter.dm
index 7659327ca14..d02945e84d5 100644
--- a/code/game/machinery/floor_igniter.dm
+++ b/code/game/machinery/floor_igniter.dm
@@ -1,7 +1,6 @@
/obj/machinery/igniter
name = "igniter"
desc = "It's useful for igniting plasma."
- icon = 'icons/obj/stationobjs.dmi'
icon_state = "igniter1"
plane = FLOOR_PLANE
max_integrity = 300
@@ -76,7 +75,6 @@
/obj/machinery/sparker
name = "Mounted igniter"
desc = "A wall-mounted ignition device."
- icon = 'icons/obj/stationobjs.dmi'
icon_state = "migniter"
resistance_flags = FIRE_PROOF
var/id = null
diff --git a/code/game/machinery/gameboard.dm b/code/game/machinery/gameboard.dm
index a1c666590a0..d5c86c8d078 100644
--- a/code/game/machinery/gameboard.dm
+++ b/code/game/machinery/gameboard.dm
@@ -1,6 +1,5 @@
/obj/machinery/gameboard
name = "Virtual Gameboard"
- icon = 'icons/obj/stationobjs.dmi'
icon_state = "gboard_on"
desc = "A holographic table allowing the crew to have fun(TM) on boring shifts! One player per board."
density = TRUE
diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm
index 64e0a205ad0..9379298c059 100644
--- a/code/game/machinery/hologram.dm
+++ b/code/game/machinery/hologram.dm
@@ -588,9 +588,6 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
icon = 'icons/effects/96x96.dmi'
icon_state = "holoray"
layer = FLY_LAYER
- density = FALSE
- anchored = TRUE
- mouse_opacity = MOUSE_OPACITY_ICON
pixel_x = -32
pixel_y = -32
alpha = 100
diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm
index a3e2b884527..f1b6581b361 100644
--- a/code/game/machinery/iv_drip.dm
+++ b/code/game/machinery/iv_drip.dm
@@ -6,7 +6,6 @@
desc = "Simply attach a bloodbag and puncture the patient with a needle, they'll have more blood in no time."
icon = 'icons/goonstation/objects/iv.dmi'
icon_state = "stand"
- anchored = FALSE
mouse_drag_pointer = MOUSE_ACTIVE_POINTER
var/obj/item/reagent_containers/iv_bag/bag = null
diff --git a/code/game/machinery/machine_frame.dm b/code/game/machinery/machine_frame.dm
index 7b3c1ce0743..7c63e9dcffc 100644
--- a/code/game/machinery/machine_frame.dm
+++ b/code/game/machinery/machine_frame.dm
@@ -15,7 +15,6 @@
layer = BELOW_OBJ_LAYER
armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 70)
atom_say_verb = "beeps"
- flags_ricochet = RICOCHET_HARD
receive_ricochet_chance_mod = 0.3
var/obj/item/circuitboard/circuit = null
@@ -350,7 +349,6 @@ to destroy them and players will be able to make replacements.
icon_state = "generic"
build_path = /obj/machinery/economy/slot_machine
board_type = "machine"
- origin_tech = "programming=2"
req_components = list(
/obj/item/stack/cable_coil = 3,
/obj/item/stock_parts/cell = 1,
@@ -361,7 +359,6 @@ to destroy them and players will be able to make replacements.
icon_state = "service"
build_path = /obj/machinery/bottler
board_type = "machine"
- origin_tech = "programming=2"
req_components = list(
/obj/item/stock_parts/manipulator = 1,
/obj/item/stock_parts/matter_bin = 1,
@@ -725,7 +722,6 @@ to destroy them and players will be able to make replacements.
/obj/item/circuitboard/autolathe/syndi
name = "Circuit board (Syndi Autolathe)"
- icon_state = "engineering"
build_path = /obj/machinery/autolathe/syndicate
/obj/item/circuitboard/autolathe/trapped
@@ -748,7 +744,6 @@ to destroy them and players will be able to make replacements.
icon_state = "service"
build_path = /obj/machinery/dish_drive
board_type = "machine"
- origin_tech = "programming=2"
req_components = list(
/obj/item/stock_parts/manipulator = 1,
/obj/item/stock_parts/matter_bin = 1,
@@ -806,13 +801,11 @@ to destroy them and players will be able to make replacements.
/obj/item/circuitboard/pacman/super
board_name = "SUPERPACMAN-type Generator"
- icon_state = "engineering"
build_path = /obj/machinery/power/port_gen/pacman/super
origin_tech = "programming=3;powerstorage=4;engineering=4"
/obj/item/circuitboard/pacman/mrs
board_name = "MRSPACMAN-type Generator"
- icon_state = "engineering"
build_path = /obj/machinery/power/port_gen/pacman/mrs
origin_tech = "programming=3;powerstorage=4;engineering=4;plasmatech=4"
@@ -1123,12 +1116,10 @@ to destroy them and players will be able to make replacements.
/obj/item/circuitboard/ore_redemption/golem
board_name = "Ore Redemption - Golem"
- icon_state = "supply"
build_path = /obj/machinery/mineral/ore_redemption/golem
/obj/item/circuitboard/ore_redemption/labor
board_name = "Ore Redemption - Labour"
- icon_state = "supply"
build_path = /obj/machinery/mineral/ore_redemption/labor
/obj/item/circuitboard/mining_equipment_vendor
@@ -1153,7 +1144,6 @@ to destroy them and players will be able to make replacements.
/obj/item/circuitboard/mining_equipment_vendor/explorer
board_name = "Explorer Equipment Vendor"
- icon_state = "supply"
build_path = /obj/machinery/mineral/equipment_vendor/explorer
/obj/item/circuitboard/clawgame
@@ -1217,7 +1207,6 @@ to destroy them and players will be able to make replacements.
board_name = "Industrial Suit Storage Unit"
icon_state = "engineering"
build_path = /obj/machinery/suit_storage_unit/industrial
- board_type = "machine"
origin_tech = "materials=3;engineering=4"
req_components = list(
/obj/item/stock_parts/matter_bin = 1,
diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm
index 765a1fcd22c..e3984a6e482 100644
--- a/code/game/machinery/mass_driver.dm
+++ b/code/game/machinery/mass_driver.dm
@@ -79,8 +79,6 @@
name = "mass driver frame"
icon = 'icons/obj/objects.dmi'
icon_state = "mass_driver_frame"
- density = FALSE
- anchored = FALSE
var/build = 0
/obj/machinery/mass_driver_frame/item_interaction(mob/living/user, obj/item/used, list/modifiers)
diff --git a/code/game/machinery/pipe/pipe_construction.dm b/code/game/machinery/pipe/pipe_construction.dm
index 796acf2a80c..40a77898626 100644
--- a/code/game/machinery/pipe/pipe_construction.dm
+++ b/code/game/machinery/pipe/pipe_construction.dm
@@ -85,8 +85,6 @@ GLOBAL_LIST_INIT(pipe_path2type, list(
icon = 'icons/obj/pipe-item.dmi'
icon_state = "simple"
item_state = "buildpipe"
- w_class = WEIGHT_CLASS_NORMAL
- level = 2
/// Will the constructed pipe be flipped
var/flipped = FALSE
/// The label that will be put on the constructed pipe when this is wrenched down
diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm
index 90178417b60..479587288ae 100644
--- a/code/game/machinery/portable_turret.dm
+++ b/code/game/machinery/portable_turret.dm
@@ -14,10 +14,8 @@
icon_state = "standard_off"
base_icon_state = "standard"
anchored = TRUE
- density = FALSE
idle_power_consumption = 50 //when inactive, this turret takes up constant 50 Equipment power
active_power_consumption = 300 //when active, this turret takes up constant 300 Equipment power
- power_channel = PW_CHANNEL_EQUIPMENT //drains power from the EQUIPMENT channel
armor = list(melee = 50, bullet = 30, laser = 30, energy = 30, bomb = 30, rad = 0, fire = 90, acid = 90)
///this will be visible when above doors/firelocks/blastdoors to prevent cheese
layer = ABOVE_OBJ_LAYER
@@ -880,12 +878,7 @@
name = "\improper Centcomm turret"
enabled = FALSE
ailock = TRUE
- check_synth = FALSE
- check_access = TRUE
- check_arrest = TRUE
- check_records = TRUE
check_weapons = TRUE
- check_anomalies = TRUE
region_max = REGION_CENTCOMM // Non-turretcontrolled turrets at CC can have their access customized to check for CC accesses.
deployment_override = TRUE
@@ -1154,9 +1147,7 @@
targetting_is_configurable = FALSE
check_arrest = FALSE
check_records = FALSE
- check_weapons = FALSE
check_access = FALSE
- check_anomalies = TRUE
check_synth = TRUE
ailock = TRUE
var/area/syndicate_depot/core/depotarea
@@ -1207,8 +1198,6 @@
/obj/machinery/porta_turret/syndicate/exterior
name = "machine gun turret (7.62)"
desc = "Syndicate exterior defense turret chambered for 7.62 rounds. Designed to down intruders with heavy calliber bullets."
- projectile = /obj/item/projectile/bullet
- eprojectile = /obj/item/projectile/bullet
/obj/machinery/porta_turret/syndicate/turret_outpost
name = "machine gun turret (5.56x45mm)"
@@ -1259,9 +1248,7 @@
targetting_is_configurable = FALSE
check_arrest = FALSE
check_records = FALSE
- check_weapons = FALSE
check_access = FALSE
- check_anomalies = TRUE
check_synth = TRUE
ailock = TRUE
var/owner_uid
diff --git a/code/game/machinery/radar.dm b/code/game/machinery/radar.dm
index 2e0273b09cb..16b1107fab4 100644
--- a/code/game/machinery/radar.dm
+++ b/code/game/machinery/radar.dm
@@ -13,7 +13,6 @@
layer = ABOVE_ALL_MOB_LAYER
power_state = NO_POWER_USE // going to be used outside
interact_offline = TRUE
- idle_power_consumption = 0
pixel_x = -32
armor = list(MELEE = 80, BULLET = 10, LASER = 30, ENERGY = 30, BOMB = 50, RAD = 0, FIRE = 100, ACID = 100)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
@@ -237,7 +236,6 @@
board_name = "Doppler Radar"
icon_state = "supply"
build_path = /obj/machinery/radar
- board_type = "machine"
origin_tech = "engineering=2"
req_components = list(
/obj/item/stack/cable_coil = 5,
@@ -246,7 +244,6 @@
)
/obj/item/circuitboard/machine/radar/broken
- board_name = "Doppler Radar"
desc = "Bits of char, plastic, and ash cling to the boards surface. How it was working before was nothing short of a miracle. It's probably not going to work again."
icon_state = "command_broken"
diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm
index a939c2efa47..86a351fd9b7 100644
--- a/code/game/machinery/recharger.dm
+++ b/code/game/machinery/recharger.dm
@@ -3,7 +3,6 @@
/obj/machinery/recharger
name = "recharger"
- icon = 'icons/obj/stationobjs.dmi'
icon_state = "recharger0"
base_icon_state = "recharger"
desc = "A charging dock for energy based weaponry."
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 5f952a86d51..af21cc1f03b 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -58,7 +58,6 @@ GLOBAL_LIST_EMPTY(allRequestConsoles)
var/message = ""
var/recipient = ""; //the department which will be receiving the message
var/priority = -1 ; //Priority of the message being sent
- light_range = 0
var/datum/announcer/announcer = new(config_type = /datum/announcement_configuration/requests_console)
/// The ID card of the person requesting a secondary goal.
var/goalRequester
diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm
index 1be90ce4d06..8f1a602c90e 100644
--- a/code/game/machinery/shieldgen.dm
+++ b/code/game/machinery/shieldgen.dm
@@ -4,12 +4,10 @@
icon = 'icons/effects/effects.dmi'
icon_state = "shield-old"
density = TRUE
- opacity = FALSE
anchored = TRUE
move_resist = INFINITY
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
flags_2 = RAD_NO_CONTAMINATE_2
- max_integrity = 200
/obj/machinery/shield/Initialize(mapload)
. = ..()
@@ -124,8 +122,6 @@
icon = 'icons/obj/objects.dmi'
icon_state = "shieldoff"
density = TRUE
- opacity = FALSE
- anchored = FALSE
pressure_resistance = 2*ONE_ATMOSPHERE
req_access = list(ACCESS_ENGINE)
var/const/max_health = 100
@@ -311,9 +307,7 @@
/obj/machinery/shieldwallgen
name = "Shield Generator"
desc = "A shield generator."
- icon = 'icons/obj/stationobjs.dmi'
icon_state = "Shield_Gen"
- anchored = FALSE
density = TRUE
req_access = list(ACCESS_TELEPORTER)
flags = CONDUCT
diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm
index c9e42b3434e..4b3391b7685 100644
--- a/code/game/machinery/slotmachine.dm
+++ b/code/game/machinery/slotmachine.dm
@@ -3,8 +3,6 @@
desc = "Gambling for the antisocial."
icon = 'icons/obj/economy.dmi'
icon_state = "slots-off"
- anchored = TRUE
- density = TRUE
var/plays = 0
var/working = FALSE
diff --git a/code/game/machinery/snow_machine.dm b/code/game/machinery/snow_machine.dm
index a880654452f..f63b7dd26d5 100644
--- a/code/game/machinery/snow_machine.dm
+++ b/code/game/machinery/snow_machine.dm
@@ -3,7 +3,6 @@
desc = "Just add water and you too can have your own winter wonderland! Carol singers not included."
icon_state = "snow_machine_off"
density = TRUE
- anchored = FALSE
layer = OBJ_LAYER
var/active = FALSE
var/power_used_this_cycle = 0
diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm
index 00a818389eb..b89b46785c4 100644
--- a/code/game/machinery/spaceheater.dm
+++ b/code/game/machinery/spaceheater.dm
@@ -3,7 +3,6 @@
desc = "A free-standing mobile space heater for heating rooms, featuring a temperature adjustment dial and an easy-swap power cell holder which are hidden behind a screwed-on panel."
icon = 'icons/obj/atmos.dmi'
icon_state = "sheater0"
- anchored = FALSE
density = TRUE
max_integrity = 250
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 100, FIRE = 80, ACID = 10)
diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm
index 0235e45ea64..4f9a2d638b5 100644
--- a/code/game/machinery/status_display.dm
+++ b/code/game/machinery/status_display.dm
@@ -11,10 +11,8 @@ GLOBAL_LIST_EMPTY(status_displays)
icon_state = "frame"
name = "status display"
anchored = TRUE
- density = FALSE
idle_power_consumption = 10
maptext_height = 26
- maptext_width = 32
maptext_y = -1
/// Status display mode
diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
index e40dc622016..29bc5bc119b 100644
--- a/code/game/machinery/suit_storage_unit.dm
+++ b/code/game/machinery/suit_storage_unit.dm
@@ -90,7 +90,6 @@
boots_type = /obj/item/clothing/shoes/magboots
suit_type = /obj/item/mod/control/pre_equipped/engineering
req_access = list(ACCESS_ENGINE_EQUIP)
- board_type = /obj/item/circuitboard/suit_storage_unit/industrial
/obj/machinery/suit_storage_unit/industrial/engine/secure
secure = TRUE
@@ -101,7 +100,6 @@
boots_type = /obj/item/clothing/shoes/magboots/advance
suit_type = /obj/item/mod/control/pre_equipped/advanced
req_access = list(ACCESS_CE)
- board_type = /obj/item/circuitboard/suit_storage_unit/industrial
/obj/machinery/suit_storage_unit/industrial/ce/secure
secure = TRUE
diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm
index 1830ca6472d..c7084198f57 100644
--- a/code/game/machinery/syndicatebeacon.dm
+++ b/code/game/machinery/syndicatebeacon.dm
@@ -10,7 +10,6 @@
anchored = FALSE
density = TRUE
layer = MOB_LAYER - 0.2 //so people can't hide it and it's REALLY OBVIOUS
- stat = 0
var/active = FALSE
var/icontype = "beacon"
diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm
index 6d16cd38c58..a32cb09a5b4 100644
--- a/code/game/machinery/syndicatebomb.dm
+++ b/code/game/machinery/syndicatebomb.dm
@@ -7,8 +7,6 @@
icon_state = "syndicate-bomb"
desc = "A large and menacing device. Can be bolted down with a wrench."
- anchored = FALSE
- density = FALSE
layer = BELOW_MOB_LAYER //so people can't hide it and it's REALLY OBVIOUS
resistance_flags = FIRE_PROOF | ACID_PROOF
flags_2 = CRITICAL_ATOM_2
@@ -319,7 +317,6 @@
icon = 'icons/obj/assemblies.dmi'
icon_state = "bombcore"
item_state = "eshield0"
- w_class = WEIGHT_CLASS_NORMAL
origin_tech = "syndicate=5;combat=6"
resistance_flags = FLAMMABLE //Burnable (but the casing isn't)
var/adminlog = null
diff --git a/code/game/machinery/tcomms/tcomms_presets.dm b/code/game/machinery/tcomms/tcomms_presets.dm
index 14fa95b6d6c..395e2f48720 100644
--- a/code/game/machinery/tcomms/tcomms_presets.dm
+++ b/code/game/machinery/tcomms/tcomms_presets.dm
@@ -15,13 +15,11 @@
/obj/machinery/tcomms/relay/engineering
network_id = "ENGINEERING-RELAY"
autolink_id = "STATION-CORE"
- active = FALSE
// RUSKIE RELAY //
/obj/machinery/tcomms/relay/ruskie
network_id = "RUSKIE-RELAY"
autolink_id = "STATION-CORE"
- active = FALSE
hidden_link = TRUE
// CC RELAY //
diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm
index 8b8b2b60107..708e7efc987 100644
--- a/code/game/machinery/turret_control.dm
+++ b/code/game/machinery/turret_control.dm
@@ -8,7 +8,6 @@
icon = 'icons/obj/machines/turret_control.dmi'
icon_state = "control_standby"
anchored = TRUE
- density = FALSE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
var/enabled = FALSE
var/lethal = FALSE
@@ -49,11 +48,8 @@
check_arrest = FALSE
check_records = FALSE
- check_weapons = FALSE
check_access = FALSE
- check_anomalies = TRUE
check_synth = TRUE
- check_borgs = FALSE
ailock = TRUE
syndicate = TRUE
diff --git a/code/game/machinery/vendors/vending.dm b/code/game/machinery/vendors/vending.dm
index 55a28b1b1bf..c2f1cb34f2d 100644
--- a/code/game/machinery/vendors/vending.dm
+++ b/code/game/machinery/vendors/vending.dm
@@ -102,9 +102,6 @@
desc = "A generic vending machine."
icon = 'icons/obj/vending.dmi'
icon_state = "generic"
- layer = BELOW_OBJ_LAYER
- anchored = TRUE
- density = TRUE
face_while_pulling = TRUE
max_integrity = 300
integrity_failure = 100
@@ -172,7 +169,6 @@
// Things that can go wrong
/// Allows people to access a vendor that's normally access restricted.
- emagged = FALSE
/// Shocks people like an airlock
var/seconds_electrified = 0
/// Fire items at customers! We're broken!
diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm
index 8f94b0d1cce..29b6d366bc5 100644
--- a/code/game/mecha/combat/combat.dm
+++ b/code/game/mecha/combat/combat.dm
@@ -1,7 +1,6 @@
/obj/mecha/combat
force = 30
var/maxsize = 2
- internal_damage_threshold = 50
maint_access = 0
armor = list(melee = 30, bullet = 30, laser = 15, energy = 20, bomb = 20, rad = 0, fire = 100)
destruction_sleep_duration = 4 SECONDS
diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm
index bbab6fe3e94..b5c587389df 100644
--- a/code/game/mecha/combat/durand.dm
+++ b/code/game/mecha/combat/durand.dm
@@ -42,14 +42,7 @@
name = "Old Durand"
icon_state = "old_durand"
initial_icon = "old_durand"
- step_in = 4
- dir_in = 1 //Facing North.
- max_integrity = 400
- deflect_chance = 20
armor = list(melee = 50, bullet = 35, laser = 15, energy = 15, bomb = 20, rad = 50, fire = 100, acid = 100)
- max_temperature = 30000
- infra_luminosity = 8
- force = 40
wreckage = /obj/structure/mecha_wreckage/durand/old
/obj/mecha/combat/durand/old/examine_more(mob/user)
diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm
index a40907d6e53..b4dd6760e50 100644
--- a/code/game/mecha/combat/gygax.dm
+++ b/code/game/mecha/combat/gygax.dm
@@ -8,13 +8,10 @@
max_integrity = 250
deflect_chance = 5
armor = list(melee = 25, bullet = 20, laser = 30, energy = 15, bomb = 0, rad = 0, fire = 100, acid = 75)
- max_temperature = 25000
infra_luminosity = 6
leg_overload_coeff = 2
wreckage = /obj/structure/mecha_wreckage/gygax
internal_damage_threshold = 35
- max_equip = 3
- maxsize = 2
step_energy_drain = 3
normal_step_energy_drain = 3
@@ -56,7 +53,6 @@
operation_req_access = list(ACCESS_SYNDICATE)
wreckage = /obj/structure/mecha_wreckage/gygax/dark
max_equip = 5
- maxsize = 2
starting_voice = /obj/item/mecha_modkit/voice/syndicate
destruction_sleep_duration = 2 SECONDS
diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm
index 0478f0f904b..03367763428 100644
--- a/code/game/mecha/combat/honker.dm
+++ b/code/game/mecha/combat/honker.dm
@@ -8,12 +8,10 @@
deflect_chance = 60
internal_damage_threshold = 60
armor = list(MELEE = -20, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 100)
- max_temperature = 25000
infra_luminosity = 5
operation_req_access = list(ACCESS_CLOWN)
wreckage = /obj/structure/mecha_wreckage/honker
add_req_access = 0
- max_equip = 3
starting_voice = /obj/item/mecha_modkit/voice/honk
/obj/mecha/combat/honker/Initialize(mapload)
diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm
index 7188b0fd10e..251ea57ae77 100644
--- a/code/game/mecha/combat/phazon.dm
+++ b/code/game/mecha/combat/phazon.dm
@@ -4,21 +4,17 @@
icon_state = "phazon"
initial_icon = "phazon"
step_in = 2
- dir_in = 2 //Facing south.
step_energy_drain = 3
normal_step_energy_drain = 3
max_integrity = 200
deflect_chance = 30
armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 30, RAD = 50, FIRE = 100, ACID = 75)
- max_temperature = 25000
infra_luminosity = 3
wreckage = /obj/structure/mecha_wreckage/phazon
- add_req_access = 1
//operation_req_access = list()
internal_damage_threshold = 25
force = 15
phase_state = "phazon-phase"
- max_equip = 3
/obj/mecha/combat/phazon/GrantActions(mob/living/user, human_occupant = 0)
..()
diff --git a/code/game/mecha/combat/reticence.dm b/code/game/mecha/combat/reticence.dm
index 62393bc84a8..d7b5116676b 100644
--- a/code/game/mecha/combat/reticence.dm
+++ b/code/game/mecha/combat/reticence.dm
@@ -13,7 +13,6 @@
operation_req_access = list(ACCESS_MIME)
add_req_access = 0
internal_damage_threshold = 60
- max_equip = 3
step_energy_drain = 3
normal_step_energy_drain = 3
stepsound = null
diff --git a/code/game/mecha/equipment/tools/mecha_mining_tools.dm b/code/game/mecha/equipment/tools/mecha_mining_tools.dm
index e97886ed540..5d9f2d025e8 100644
--- a/code/game/mecha/equipment/tools/mecha_mining_tools.dm
+++ b/code/game/mecha/equipment/tools/mecha_mining_tools.dm
@@ -131,7 +131,6 @@
equip_cooldown = 10
drill_delay = 4
drill_level = DRILL_HARDENED
- force = 15
/obj/item/mecha_parts/mecha_equipment/mining_scanner
diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm
index 4e0d5b68a8e..554790534ee 100644
--- a/code/game/mecha/equipment/tools/medical_tools.dm
+++ b/code/game/mecha/equipment/tools/medical_tools.dm
@@ -34,7 +34,6 @@
icon_state = "sleeper"
origin_tech = "engineering=3;biotech=3;plasmatech=2"
energy_drain = 20
- range = MECHA_MELEE
equip_cooldown = 20
var/mob/living/carbon/patient = null
var/inject_amount = 10
@@ -519,7 +518,6 @@
name = "rescue jaw"
desc = "Emergency rescue jaws, designed to help first responders reach their patients. Opens doors and removes obstacles."
icon_state = "mecha_clamp" //can work, might use a blue resprite later but I think it works for now
- origin_tech = "materials=2;engineering=2" //kind of sad, but identical to jaws of life
equip_cooldown = 15
energy_drain = 10
var/dam_force = 20
@@ -568,7 +566,6 @@
icon_state = "mecha_medigun"
energy_drain = 20
range = MECHA_MELEE | MECHA_RANGED
- equip_cooldown = 0
origin_tech = "combat=5;materials=6;powerstorage=6;biotech=6"
var/obj/item/gun/medbeam/mech/medigun
materials = list(MAT_METAL = 15000, MAT_GLASS = 8000, MAT_PLASMA = 3000, MAT_GOLD = 8000, MAT_DIAMOND = 2000)
diff --git a/code/game/mecha/equipment/tools/other_tools.dm b/code/game/mecha/equipment/tools/other_tools.dm
index 0b333826a74..321eaec8fcd 100644
--- a/code/game/mecha/equipment/tools/other_tools.dm
+++ b/code/game/mecha/equipment/tools/other_tools.dm
@@ -28,7 +28,6 @@
/obj/item/mecha_parts/mecha_equipment/teleporter/precise
name = "upgraded teleporter"
desc = "An exosuit module that allows exosuits to teleport to any position in view. This is the high-precision, energy-efficient version."
- origin_tech = "bluespace=7"
energy_drain = 1000
tele_precision = 1
@@ -233,7 +232,6 @@
desc = "An exosuit module that wirelessly drains energy from any available power channel in an area. The performance index barely compensates for movement costs."
icon_state = "tesla"
origin_tech = "magnets=4;powerstorage=4;engineering=4"
- energy_drain = 0
range = 0
var/coeff = 100
var/list/use_channels = list(PW_CHANNEL_EQUIPMENT, PW_CHANNEL_ENVIRONMENT, PW_CHANNEL_LIGHTING)
@@ -314,8 +312,6 @@
desc = "An exosuit module that generates power using solid plasma as fuel. Pollutes the environment."
icon_state = "tesla"
origin_tech = "plasmatech=2;powerstorage=2;engineering=2"
- range = MECHA_MELEE
- energy_drain = 0 //for allow load fuel without energy
var/coeff = 100
var/fuel_type = MAT_PLASMA
var/max_fuel = 150000 // 45k energy for 75 plasma/ 375 cr.
@@ -426,12 +422,10 @@
/obj/item/mecha_parts/mecha_equipment/generator/nuclear
name = "exonuclear reactor"
desc = "An exosuit module that generates power using uranium as fuel. Pollutes the environment."
- icon_state = "tesla"
origin_tech = "powerstorage=4;engineering=4"
fuel_name = "uranium" // Our fuel name as a string
fuel_type = MAT_URANIUM
max_fuel = 50000 // around 83k energy for 25 uranium/ 0 cr.
- fuel_per_cycle_idle = 10
fuel_per_cycle_active = 150
power_per_cycle = 250
var/rad_per_cycle = 120
diff --git a/code/game/mecha/equipment/tools/work_tools.dm b/code/game/mecha/equipment/tools/work_tools.dm
index 18d82a8cf08..c20786e19bb 100644
--- a/code/game/mecha/equipment/tools/work_tools.dm
+++ b/code/game/mecha/equipment/tools/work_tools.dm
@@ -131,7 +131,6 @@
desc = "Equipment for engineering exosuits. A rapid-firing high capacity fire extinguisher."
icon_state = "mecha_exting"
equip_cooldown = 5
- energy_drain = 0
range = MECHA_MELEE | MECHA_RANGED
/obj/item/mecha_parts/mecha_equipment/extinguisher/Initialize(mapload)
@@ -206,7 +205,6 @@
flags_2 = NO_MAT_REDEMPTION_2
var/mode = MECH_RCD_MODE_DECONSTRUCT
var/can_rwall = 0
- toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
/obj/item/mecha_parts/mecha_equipment/rcd/Initialize(mapload)
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 9fe357f6d03..e96ea753f33 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -87,7 +87,6 @@
energy_drain = 30
projectile = /obj/item/projectile/beam/disabler
fire_sound = 'sound/weapons/taser2.ogg'
- harmful = FALSE
/obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
equip_cooldown = 1 SECONDS
@@ -357,13 +356,10 @@
projectiles = 9
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang
- equip_cooldown = 6 SECONDS
name = "\improper SGL-6 Flashbang Launcher"
icon_state = "mecha_grenadelnchr"
origin_tech = "combat=4;engineering=4"
projectile = /obj/item/grenade/flashbang
- fire_sound = 'sound/effects/bang.ogg'
- projectiles = 6
missile_speed = 1.5
projectile_energy_cost = 800
var/det_time = 20
@@ -403,11 +399,7 @@
icon_state = "mecha_grenadelnchr"
origin_tech = "combat=4;engineering=4"
projectile = /obj/item/grenade/chem_grenade/cleaner
- fire_sound = 'sound/effects/bang.ogg'
- equip_cooldown = 6 SECONDS
- projectiles = 6
missile_speed = 1.5
- projectile_energy_cost = 1000
size = 1
/// Time until grenade detonates
var/det_time = 2 SECONDS
@@ -495,7 +487,6 @@
fire_sound = 'sound/weapons/whip.ogg'
projectiles = 10
missile_speed = 1
- missile_range = 30
projectile_energy_cost = 50
harmful = FALSE
diff --git a/code/game/mecha/janitor/nkarrdem.dm b/code/game/mecha/janitor/nkarrdem.dm
index 7018c597940..44272453c47 100644
--- a/code/game/mecha/janitor/nkarrdem.dm
+++ b/code/game/mecha/janitor/nkarrdem.dm
@@ -5,7 +5,6 @@
initial_icon = "nkarrdem"
step_in = 3
turnsound = 'sound/mecha/mechmove01.ogg'
- stepsound = 'sound/mecha/mechstep.ogg'
max_temperature = 10000
max_integrity = 110
max_equip = 4
diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm
index 304e45e8d1d..d61e65b7f91 100644
--- a/code/game/mecha/mech_bay.dm
+++ b/code/game/mecha/mech_bay.dm
@@ -122,9 +122,6 @@
/obj/machinery/computer/mech_bay_power_console
name = "mech bay power control console"
- density = TRUE
- anchored = TRUE
- icon = 'icons/obj/computer.dmi'
icon_keyboard = "tech_key"
icon_screen = "recharge_comp"
light_color = LIGHT_COLOR_FADEDPURPLE
diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm
index 24b8de4ee38..812f0438b4e 100644
--- a/code/game/mecha/mecha_control_console.dm
+++ b/code/game/mecha/mecha_control_console.dm
@@ -1,6 +1,5 @@
/obj/machinery/computer/mecha
name = "exosuit control console"
- icon = 'icons/obj/computer.dmi'
icon_keyboard = "rd_key"
icon_screen = "mecha"
light_color = LIGHT_COLOR_FADEDPURPLE
diff --git a/code/game/mecha/mecha_parts.dm b/code/game/mecha/mecha_parts.dm
index 0391cde1d1c..7f0036e311d 100644
--- a/code/game/mecha/mecha_parts.dm
+++ b/code/game/mecha/mecha_parts.dm
@@ -21,7 +21,6 @@
name = "mecha chassis"
icon_state = "backbone"
var/datum/construction/construct
- flags = CONDUCT
/obj/item/mecha_parts/chassis/Destroy()
QDEL_NULL(construct)
@@ -401,7 +400,6 @@
/obj/item/circuitboard/mecha/ripley
- origin_tech = "programming=2"
/obj/item/circuitboard/mecha/ripley/main
board_name = "Ripley Central Control Module"
@@ -412,7 +410,6 @@
icon_state = "mcontroller"
/obj/item/circuitboard/mecha/nkarrdem
- origin_tech = "programming=2"
/obj/item/circuitboard/mecha/nkarrdem/main
board_name = "Nkarrdem Central Control Module"
diff --git a/code/game/mecha/mecha_wreckage.dm b/code/game/mecha/mecha_wreckage.dm
index f7243fa8a8f..010e11d446b 100644
--- a/code/game/mecha/mecha_wreckage.dm
+++ b/code/game/mecha/mecha_wreckage.dm
@@ -8,8 +8,6 @@
desc = "Remains of some unfortunate mecha. Completely unrepairable, but perhaps something can be salvaged."
icon = 'icons/mecha/mecha.dmi'
density = TRUE
- anchored = FALSE
- opacity = FALSE
var/list/welder_salvage = list(/obj/item/stack/sheet/plasteel, /obj/item/stack/sheet/metal, /obj/item/stack/rods)
var/salvage_num = 5
var/list/crowbar_salvage = list()
diff --git a/code/game/mecha/medical/medical_base.dm b/code/game/mecha/medical/medical_base.dm
index c7fd239d410..e3fbc1016cb 100644
--- a/code/game/mecha/medical/medical_base.dm
+++ b/code/game/mecha/medical/medical_base.dm
@@ -1,3 +1,2 @@
/obj/mecha/medical
turnsound = 'sound/mecha/mechmove01.ogg'
- stepsound = 'sound/mecha/mechstep.ogg'
diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm
index c272b8cd577..63c41f73dde 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/game/mecha/working/ripley.dm
@@ -149,7 +149,6 @@
max_temperature = 65000
max_integrity = 250
resistance_flags = LAVA_PROOF | FIRE_PROOF
- lights_power = 7
armor = list(MELEE = 40, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 60, RAD = 70, FIRE = 100, ACID = 100)
max_equip = 5 // More armor, less tools
wreckage = /obj/structure/mecha_wreckage/ripley/firefighter
@@ -173,7 +172,6 @@
opacity=0
max_temperature = 65000
max_integrity = 300
- lights_power = 7
armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 0, BOMB = 70, RAD = 0, FIRE = 100, ACID = 100)
wreckage = /obj/structure/mecha_wreckage/ripley/deathripley
step_energy_drain = 0
@@ -221,7 +219,6 @@
/obj/mecha/working/ripley/mining/old
desc = "An old, dusty mining ripley."
- name = "APLU \"Miner\""
obj_integrity = 75 //Low starting health
/obj/mecha/working/ripley/mining/old/add_cell()
diff --git a/code/game/objects/effects/alien_acid.dm b/code/game/objects/effects/alien_acid.dm
index 2d301f6161f..a79027fb0b1 100644
--- a/code/game/objects/effects/alien_acid.dm
+++ b/code/game/objects/effects/alien_acid.dm
@@ -3,8 +3,6 @@
name = "acid"
desc = "Burbling corrosive stuff."
icon_state = "acid"
- density = FALSE
- opacity = FALSE
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
layer = ABOVE_NORMAL_TURF_LAYER
var/turf/target
diff --git a/code/game/objects/effects/anomalies.dm b/code/game/objects/effects/anomalies.dm
index 1fd8b980ca0..bb56a6e74a0 100644
--- a/code/game/objects/effects/anomalies.dm
+++ b/code/game/objects/effects/anomalies.dm
@@ -8,7 +8,6 @@
name = "anomaly"
desc = "A mysterious anomaly, seen commonly only in the region of space that the station orbits..."
icon_state = "bhole3"
- density = FALSE
light_range = 3
var/movechance = ANOMALY_MOVECHANCE
var/obj/item/assembly/signaler/anomaly/aSignal = /obj/item/assembly/signaler/anomaly
@@ -102,9 +101,7 @@
/obj/effect/anomaly/grav
name = "gravitational anomaly"
icon_state = "shield2"
- density = FALSE
appearance_flags = PIXEL_SCALE|LONG_GLIDE
- layer = OBJ_LAYER // Mobs will appear above this
var/boing = FALSE
var/knockdown = FALSE
aSignal = /obj/item/assembly/signaler/anomaly/grav
@@ -474,7 +471,6 @@
/obj/effect/anomaly/bhole
name = "vortex anomaly"
- icon_state = "bhole3"
desc = "That's a nice station you have there. It'd be a shame if something happened to it."
aSignal = /obj/item/assembly/signaler/anomaly/vortex
/// The timer that will give us an extra proccall of ripping the floors up
diff --git a/code/game/objects/effects/decals/Cleanable/alien_blood.dm b/code/game/objects/effects/decals/Cleanable/alien_blood.dm
index 1f062d45112..5ca2df971dd 100644
--- a/code/game/objects/effects/decals/Cleanable/alien_blood.dm
+++ b/code/game/objects/effects/decals/Cleanable/alien_blood.dm
@@ -1,9 +1,7 @@
/obj/effect/decal/cleanable/blood/xeno
name = "xeno blood"
desc = "It's green and acidic. It looks like... blood?"
- icon = 'icons/effects/blood.dmi'
basecolor = COLOR_BLOOD_XENO
- bloodiness = BLOOD_AMOUNT_PER_DECAL
blood_state = BLOOD_STATE_XENO
/obj/effect/decal/cleanable/blood/xeno/splatter
diff --git a/code/game/objects/effects/decals/Cleanable/fuel.dm b/code/game/objects/effects/decals/Cleanable/fuel.dm
index c8cfcae0e64..00c3e27158a 100644
--- a/code/game/objects/effects/decals/Cleanable/fuel.dm
+++ b/code/game/objects/effects/decals/Cleanable/fuel.dm
@@ -1,6 +1,5 @@
/obj/effect/decal/cleanable/liquid_fuel
//Liquid fuel is used for things that used to rely on volatile fuels or plasma being contained to a couple tiles.
- icon = 'icons/effects/effects.dmi'
icon_state = "fuel"
layer = ABOVE_NORMAL_TURF_LAYER
var/amount = 1 //Basically moles.
diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
index b071cea7724..1dea868bd01 100644
--- a/code/game/objects/effects/decals/Cleanable/humans.dm
+++ b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -7,7 +7,6 @@
desc = "It's thick and gooey. Perhaps it's the chef's cooking?"
var/drydesc = "It's dry and crusty. Someone is not doing their job."
gender = PLURAL
- density = FALSE
layer = TURF_LAYER
icon = 'icons/effects/blood.dmi'
icon_state = "mfloor1"
@@ -23,7 +22,6 @@
var/off_floor = FALSE
var/image/weightless_image
var/weightless_icon = 'icons/effects/blood_weightless.dmi'
- inertia_move_delay = 5 // so they dont collide with who emitted them
/obj/effect/decal/cleanable/blood/replace_decal(obj/effect/decal/cleanable/blood/C)
if(C == src)
@@ -207,7 +205,6 @@
/obj/effect/decal/cleanable/blood/drip
name = "drips of blood"
desc = "A drop of blood in an ocean of mess."
- gender = PLURAL
icon = 'icons/effects/drip.dmi'
icon_state = "1"
random_icon_states = list("1", "2", "3", "4", "5")
@@ -221,11 +218,9 @@
/// not a child of blood on purpose
/obj/effect/decal/cleanable/trail_holder
name = "blood"
- icon = 'icons/effects/effects.dmi'
icon_state = "nothing"
desc = "Your instincts say you shouldn't be following these."
gender = PLURAL
- density = FALSE
layer = TURF_LAYER
random_icon_states = null
blood_DNA = list()
@@ -258,10 +253,6 @@
/obj/effect/decal/cleanable/blood/gibs
name = "gibs"
desc = "They look bloody and gruesome."
- gender = PLURAL
- density = FALSE
- layer = TURF_LAYER
- icon = 'icons/effects/blood.dmi'
icon_state = "mgibbl5"
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6")
no_clear = TRUE
diff --git a/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm b/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm
index 4c7b736c81b..65953f9671f 100644
--- a/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm
+++ b/code/game/objects/effects/decals/Cleanable/misc_cleanables.dm
@@ -4,7 +4,6 @@
name = "clutter"
desc = "Someone should clean that up."
gender = PLURAL
- density = FALSE
layer = TURF_LAYER
icon = 'icons/obj/objects.dmi'
icon_state = "shards"
@@ -43,12 +42,10 @@
name = "dirt"
desc = "Someone should clean that up."
gender = PLURAL
- density = FALSE
layer = TURF_LAYER
icon = 'icons/effects/dirt.dmi'
icon_state = "dirt"
base_icon_state = "dirt"
- smoothing_flags = NONE
smoothing_groups = list(SMOOTH_GROUP_CLEANABLE_DIRT)
canSmoothWith = list(SMOOTH_GROUP_CLEANABLE_DIRT, SMOOTH_GROUP_WALLS)
mouse_opacity = FALSE
@@ -75,9 +72,7 @@
name = "flour"
desc = "It's still good. Four second rule!"
gender = PLURAL
- density = FALSE
layer = TURF_LAYER
- icon = 'icons/effects/effects.dmi'
icon_state = "flour"
/obj/effect/decal/cleanable/flour/nanofrost
@@ -98,10 +93,8 @@
name = "glowing goo"
desc = "Jeez. I hope that's not for lunch."
gender = PLURAL
- density = FALSE
layer = TURF_LAYER
light_range = 1
- icon = 'icons/effects/effects.dmi'
icon_state = "greenglow"
/obj/effect/decal/cleanable/greenglow/Initialize(mapload)
@@ -114,21 +107,14 @@
/obj/effect/decal/cleanable/cobweb
name = "cobweb"
desc = "Somebody should remove that."
- density = FALSE
- layer = OBJ_LAYER
plane = GAME_PLANE
- icon = 'icons/effects/effects.dmi'
icon_state = "cobweb1"
resistance_flags = FLAMMABLE
/obj/effect/decal/cleanable/molten_object
name = "gooey grey mass"
desc = "It looks like a melted... something."
- density = FALSE
- layer = OBJ_LAYER
plane = GAME_PLANE
- gender = NEUTER
- icon = 'icons/effects/effects.dmi'
icon_state = "molten"
mergeable_decal = FALSE
@@ -139,19 +125,14 @@
/obj/effect/decal/cleanable/cobweb2
name = "cobweb"
desc = "Somebody should remove that."
- density = FALSE
- layer = OBJ_LAYER
plane = GAME_PLANE
- icon = 'icons/effects/effects.dmi'
icon_state = "cobweb2"
/obj/effect/decal/cleanable/vomit
name = "vomit"
desc = "Gosh, how unpleasant."
gender = PLURAL
- density = FALSE
layer = TURF_LAYER
- plane = FLOOR_PLANE
icon = 'icons/effects/blood.dmi'
icon_state = "vomit_1"
random_icon_states = list("vomit_1", "vomit_2", "vomit_3", "vomit_4")
@@ -247,23 +228,19 @@
/obj/effect/decal/cleanable/tomato_smudge
name = "tomato smudge"
desc = "It's red."
- density = FALSE
layer = TURF_LAYER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")
/obj/effect/decal/cleanable/plant_smudge
name = "plant smudge"
- density = FALSE
layer = TURF_LAYER
- gender = NEUTER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_plant")
/obj/effect/decal/cleanable/egg_smudge
name = "smashed egg"
desc = "Seems like this one won't hatch."
- density = FALSE
layer = TURF_LAYER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")
@@ -272,7 +249,6 @@
/obj/effect/decal/cleanable/pie_smudge
name = "smashed pie"
desc = "It's pie cream from a cream pie."
- density = FALSE
layer = TURF_LAYER
icon = 'icons/effects/tomatodecal.dmi'
random_icon_states = list("smashed_pie")
@@ -280,10 +256,8 @@
/obj/effect/decal/cleanable/fungus
name = "space fungus"
desc = "A fungal growth. Looks pretty nasty."
- density = FALSE
layer = TURF_LAYER
plane = GAME_PLANE
- icon = 'icons/effects/effects.dmi'
icon_state = "flour"
color = "#D5820B"
scoop_reagents = list("fungus" = 10)
diff --git a/code/game/objects/effects/decals/Cleanable/robots.dm b/code/game/objects/effects/decals/Cleanable/robots.dm
index 373504a9235..ec02e0c720c 100644
--- a/code/game/objects/effects/decals/Cleanable/robots.dm
+++ b/code/game/objects/effects/decals/Cleanable/robots.dm
@@ -5,8 +5,6 @@
icon_state = "gib1"
basecolor = "#030303"
random_icon_states = list("gib1", "gib2", "gib3", "gib4", "gib5", "gib6", "gib7")
- bloodiness = BLOOD_AMOUNT_PER_DECAL
- mergeable_decal = FALSE
/obj/effect/decal/cleanable/blood/gibs/robot/can_bloodcrawl_in()
return FALSE
diff --git a/code/game/objects/effects/decals/Cleanable/tracks.dm b/code/game/objects/effects/decals/Cleanable/tracks.dm
index 431c97c6d7e..c86af868121 100644
--- a/code/game/objects/effects/decals/Cleanable/tracks.dm
+++ b/code/game/objects/effects/decals/Cleanable/tracks.dm
@@ -13,7 +13,6 @@ GLOBAL_LIST_EMPTY(fluidtrack_cache)
desc = "Whoops..."
drydesc = "Whoops..."
icon_state = "wheels1"
- gender = PLURAL
random_icon_states = null
amount = 0
gravity_check = ALWAYS_IN_GRAVITY
@@ -30,13 +29,10 @@ GLOBAL_LIST_EMPTY(fluidtrack_cache)
icon = 'icons/effects/fluidtracks.dmi'
icon_state = null
desc = "You REALLY shouldn't follow these.."
- gender = PLURAL
random_icon_states = null
- basecolor = "#A10808"
var/entered_dirs = 0
var/exited_dirs = 0
var/base_alpha = BLOODY_FOOTPRINT_BASE_ALPHA
- blood_state = BLOOD_STATE_HUMAN //the icon state to load images from
gravity_check = ALWAYS_IN_GRAVITY
/obj/effect/decal/cleanable/blood/footprints/Initialize(mapload)
diff --git a/code/game/objects/effects/decals/cleanable.dm b/code/game/objects/effects/decals/cleanable.dm
index 6ad91e08db5..26171686ba7 100644
--- a/code/game/objects/effects/decals/cleanable.dm
+++ b/code/game/objects/effects/decals/cleanable.dm
@@ -8,7 +8,6 @@
///when another of the same type is made on the same tile will they merge --- YES=TRUE; NO=FLASE
var/mergeable_decal = TRUE
///prevents Ambient Occlusion effects around it ; Set to GAME_PLANE in Initialize() if on a wall
- plane = FLOOR_PLANE
///for blood n vomit in zero G --- IN GRAVITY=TRUE; NO GRAVITY=FALSE
var/gravity_check = TRUE
hud_possible = list(JANI_HUD)
diff --git a/code/game/objects/effects/decals/contraband_posters.dm b/code/game/objects/effects/decals/contraband_posters.dm
index c384cf5447d..85af374bc43 100644
--- a/code/game/objects/effects/decals/contraband_posters.dm
+++ b/code/game/objects/effects/decals/contraband_posters.dm
@@ -9,7 +9,6 @@
name = "rolled-up poster"
desc = "The poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as contraband aboard Nanotrasen space facilities."
icon = 'icons/obj/contraband.dmi'
- force = 0
resistance_flags = FLAMMABLE
var/poster_type
var/obj/structure/sign/poster/poster_structure
@@ -53,7 +52,6 @@
name = "poster"
desc = "A large piece of space-resistant printed paper."
icon = 'icons/obj/contraband.dmi'
- anchored = TRUE
var/original_name
var/random_basetype
var/ruined = FALSE
@@ -207,7 +205,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/sign/poster/random, 32, 32)
/obj/structure/sign/poster/contraband
poster_item_name = "contraband poster"
poster_item_desc = "This poster comes with its own automatic adhesive mechanism, for easy pinning to any vertical surface. Its vulgar themes have marked it as contraband aboard Nanotrasen space facilities."
- poster_item_icon_state = "rolled_poster"
/obj/structure/sign/poster/contraband/random
name = "random contraband poster"
diff --git a/code/game/objects/effects/decals/misc_decals.dm b/code/game/objects/effects/decals/misc_decals.dm
index d287bbd3143..334d3c06c5e 100644
--- a/code/game/objects/effects/decals/misc_decals.dm
+++ b/code/game/objects/effects/decals/misc_decals.dm
@@ -1,6 +1,5 @@
// Used for spray that you spray at walls, tables, hydrovats etc
/obj/effect/decal/spraystill
- density = FALSE
layer = 50
plane = HUD_PLANE
@@ -27,7 +26,6 @@
/obj/effect/decal/snow
name = "snow"
- density = FALSE
layer = TURF_DECAL_LAYER
icon = 'icons/turf/snow.dmi'
icon_state = "snow"
@@ -46,14 +44,12 @@
/obj/effect/decal/leaves
name = "fall leaves"
- density = FALSE
layer = HIGH_TURF_LAYER
icon = 'icons/obj/flora/plants.dmi'
icon_state = "fallleaves"
/obj/effect/decal/straw
name = "scattered straw"
- density = FALSE
layer = HIGH_TURF_LAYER
icon = 'icons/obj/flora/plants.dmi'
icon_state = "strawscattered"
diff --git a/code/game/objects/effects/decals/turfdecals/weather_decals.dm b/code/game/objects/effects/decals/turfdecals/weather_decals.dm
index f00a76df5e7..627410fa59b 100644
--- a/code/game/objects/effects/decals/turfdecals/weather_decals.dm
+++ b/code/game/objects/effects/decals/turfdecals/weather_decals.dm
@@ -9,5 +9,4 @@
/obj/effect/turf_decal/weather/snow/corner
name = "snow corner piece"
- icon = 'icons/turf/snow.dmi'
icon_state = "snow_corner"
diff --git a/code/game/objects/effects/effect_system/effects_chem_smoke.dm b/code/game/objects/effects/effect_system/effects_chem_smoke.dm
index 3f6647d6434..3a057aafe20 100644
--- a/code/game/objects/effects/effect_system/effects_chem_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_chem_smoke.dm
@@ -5,8 +5,6 @@
/obj/effect/particle_effect/chem_smoke
icon = 'icons/goonstation/effects/64x64.dmi'
icon_state = "smoke"
- density = FALSE
- opacity = FALSE
layer = ABOVE_MOB_LAYER
animate_movement = NO_STEPS
var/matrix/first = matrix()
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index 19f9237f923..6ebffbe1adc 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -5,8 +5,6 @@
/obj/effect/particle_effect/foam
name = "foam"
icon_state = "foam"
- opacity = FALSE
- density = FALSE
gender = PLURAL
layer = OBJ_LAYER + 0.9
animate_movement = NO_STEPS
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index 16ce0355a68..4199d27440e 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -14,7 +14,6 @@
anchored = FALSE
plane = SMOKE_PLANE
layer = FLY_LAYER
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/steps = 0
var/lifetime = 10 SECONDS_TO_LIFE_CYCLES
var/direction
@@ -144,7 +143,6 @@
/obj/effect/particle_effect/smoke/steam
color = COLOR_OFF_WHITE
- lifetime = 10 SECONDS_TO_LIFE_CYCLES
causes_coughing = TRUE
/obj/effect/particle_effect/smoke/steam/smoke_mob(mob/living/carbon/breather)
diff --git a/code/game/objects/effects/effect_system/effects_water.dm b/code/game/objects/effects/effect_system/effects_water.dm
index 82357c480cb..6280a52680c 100644
--- a/code/game/objects/effects/effect_system/effects_water.dm
+++ b/code/game/objects/effects/effect_system/effects_water.dm
@@ -58,7 +58,6 @@
/obj/effect/particle_effect/steam
name = "steam"
icon_state = "extinguish"
- density = FALSE
/obj/effect/particle_effect/steam/New()
..()
diff --git a/code/game/objects/effects/effects.dm b/code/game/objects/effects/effects.dm
index 9d19c02bfc4..b3582b7a471 100644
--- a/code/game/objects/effects/effects.dm
+++ b/code/game/objects/effects/effects.dm
@@ -56,7 +56,6 @@
name = "Abstract object"
invisibility = INVISIBILITY_ABSTRACT
layer = TURF_LAYER
- density = FALSE
icon = null
icon_state = null
armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 100, RAD = 100, FIRE = 100, ACID = 100)
@@ -158,7 +157,6 @@
/// These effects can be added to anything to hold particles, which is useful because Byond only allows a single particle per atom
/obj/effect/abstract/particle_holder
- anchored = TRUE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
layer = ABOVE_ALL_MOB_LAYER
vis_flags = VIS_INHERIT_PLANE
diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm
index b86ae670a39..a0022251765 100644
--- a/code/game/objects/effects/forcefields.dm
+++ b/code/game/objects/effects/forcefields.dm
@@ -1,9 +1,7 @@
/obj/effect/forcefield
desc = "A space wizard's magic wall."
name = "FORCEWALL"
- icon = 'icons/effects/effects.dmi'
icon_state = "m_shield"
- opacity = FALSE
density = TRUE
var/lifetime = 30 SECONDS
@@ -58,7 +56,6 @@
return !blocks_atmos
/obj/structure/forcefield/mime
- icon = 'icons/effects/effects.dmi'
icon_state = "5"
name = "invisible wall"
alpha = 1
diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm
index 5fe35469754..1e1245f48e2 100644
--- a/code/game/objects/effects/glowshroom.dm
+++ b/code/game/objects/effects/glowshroom.dm
@@ -4,8 +4,6 @@
name = "glowshroom"
desc = "Mycena Bregprox, a species of mushroom that glows in the dark."
anchored = TRUE
- opacity = FALSE
- density = FALSE
icon = 'icons/obj/lighting.dmi'
icon_state = "glowshroomf"
base_icon_state = "glowshroom" //replaced in New
diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm
index a3deace4bdf..d5d83699fd7 100644
--- a/code/game/objects/effects/landmarks.dm
+++ b/code/game/objects/effects/landmarks.dm
@@ -42,11 +42,9 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp
/obj/effect/landmark/spawner/tradergearminor
name = "traderstart_specificgear_minor"
- icon_state = "questionmark"
/obj/effect/landmark/spawner/tradergearmajor
name = "traderstart_specificgear_major"
- icon_state = "questionmark"
/obj/effect/landmark/spawner/ert
name = "Response Team"
@@ -280,7 +278,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp
/obj/effect/landmark/start/assistant
name = "Assistant"
- icon_state = "Assistant"
/obj/effect/landmark/start/atmospheric
name = "Life Support Specialist"
diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
index d610ea2c3e4..20fdc9e5283 100644
--- a/code/game/objects/effects/mines.dm
+++ b/code/game/objects/effects/mines.dm
@@ -1,7 +1,6 @@
/obj/effect/mine
name = "dummy mine"
desc = "I better stay away from that thing."
- density = FALSE
icon = 'icons/obj/items.dmi'
icon_state = "uglyminearmed"
var/triggered = FALSE
@@ -113,7 +112,6 @@
desc = "pick me up."
icon = 'icons/effects/effects.dmi'
icon_state = "electricity2"
- density = FALSE
var/duration = 0
/obj/effect/mine/pickup/New()
diff --git a/code/game/objects/effects/misc_effects.dm b/code/game/objects/effects/misc_effects.dm
index 332ba00ba43..6b77b153ec0 100644
--- a/code/game/objects/effects/misc_effects.dm
+++ b/code/game/objects/effects/misc_effects.dm
@@ -134,10 +134,8 @@
render_target = "*snap[id]"
/obj/effect/frosty_breath
- icon = 'icons/effects/effects.dmi'
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
layer = ABOVE_MOB_LAYER
- anchored = TRUE
/obj/effect/frosty_breath/Initialize(mapload, mob/living/carbon/C)
. = ..()
diff --git a/code/game/objects/effects/overlays.dm b/code/game/objects/effects/overlays.dm
index c426e614042..3005a9e99a0 100644
--- a/code/game/objects/effects/overlays.dm
+++ b/code/game/objects/effects/overlays.dm
@@ -39,12 +39,10 @@
/obj/effect/overlay/sparkles
name = "sparkles"
- icon = 'icons/effects/effects.dmi'
icon_state = "shieldsparkles"
/obj/effect/overlay/adminoverlay
name = "adminoverlay"
- icon = 'icons/effects/effects.dmi'
icon_state = "admin"
layer = 4.1
@@ -63,7 +61,6 @@
/// Door overlay for animating closets
/obj/effect/overlay/closet_door
- anchored = TRUE
plane = FLOAT_PLANE
layer = FLOAT_LAYER
vis_flags = VIS_INHERIT_ID
@@ -71,7 +68,6 @@
/obj/effect/overlay/vis
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- anchored = TRUE
vis_flags = VIS_INHERIT_DIR
///When detected to be unused it gets set to world.time, after a while it gets removed
var/unused = 0
diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
index 33ebb47a8be..3ef8d050da2 100644
--- a/code/game/objects/effects/portals.dm
+++ b/code/game/objects/effects/portals.dm
@@ -208,8 +208,6 @@
name = "advanced portal"
desc = "A portal capable of bypassing bluespace interference."
icon_state = "portal1"
- failchance = 0
- precision = 0
ignore_tele_proof_area_setting = TRUE
#undef EFFECT_COOLDOWN
diff --git a/code/game/objects/effects/snowcloud.dm b/code/game/objects/effects/snowcloud.dm
index 15e97223482..233b00aa590 100644
--- a/code/game/objects/effects/snowcloud.dm
+++ b/code/game/objects/effects/snowcloud.dm
@@ -64,7 +64,6 @@
/obj/effect/snow
desc = "Perfect for making snow angels, or throwing at other people!"
- icon = 'icons/effects/effects.dmi'
icon_state = "snow1"
plane = FLOOR_PLANE
layer = ABOVE_ICYOVERLAY_LAYER
diff --git a/code/game/objects/effects/spawners/airlock_spawner.dm b/code/game/objects/effects/spawners/airlock_spawner.dm
index 7e0149408fe..aebdd5774cc 100644
--- a/code/game/objects/effects/spawners/airlock_spawner.dm
+++ b/code/game/objects/effects/spawners/airlock_spawner.dm
@@ -278,7 +278,6 @@ This spawner places pipe leading up to the interior door, you will need to finis
name = "square airlock spawner (interior east, exterior south)"
icon_state = "2x2_E_to_S"
interior_direction = EAST
- exterior_direction = SOUTH
/obj/effect/spawner/airlock/long/square/wide
name = "rectangular airlock spawner (interior north, exterior south)"
@@ -303,8 +302,6 @@ This spawner places pipe leading up to the interior door, you will need to finis
/obj/effect/spawner/airlock/long/square/three
name = "3 by 3 square airlock spawner (interior north, exterior south)"
icon_state = "3x3_N_to_S"
- interior_direction = NORTH
- exterior_direction = SOUTH
tiles_in_x_direction = 3
tiles_in_y_direction = 3
diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm
index 8b6b959473a..4fc02666332 100644
--- a/code/game/objects/effects/spawners/bombspawner.dm
+++ b/code/game/objects/effects/spawners/bombspawner.dm
@@ -17,7 +17,6 @@
btype = 1
/obj/effect/spawner/newbomb/radio
- btype = 0
/obj/effect/spawner/newbomb/New()
diff --git a/code/game/objects/effects/spawners/depot_spawners.dm b/code/game/objects/effects/spawners/depot_spawners.dm
index 0e9c2813c6a..b350db76ecd 100644
--- a/code/game/objects/effects/spawners/depot_spawners.dm
+++ b/code/game/objects/effects/spawners/depot_spawners.dm
@@ -1,7 +1,6 @@
/// Spawners for the Syndicate depot ruin.
/obj/effect/spawner/random/syndicate
name = "Syndicate Area Spawner"
- icon = 'icons/effects/random_spawners.dmi'
// Turrets
diff --git a/code/game/objects/effects/spawners/random/bluespace_tap_spawners.dm b/code/game/objects/effects/spawners/random/bluespace_tap_spawners.dm
index 32beefb7054..5b214141b2d 100644
--- a/code/game/objects/effects/spawners/random/bluespace_tap_spawners.dm
+++ b/code/game/objects/effects/spawners/random/bluespace_tap_spawners.dm
@@ -1,6 +1,5 @@
/obj/effect/spawner/random/bluespace_tap
name = "bluespace harvester reward spawner"
- spawn_loot_count = 1
// Common clothing pool
/obj/effect/spawner/random/bluespace_tap/clothes_common
@@ -209,7 +208,6 @@
// Common food pool
/obj/effect/spawner/random/bluespace_tap/food_common
name = "common fancy food"
- spawn_loot_count = 1
loot = list(
/obj/item/food/wingfangchu,
/obj/item/food/hotdog,
@@ -245,7 +243,6 @@
// Uncommon food pool
/obj/effect/spawner/random/bluespace_tap/food_uncommon
name = "uncommon fancy food"
- spawn_loot_count = 1
loot = list(
/obj/item/food/sliceable/cheesecake,
/obj/item/food/sliceable/bananacake,
@@ -278,7 +275,6 @@
// Rare food pool
/obj/effect/spawner/random/bluespace_tap/food_rare
name = "rare fancy food"
- spawn_loot_count = 1
loot = list(
/obj/item/food/monkeysdelight,
/obj/item/food/dionaroast,
diff --git a/code/game/objects/effects/spawners/random/decal_spawners.dm b/code/game/objects/effects/spawners/random/decal_spawners.dm
index d116a8844ef..caf96474fe4 100644
--- a/code/game/objects/effects/spawners/random/decal_spawners.dm
+++ b/code/game/objects/effects/spawners/random/decal_spawners.dm
@@ -43,7 +43,6 @@
spawn_loot_chance = 16
/obj/effect/spawner/random/cobweb
- icon = 'icons/effects/random_spawners.dmi'
/obj/effect/spawner/random/cobweb/left
name = "cobweb left 100% chance"
diff --git a/code/game/objects/effects/spawners/random/loot_spawners.dm b/code/game/objects/effects/spawners/random/loot_spawners.dm
index 6391d326a9d..5436955888c 100644
--- a/code/game/objects/effects/spawners/random/loot_spawners.dm
+++ b/code/game/objects/effects/spawners/random/loot_spawners.dm
@@ -1,17 +1,14 @@
/obj/effect/spawner/random/loot
name = "random loot spawner"
- icon_state = "loot"
/obj/effect/spawner/random/loot/contraband_posters
name = "5x contraband posters spawner"
spawn_loot_count = 5
- spawn_loot_double = TRUE
loot = list(/obj/item/poster/random_contraband)
/obj/effect/spawner/random/loot/cryo_beakers
name = "3x cryo beaker spawner"
spawn_loot_count = 3
- spawn_loot_double = TRUE
loot = list(/obj/item/reagent_containers/glass/beaker/bluespace)
/obj/effect/spawner/random/loot/good_times
@@ -51,7 +48,6 @@
/obj/effect/spawner/random/loot/coins
name = "coins spawner"
- spawn_loot_double = TRUE
loot = list(
/obj/item/coin/silver = 3,
/obj/item/coin/iron = 3,
diff --git a/code/game/objects/effects/spawners/random/misc_spawners.dm b/code/game/objects/effects/spawners/random/misc_spawners.dm
index 7affe2658c9..a045610af26 100644
--- a/code/game/objects/effects/spawners/random/misc_spawners.dm
+++ b/code/game/objects/effects/spawners/random/misc_spawners.dm
@@ -196,7 +196,6 @@
/obj/effect/spawner/random/fancy_table
name = "fancy table spawner"
- icon = 'icons/effects/random_spawners.dmi'
icon_state = "fancy_table"
loot_type_path = /obj/structure/table/wood/fancy
diff --git a/code/game/objects/effects/spawners/random/plushie_spawners.dm b/code/game/objects/effects/spawners/random/plushie_spawners.dm
index cbff56a8719..4a15172393b 100644
--- a/code/game/objects/effects/spawners/random/plushie_spawners.dm
+++ b/code/game/objects/effects/spawners/random/plushie_spawners.dm
@@ -1,6 +1,5 @@
/obj/effect/spawner/random/plushies
name = "plushie spawner"
- icon = 'icons/effects/random_spawners.dmi'
icon_state = "plushie"
loot = list(
list(
diff --git a/code/game/objects/effects/spawners/random/pool/misc_pools.dm b/code/game/objects/effects/spawners/random/pool/misc_pools.dm
index e5567ec2e76..9ec1b59a588 100644
--- a/code/game/objects/effects/spawners/random/pool/misc_pools.dm
+++ b/code/game/objects/effects/spawners/random/pool/misc_pools.dm
@@ -1,5 +1,4 @@
/datum/spawn_pool/whiteship_mobs
- available_points = 0
/obj/effect/spawner/random/pool/whiteship_mob
icon_state = "giftbox"
diff --git a/code/game/objects/effects/spawners/random/pool/space_loot.dm b/code/game/objects/effects/spawners/random/pool/space_loot.dm
index 407141a5688..e60150bab53 100644
--- a/code/game/objects/effects/spawners/random/pool/space_loot.dm
+++ b/code/game/objects/effects/spawners/random/pool/space_loot.dm
@@ -37,7 +37,6 @@
/obj/effect/spawner/random/pool/spaceloot/syndicate/common
name = "syndicate depot loot, common"
- icon_state = "loot"
point_value = 10
loot = list(
// Loot schema: costumes, toys, useless gimmick items
diff --git a/code/game/objects/effects/spawners/random/random_spawner.dm b/code/game/objects/effects/spawners/random/random_spawner.dm
index 8da43c51260..11d47f40284 100644
--- a/code/game/objects/effects/spawners/random/random_spawner.dm
+++ b/code/game/objects/effects/spawners/random/random_spawner.dm
@@ -4,9 +4,7 @@
/obj/effect/spawner/random
icon = 'icons/effects/random_spawners.dmi'
icon_state = "loot"
- layer = OBJ_LAYER
/// Stops persistent lootdrop spawns from being shoved into lockers
- anchored = TRUE
/// A list of possible items to spawn e.g. list(/obj/item, /obj/structure, /obj/effect)
var/list/loot
/// The subtypes AND type to combine with the loot list
diff --git a/code/game/objects/effects/spawners/random/tech_storage_spawners.dm b/code/game/objects/effects/spawners/random/tech_storage_spawners.dm
index 3fc57d33d3a..36c025e7d88 100644
--- a/code/game/objects/effects/spawners/random/tech_storage_spawners.dm
+++ b/code/game/objects/effects/spawners/random/tech_storage_spawners.dm
@@ -1,6 +1,5 @@
/obj/effect/spawner/random/tech_storage
name = "generic circuit board spawner"
- icon = 'icons/effects/random_spawners.dmi'
icon_state = "circuit_board"
spawn_loot_split = TRUE
spawn_loot_split_pixel_offsets = 3
diff --git a/code/game/objects/effects/spawners/random/traders/trader_department_spawners.dm b/code/game/objects/effects/spawners/random/traders/trader_department_spawners.dm
index 56f9b8f54ce..8f164aedca1 100644
--- a/code/game/objects/effects/spawners/random/traders/trader_department_spawners.dm
+++ b/code/game/objects/effects/spawners/random/traders/trader_department_spawners.dm
@@ -1,6 +1,5 @@
/obj/effect/spawner/random/traders
name = "trader item spawner"
- icon_state = "loot"
spawn_loot_count = 6
/obj/effect/spawner/random/traders/civilian
diff --git a/code/game/objects/effects/spawners/random/traders/trader_organization_spawners.dm b/code/game/objects/effects/spawners/random/traders/trader_organization_spawners.dm
index 6477e52e073..f92bfa79a7a 100644
--- a/code/game/objects/effects/spawners/random/traders/trader_organization_spawners.dm
+++ b/code/game/objects/effects/spawners/random/traders/trader_organization_spawners.dm
@@ -306,7 +306,6 @@
/obj/effect/spawner/random/traders/merchantguild_major
name = "12. merchant guild large gear"
- spawn_loot_count = 6 //Low-risk items, flavorful knick knacks - higher stock
loot = list(
/obj/item/clothing/suit/pimpcoat = 5,
/obj/item/dualsaber/toy = 5,
diff --git a/code/game/objects/effects/spawners/random_barrier.dm b/code/game/objects/effects/spawners/random_barrier.dm
index e69b07ec60f..ea3dea8dc3b 100644
--- a/code/game/objects/effects/spawners/random_barrier.dm
+++ b/code/game/objects/effects/spawners/random_barrier.dm
@@ -1,6 +1,5 @@
/obj/effect/spawner/random/barrier
name = "random barrier spawner"
- icon = 'icons/effects/random_spawners.dmi'
icon_state = "barrier"
loot = list(
/obj/effect/spawner/window/reinforced,
@@ -13,8 +12,6 @@
/obj/effect/spawner/random/barrier/temporary
name = "random temporary barrier spawner"
- icon = 'icons/effects/random_spawners.dmi'
- icon_state = "barrier"
loot = list(
/obj/structure/barricade/wooden,
/obj/structure/grille,
@@ -34,7 +31,6 @@
/obj/effect/spawner/random/barrier/obstruction
name = "obstruction"
- icon_state = "barrier"
loot = list(
/obj/machinery/door/airlock/welded,
/obj/structure/barricade/wooden,
diff --git a/code/game/objects/effects/spawners/windowspawner.dm b/code/game/objects/effects/spawners/windowspawner.dm
index 9f8ea753b9b..45cce03519c 100644
--- a/code/game/objects/effects/spawners/windowspawner.dm
+++ b/code/game/objects/effects/spawners/windowspawner.dm
@@ -114,13 +114,10 @@
name = "pod window spawner"
icon_state = "podwindow_spawner"
window_to_spawn_full = /obj/structure/window/full/shuttle/survival_pod
- useGrille = TRUE
/obj/effect/spawner/window/shuttle/survival_pod/tinted
name = "tinted pod window spawner"
- icon_state = "podwindow_spawner"
window_to_spawn_full = /obj/structure/window/full/shuttle/survival_pod/tinted
- useGrille = TRUE
/obj/effect/spawner/window/plastitanium
name = "plastitanium window spawner"
@@ -132,4 +129,3 @@
name = "leaded plastitanium window spawner"
icon_state = "leaded_plastitaniumwindow_spawner"
window_to_spawn_full = /obj/structure/window/full/plastitanium/rad_protect
- useGrille = TRUE
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index 9ae076b7535..91b301762c9 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -4,7 +4,6 @@
icon = 'icons/effects/effects.dmi'
icon_state = "stickyweb1"
anchored = TRUE
- density = FALSE
max_integrity = 15
cares_about_temperature = TRUE
var/mob/living/carbon/human/master_commander = null
@@ -33,7 +32,6 @@
take_damage(5, BURN, 0, 0)
/obj/structure/spider/stickyweb
- icon_state = "stickyweb1"
/obj/structure/spider/stickyweb/Initialize(mapload)
. = ..()
@@ -229,7 +227,6 @@
/obj/effect/decal/cleanable/spiderling_remains
name = "spiderling remains"
desc = "Green squishy mess."
- icon = 'icons/effects/effects.dmi'
icon_state = "greenshatter"
/obj/structure/spider/cocoon
diff --git a/code/game/objects/effects/temporary_visuals/cult_visuals.dm b/code/game/objects/effects/temporary_visuals/cult_visuals.dm
index 1b1aab03831..ec17fade455 100644
--- a/code/game/objects/effects/temporary_visuals/cult_visuals.dm
+++ b/code/game/objects/effects/temporary_visuals/cult_visuals.dm
@@ -3,7 +3,6 @@
icon = 'icons/effects/cult_effects.dmi'
icon_state = null
randomdir = FALSE
- duration = 10
/obj/effect/temp_visual/cult/sparks
randomdir = TRUE
@@ -12,7 +11,6 @@
/obj/effect/temp_visual/cult/sparks/hierophant
icon = 'icons/effects/effects.dmi'
- randomdir = TRUE
duration = 12
name = "purple sparks"
icon_state = "hierophant_blast"
diff --git a/code/game/objects/effects/temporary_visuals/misc_visuals.dm b/code/game/objects/effects/temporary_visuals/misc_visuals.dm
index 20df3bdf7e9..603a094c207 100644
--- a/code/game/objects/effects/temporary_visuals/misc_visuals.dm
+++ b/code/game/objects/effects/temporary_visuals/misc_visuals.dm
@@ -2,7 +2,6 @@
icon = 'icons/effects/blood.dmi'
icon_state = null
duration = 5
- randomdir = FALSE
layer = MOB_LAYER - 0.1
color = "#C80000"
var/splatter_type = "splatter"
@@ -50,8 +49,6 @@
/obj/effect/temp_visual/dir_setting/speedbike_trail
name = "speedbike trails"
icon_state = "ion_fade"
- duration = 10
- randomdir = FALSE
layer = MOB_LAYER - 0.2
/obj/effect/temp_visual/dir_setting/ninja
@@ -169,7 +166,6 @@
icon_state = "3"
light_range = LIGHT_RANGE_FIRE
light_color = LIGHT_COLOR_FIRE
- duration = 10
layer = MASSIVE_OBJ_LAYER
alpha = 250
blend_mode = BLEND_ADD
@@ -229,7 +225,6 @@
name = "kinetic explosion"
icon = 'icons/obj/projectiles.dmi'
icon_state = "kinetic_blast"
- layer = ABOVE_MOB_LAYER
duration = 4
/obj/effect/temp_visual/pka_explosion
@@ -274,7 +269,6 @@
name = "bleed"
icon = 'icons/effects/bleed.dmi'
icon_state = "bleed0"
- duration = 10
var/shrink = TRUE
/obj/effect/temp_visual/bleed/Initialize(mapload, atom/size_calc_target)
@@ -525,9 +519,7 @@
/obj/effect/temp_visual/electrocution
name = "electrocution"
- icon = 'icons/effects/effects.dmi'
icon_state = "electrocution"
- duration = 1 SECONDS
/obj/effect/temp_visual/electrocution/Initialize(mapload, set_duration)
duration = set_duration
diff --git a/code/game/objects/effects/temporary_visuals/projectile/impact.dm b/code/game/objects/effects/temporary_visuals/projectile/impact.dm
index b4ab549f620..ac6c7c943cc 100644
--- a/code/game/objects/effects/temporary_visuals/projectile/impact.dm
+++ b/code/game/objects/effects/temporary_visuals/projectile/impact.dm
@@ -9,7 +9,6 @@
icon_state = "impact_laser"
/obj/effect/projectile/impact/laser/blue
- name = "laser impact"
icon_state = "impact_blue"
/obj/effect/projectile/impact/disabler
diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm
index c6547d77d74..9a8834ae1d3 100644
--- a/code/game/objects/items/blueprints.dm
+++ b/code/game/objects/items/blueprints.dm
@@ -1,6 +1,5 @@
/obj/item/areaeditor
name = "area modification item"
- icon = 'icons/obj/items.dmi'
icon_state = "blueprints"
attack_verb = list("attacked", "bapped", "hit")
/// Extra text added to the description.
@@ -73,11 +72,8 @@
/obj/item/areaeditor/blueprints
name = "station blueprints"
desc = "Blueprints of the station. There is a \"CONFIDENTIAL\" stamp and several coffee stains on it."
- icon = 'icons/obj/items.dmi'
- icon_state = "blueprints"
fluffnotice = "Property of Nanotrasen. For heads of staff only. Store in high-security storage."
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- w_class = WEIGHT_CLASS_NORMAL
var/list/showing = list()
var/client/viewing
diff --git a/code/game/objects/items/chess.dm b/code/game/objects/items/chess.dm
index a520f671df4..40516ad7065 100644
--- a/code/game/objects/items/chess.dm
+++ b/code/game/objects/items/chess.dm
@@ -4,7 +4,6 @@
name = "Chess Piece"
desc = "A generic chess piece used in a game of chess."
icon = 'icons/obj/chess.dmi'
- w_class = WEIGHT_CLASS_NORMAL
//Black chess pieces.
diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm
index 706ce439b8a..9b33350886e 100644
--- a/code/game/objects/items/contraband.dm
+++ b/code/game/objects/items/contraband.dm
@@ -21,7 +21,6 @@
new /obj/item/reagent_containers/pill/zoom(src)
/obj/item/reagent_containers/pill/random_drugs
- name = "pill"
desc = "A cocktail of illicit designer drugs, who knows what might be in here."
/obj/item/reagent_containers/pill/random_drugs/Initialize(mapload)
diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm
index e42b87faf74..74ba3c49c65 100644
--- a/code/game/objects/items/control_wand.dm
+++ b/code/game/objects/items/control_wand.dm
@@ -175,7 +175,6 @@
/obj/item/door_remote/civillian
name = "civilian door remote"
- icon_state = "gangtool-white"
region_access = list(REGION_GENERAL)
additional_access = list(ACCESS_HOP)
diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm
index 36ab5e3bd7a..ce92f86f5e8 100644
--- a/code/game/objects/items/crayons.dm
+++ b/code/game/objects/items/crayons.dm
@@ -13,7 +13,6 @@
w_class = WEIGHT_CLASS_TINY
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_EARS
attack_verb = list("attacked", "coloured")
- toolspeed = 1
var/colour = COLOR_RED
var/drawtype = "rune"
var/list/graffiti = list("body","amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa","up","down","left","right","heart","borgsrogue","voxpox","shitcurity","catbeast","hieroglyphs1","hieroglyphs2","hieroglyphs3","security","syndicate1","syndicate2","nanotrasen","lie","valid","arrowleft","arrowright","arrowup","arrowdown","chicken","hailcrab","brokenheart","peace","scribble","scribble2","scribble3","skrek","squish","tunnelsnake","yip","youaredead")
@@ -173,9 +172,6 @@
/obj/item/toy/crayon/red
name = "red crayon"
- icon_state = "crayonred"
- colour = COLOR_RED
- dye_color = DYE_RED
/obj/item/toy/crayon/orange
name = "orange crayon"
diff --git a/code/game/objects/items/decorations.dm b/code/game/objects/items/decorations.dm
index a410d0e59f0..bbc90e85bad 100644
--- a/code/game/objects/items/decorations.dm
+++ b/code/game/objects/items/decorations.dm
@@ -218,7 +218,6 @@
icon = 'icons/obj/decorations.dmi'
icon_state = ""
density = TRUE
- anchored = FALSE
max_integrity = 100
/obj/structure/decorative_structures/wrench_act(mob/user, obj/item/I)
diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm
index 3663889b2e7..11982dbeac5 100644
--- a/code/game/objects/items/devices/camera_bug.dm
+++ b/code/game/objects/items/devices/camera_bug.dm
@@ -114,7 +114,6 @@
/obj/item/paper/camera_bug
name = "\improper Camera Bug Guide"
- icon_state = "paper"
info = {"Instructions on your new invasive camera utility
This camera bug can access all default cameras on the station, along with the hidden cameras provided in this kit.
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index e11097b5c77..d256f09baf0 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -96,8 +96,6 @@
name = ""
desc = ""
resistance_flags = INDESTRUCTIBLE | FREEZE_PROOF
- density = FALSE
- anchored = TRUE
var/can_move = TRUE
var/obj/item/chameleon/master = null
diff --git a/code/game/objects/items/devices/flash.dm b/code/game/objects/items/devices/flash.dm
index 64c2e9284f3..eb5a2b119b9 100644
--- a/code/game/objects/items/devices/flash.dm
+++ b/code/game/objects/items/devices/flash.dm
@@ -5,10 +5,8 @@
icon_state = "flash"
item_state = "flashtool" //looks exactly like a flash (and nothing like a flashbang)
belt_icon = "flash"
- throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_speed = 3
- throw_range = 7
flags = CONDUCT
materials = list(MAT_METAL = 300, MAT_GLASS = 300)
origin_tech = "magnets=2;combat=1"
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index 5c7936e88bf..d63b51740b8 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -93,7 +93,6 @@
item_state = ""
w_class = WEIGHT_CLASS_TINY
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_EARS
- flags = CONDUCT
brightness_on = 2
var/colour = "blue" // Ink color
@@ -111,7 +110,6 @@
desc = "A miniature lamp, that might be used by small robots."
icon_state = "penlight"
item_state = ""
- flags = CONDUCT
brightness_on = 2
w_class = WEIGHT_CLASS_TINY
@@ -123,7 +121,6 @@
item_state = "lamp"
brightness_on = 5
w_class = WEIGHT_CLASS_BULKY
- flags = CONDUCT
materials = list()
on = TRUE
light_color = "#fff4bb"
@@ -326,8 +323,6 @@
brightness_on = 7
icon_state = "torch"
item_state = "torch"
- lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/items_righthand.dmi'
light_color = LIGHT_COLOR_ORANGE
on_damage = 10
@@ -335,7 +330,6 @@
gender = PLURAL
name = "glowing slime extract"
desc = "A glowing ball of what appears to be amber."
- icon = 'icons/obj/lighting.dmi'
icon_state = "slime-on"
item_state = "slime"
w_class = WEIGHT_CLASS_TINY
@@ -412,7 +406,6 @@
icon_state = null
light_color = null
brightness_on = 0
- light_range = 0
light_power = 10
alpha = 0
layer = 0
@@ -425,6 +418,5 @@
name = "eyelight"
desc = "This shouldn't exist outside of someone's head, how are you seeing this?"
light_range = 15
- light_power = 1
flags = CONDUCT | DROPDEL
actions_types = list()
diff --git a/code/game/objects/items/devices/handheld_defib.dm b/code/game/objects/items/devices/handheld_defib.dm
index 09ea14d0468..743e7b41907 100644
--- a/code/game/objects/items/devices/handheld_defib.dm
+++ b/code/game/objects/items/devices/handheld_defib.dm
@@ -2,8 +2,6 @@
name = "handheld defibrillator"
desc = "Used to restart stopped hearts."
icon = 'icons/obj/medical.dmi'
- lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/items_righthand.dmi'
icon_state = "defib-on"
item_state = "defib"
belt_icon = "defib"
diff --git a/code/game/objects/items/devices/radio/beacon.dm b/code/game/objects/items/devices/radio/beacon.dm
index 479a52787d8..0144a025aca 100644
--- a/code/game/objects/items/devices/radio/beacon.dm
+++ b/code/game/objects/items/devices/radio/beacon.dm
@@ -7,7 +7,6 @@
origin_tech = "bluespace=1"
flags = CONDUCT
slot_flags = ITEM_SLOT_BELT
- throw_speed = 2
throw_range = 9
w_class = WEIGHT_CLASS_SMALL
@@ -66,7 +65,6 @@
qdel(src)
/obj/item/beacon/syndicate/bundle
- name = "suspicious beacon"
desc = "A label on it reads: Activate to select a bundle."
var/list/static/bundles = list(
"Spy" = /obj/item/storage/box/syndie_kit/bundle/spy,
@@ -113,7 +111,6 @@
user.put_in_hands(bundle)
/obj/item/beacon/syndicate/power_sink
- name = "suspicious beacon"
desc = "A label on it reads: Warning: Activating this device will send a power sink to your location."
/obj/item/beacon/syndicate/power_sink/attack_self__legacy__attackchain(mob/user)
@@ -125,7 +122,6 @@
qdel(src)
/obj/item/beacon/syndicate/bomb
- name = "suspicious beacon"
desc = "A label on it reads: Warning: Activating this device will send a high-ordinance explosive to your location."
origin_tech = "bluespace=5;syndicate=5"
var/bomb = /obj/machinery/syndicatebomb
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index a1999c826e8..b313b289e70 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -42,7 +42,6 @@
/obj/item/encryptionkey/soviet
name = "soviet encryption key"
- icon_state = "cypherkey"
channels = list("Special Ops" = 1)
origin_tech = "syndicate=4"
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 17e5d73a3d3..fcddd192d17 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -106,7 +106,6 @@
name = "syndicate headset"
desc = "A syndicate headset that can be used to hear all radio frequencies. Protects ears from flashbangs."
flags = EARBANGPROTECT
- origin_tech = "syndicate=3"
icon_state = "syndie_headset"
item_state = "syndie_headset"
@@ -147,7 +146,6 @@
name = "security radio headset"
desc = "This is used by your elite security force."
icon_state = "sec_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/headset_sec
/obj/item/radio/headset/headset_sec/alt
@@ -175,56 +173,48 @@
name = "engineering radio headset"
desc = "When the engineers wish to chat like girls."
icon_state = "eng_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/headset_eng
/obj/item/radio/headset/headset_rob
name = "robotics radio headset"
desc = "Made specifically for the roboticists who cannot decide between departments."
icon_state = "rob_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/headset_rob
/obj/item/radio/headset/headset_med
name = "medical radio headset"
desc = "A headset for the trained staff of the medbay."
icon_state = "med_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/headset_med
/obj/item/radio/headset/headset_med/para
name = "paramedic radio headset"
desc = "A headset for the trusty paramedic, Nanotrasen search and rescue."
icon_state = "para_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/headset_med/para
/obj/item/radio/headset/headset_sci
name = "science radio headset"
desc = "A sciency headset. Like usual."
icon_state = "sci_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/headset_sci
/obj/item/radio/headset/headset_medsci
name = "medical research radio headset"
desc = "A headset that is a result of the mating between medical and science."
icon_state = "medsci_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/headset_medsci
/obj/item/radio/headset/headset_com
name = "command radio headset"
desc = "A headset with a commanding channel."
icon_state = "com_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/headset_com
/obj/item/radio/headset/heads/captain
name = "captain's headset"
desc = "The headset of the boss."
icon_state = "com_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/captain
/obj/item/radio/headset/heads/captain/alt
@@ -238,14 +228,12 @@
name = "research director's headset"
desc = "Headset of the researching God."
icon_state = "com_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/rd
/obj/item/radio/headset/heads/hos
name = "head of security's headset"
desc = "The headset of the man who protects your worthless lives."
icon_state = "com_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/hos
/obj/item/radio/headset/heads/hos/alt
@@ -259,35 +247,30 @@
name = "chief engineer's headset"
desc = "The headset of the guy who is in charge of morons."
icon_state = "com_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/ce
/obj/item/radio/headset/heads/cmo
name = "chief medical officer's headset"
desc = "The headset of the highly trained medical chief."
icon_state = "com_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/cmo
/obj/item/radio/headset/heads/hop
name = "head of personnel's headset"
desc = "The headset of the guy who will one day be captain."
icon_state = "com_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/hop
/obj/item/radio/headset/heads/qm
name = "quartermaster's headset"
desc = "Smelling of tobacco and gunpowder, this headset has likely seen many backroom deals."
icon_state = "com_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/qm
/obj/item/radio/headset/headset_cargo
name = "supply radio headset"
desc = "A headset used by the cargo department."
icon_state = "cargo_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/headset_cargo
/obj/item/radio/headset/headset_cargo/mining
@@ -304,28 +287,24 @@
name = "service radio headset"
desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean."
icon_state = "srv_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/headset_service
/obj/item/radio/headset/heads/ntrep
name = "nanotrasen representative's headset"
desc = "The headset of the Nanotrasen Representative."
icon_state = "com_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/ntrep
/obj/item/radio/headset/headset_nct
name = "\improper Nanotrasen career trainer radio headset"
desc = "This is used by your well-taught corporate training team."
icon_state = "com_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/headset_nct
/obj/item/radio/headset/heads/magistrate
name = "magistrate's headset"
desc = "The headset of the Magistrate."
icon_state = "com_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/magistrate
/obj/item/radio/headset/heads/magistrate/alt
@@ -339,7 +318,6 @@
name = "blueshield's headset"
desc = "The headset of the Blueshield."
icon_state = "com_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/blueshield
/obj/item/radio/headset/heads/blueshield/alt
@@ -353,7 +331,6 @@
name = "emergency response team headset"
desc = "The headset of the boss's boss."
icon_state = "com_headset"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/ert
freqlock = TRUE
@@ -398,7 +375,6 @@
desc = "Integrated AI radio transceiver."
icon = 'icons/obj/robot_component.dmi'
icon_state = "radio"
- item_state = "headset"
ks2type = /obj/item/encryptionkey/heads/ai_integrated
var/myAi = null // Atlantis: Reference back to the AI which has this radio.
var/disabledAi = FALSE // Atlantis: Used to manually disable AI's integrated radio via intellicard menu.
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index e9811960327..61f8dac8578 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -6,7 +6,6 @@
anchored = TRUE
w_class = WEIGHT_CLASS_BULKY
canhear_range = 2
- flags = CONDUCT
blocks_emissive = FALSE
var/circuitry_installed = 1
var/buildstage = 0
@@ -16,7 +15,6 @@
/obj/item/radio/intercom/custom
name = "station intercom (Custom)"
custom_name = TRUE
- broadcasting = FALSE
listening = FALSE
/obj/item/radio/intercom/interrogation
@@ -42,8 +40,6 @@
/obj/item/radio/intercom/department
canhear_range = 5
custom_name = TRUE
- broadcasting = FALSE
- listening = TRUE
/obj/item/radio/intercom/department/medbay
name = "station intercom (Medbay)"
@@ -284,7 +280,6 @@
w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL = 100, MAT_GLASS = 100)
origin_tech = "engineering=2;programming=1"
- toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
/obj/item/radio/intercom/locked
diff --git a/code/game/objects/items/devices/radio/radio_objects.dm b/code/game/objects/items/devices/radio/radio_objects.dm
index dda8d996a33..08b000980b6 100644
--- a/code/game/objects/items/devices/radio/radio_objects.dm
+++ b/code/game/objects/items/devices/radio/radio_objects.dm
@@ -65,7 +65,6 @@ GLOBAL_LIST_EMPTY(deadsay_radio_systems)
flags = CONDUCT
slot_flags = ITEM_SLOT_BELT
- throw_speed = 2
throw_range = 9
w_class = WEIGHT_CLASS_SMALL
@@ -631,7 +630,6 @@ GLOBAL_LIST_EMPTY(deadsay_radio_systems)
icon = 'icons/obj/robot_component.dmi' // Cyborgs radio icons should look like the component.
icon_state = "radio"
has_loudspeaker = TRUE
- loudspeaker = FALSE
canhear_range = 0
dog_fashion = null
freqlock = TRUE // don't let cyborgs change the default channel of their internal radio away from common
@@ -765,13 +763,10 @@ GLOBAL_LIST_EMPTY(deadsay_radio_systems)
/obj/item/radio/off
listening = FALSE
- dog_fashion = /datum/dog_fashion/back
/obj/item/radio/phone
- broadcasting = FALSE
icon = 'icons/obj/items.dmi'
icon_state = "red_phone"
- listening = TRUE
name = "phone"
dog_fashion = null
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index faa919538e2..aa8f60c850e 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -145,7 +145,6 @@ SLIME SCANNER
slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
- throw_range = 7
materials = list(MAT_METAL=200)
origin_tech = "magnets=1;biotech=1"
/// Can be SIMPLE_HEALTH_SCAN (damage is only shown as a single % value), or DETAILED_HEALTH_SCAN (shows the % value and also damage for every specific limb).
@@ -597,7 +596,6 @@ SLIME SCANNER
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
throw_speed = 3
- throw_range = 7
materials = list(MAT_METAL = 210, MAT_GLASS = 140)
origin_tech = "magnets=1;engineering=1"
var/cooldown = FALSE
@@ -925,7 +923,6 @@ SLIME SCANNER
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
throw_speed = 3
- throw_range = 7
materials = list(MAT_METAL=30, MAT_GLASS=20)
/obj/item/slime_scanner/attack__legacy__attackchain(mob/living/M, mob/living/user)
@@ -1002,7 +999,6 @@ SLIME SCANNER
desc = "Scan an entire body to prepare for field surgery. Consumes power for each scan."
/obj/item/bodyanalyzer/borg/syndicate
- scan_time = 5 SECONDS
scan_cd = 20 SECONDS
/obj/item/bodyanalyzer/New()
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index ef64e9412ac..e7c33db163e 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -8,7 +8,6 @@
slot_flags = ITEM_SLOT_BELT
materials = list(MAT_METAL = 180, MAT_GLASS = 90)
force = 2
- throwforce = 0
drop_sound = 'sound/items/handling/taperecorder_drop.ogg'
pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg'
/// If its currently recording
@@ -273,7 +272,6 @@
w_class = WEIGHT_CLASS_TINY
materials = list(MAT_METAL = 40, MAT_GLASS = 10)
force = 1
- throwforce = 0
drop_sound = 'sound/items/handling/tape_drop.ogg'
pickup_sound = 'sound/items/handling/tape_pickup.ogg'
var/max_capacity = 600
diff --git a/code/game/objects/items/devices/thermal_drill.dm b/code/game/objects/items/devices/thermal_drill.dm
index 203b54bd046..ac7dc5948eb 100644
--- a/code/game/objects/items/devices/thermal_drill.dm
+++ b/code/game/objects/items/devices/thermal_drill.dm
@@ -1,7 +1,6 @@
/obj/item/thermal_drill
name = "thermal safe drill"
desc = "A tungsten carbide thermal drill with magnetic clamps for the purpose of drilling hardened objects. Guaranteed 100% jam proof."
- icon = 'icons/obj/items.dmi'
icon_state = "hardened_drill"
w_class = WEIGHT_CLASS_GIGANTIC
force = 15.0
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 7ae1770f955..628ec44e49e 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -242,7 +242,6 @@
/obj/item/paper/teleporter
name = "Teleporter Guide"
- icon_state = "paper"
info = {"Instructions on your new prototype syndicate teleporter
This teleporter will teleport the user 4-8 meters in the direction they are facing. Unlike the cult veil shifter, you can not drag people with you.
diff --git a/code/game/objects/items/documents.dm b/code/game/objects/items/documents.dm
index 16563ba3bc7..6d4f0c85af4 100644
--- a/code/game/objects/items/documents.dm
+++ b/code/game/objects/items/documents.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "docs_generic"
item_state = "paper"
- throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_range = 1
throw_speed = 1
@@ -28,7 +27,6 @@
/obj/item/documents/syndicate/red
name = "'Red' secret documents"
- desc = "Documents printed on special copy-protected paper. They detail sensitive Syndicate operational intelligence."
icon_state = "docs_red"
/obj/item/documents/syndicate/red/examine(mob/user)
@@ -37,7 +35,6 @@
/obj/item/documents/syndicate/blue
name = "'Blue' secret documents"
- desc = "Documents printed on special copy-protected paper. They detail sensitive Syndicate operational intelligence."
icon_state = "docs_blue"
/obj/item/documents/syndicate/blue/examine(mob/user)
@@ -46,7 +43,6 @@
/obj/item/documents/syndicate/yellow
name = "'Yellow' secret documents"
- desc = "Documents printed on special copy-protected paper. They detail sensitive Syndicate operational intelligence."
icon_state = "docs_yellow"
resistance_flags = NONE
@@ -81,7 +77,6 @@
name = "\improper D.V.O.R.A.K Blackbox Disk"
desc = "This disk contains a full record of all information that passed through D.V.O.R.A.K's systems during its uptime, not to mention what may have gone wrong. NT might be interested in this."
icon = 'icons/obj/module.dmi'
- w_class = WEIGHT_CLASS_TINY
item_state = "card-id"
icon_state = "holodisk"
drop_sound = 'sound/items/handling/disk_drop.ogg'
diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm
index cc04d4e7080..0525e12fc90 100644
--- a/code/game/objects/items/flag.dm
+++ b/code/game/objects/items/flag.dm
@@ -51,7 +51,6 @@
/obj/item/flag/nt
name = "\improper Nanotrasen flag"
desc = "A flag proudly boasting the logo of NT."
- icon_state = "ntflag"
/obj/item/flag/clown
name = "\improper Clown Unity flag"
@@ -171,7 +170,6 @@
/obj/item/flag/command
name = "\improper Command flag"
desc = "The flag of the independent, sovereign nation of Command. Apparently the budget was all spent on this flag, rather than a creative name."
- icon_state = "ntflag"
//Antags
@@ -210,7 +208,6 @@
/obj/item/flag/chameleon
name = "chameleon flag"
desc = "A poor recreation of the official NT flag. It seems to shimmer a little."
- icon_state = "ntflag"
origin_tech = "syndicate=1;magnets=4"
var/updated_icon_state = null
var/used = FALSE
diff --git a/code/game/objects/items/granters/action_granters/summon_cheese.dm b/code/game/objects/items/granters/action_granters/summon_cheese.dm
index e79fbb403a1..67e38c91538 100644
--- a/code/game/objects/items/granters/action_granters/summon_cheese.dm
+++ b/code/game/objects/items/granters/action_granters/summon_cheese.dm
@@ -34,7 +34,6 @@
clothes_req = FALSE
overlay = null
action_icon_state = "cheese_wedge"
- action_background_icon_state = "bg_spell"
summon_type = list(/obj/item/food/sliced/cheesewedge)
summon_amt = 9
aoe_range = 1
diff --git a/code/game/objects/items/hand_item.dm b/code/game/objects/items/hand_item.dm
index 576c703f6d3..25495b85106 100644
--- a/code/game/objects/items/hand_item.dm
+++ b/code/game/objects/items/hand_item.dm
@@ -3,8 +3,6 @@
desc = "This is how real men fight."
icon_state = "latexballon"
item_state = "nothing"
- force = 0
- throwforce = 0
flags = DROPDEL | ABSTRACT
attack_verb = list("slapped")
hitsound = 'sound/weapons/slap.ogg'
diff --git a/code/game/objects/items/latexballoon.dm b/code/game/objects/items/latexballoon.dm
index 19a1b3fd1f5..3a898b1eed3 100644
--- a/code/game/objects/items/latexballoon.dm
+++ b/code/game/objects/items/latexballoon.dm
@@ -3,11 +3,8 @@
desc = "You wanted a fiery fist o' pain, but all you got was this dumb balloon."
icon_state = "latexballon"
item_state = "lgloves"
- force = 0
- throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_speed = 1
- throw_range = 7
cares_about_temperature = TRUE
var/state
var/datum/gas_mixture/air_contents = null
diff --git a/code/game/objects/items/mountable_frames/apc_frame.dm b/code/game/objects/items/mountable_frames/apc_frame.dm
index 2cdc4fb65e2..f23bf79b69a 100644
--- a/code/game/objects/items/mountable_frames/apc_frame.dm
+++ b/code/game/objects/items/mountable_frames/apc_frame.dm
@@ -5,7 +5,6 @@
icon_state = "apc_frame"
mount_requirements = MOUNTED_FRAME_SIMFLOOR | MOUNTED_FRAME_NOSPACE
- metal_sheets_refunded = 2
/obj/item/mounted/frame/apc_frame/try_build(turf/on_wall, mob/user)
if(!..())
diff --git a/code/game/objects/items/mountable_frames/extinguisher_frame.dm b/code/game/objects/items/mountable_frames/extinguisher_frame.dm
index 3347a0c2462..a2caa0ca400 100644
--- a/code/game/objects/items/mountable_frames/extinguisher_frame.dm
+++ b/code/game/objects/items/mountable_frames/extinguisher_frame.dm
@@ -5,7 +5,6 @@
icon_state = "extinguisher_frame"
mount_requirements = MOUNTED_FRAME_SIMFLOOR | MOUNTED_FRAME_NOSPACE
- metal_sheets_refunded = 2
/obj/item/mounted/frame/extinguisher/do_build(turf/on_wall, mob/user)
new /obj/structure/extinguisher_cabinet/empty(get_turf(src), get_dir(user, on_wall))
diff --git a/code/game/objects/items/mountable_frames/fire_alarm.dm b/code/game/objects/items/mountable_frames/fire_alarm.dm
index a17dd96c001..f7f31f37c1a 100644
--- a/code/game/objects/items/mountable_frames/fire_alarm.dm
+++ b/code/game/objects/items/mountable_frames/fire_alarm.dm
@@ -5,7 +5,6 @@
icon_state = "firealarm_frame"
mount_requirements = MOUNTED_FRAME_SIMFLOOR | MOUNTED_FRAME_NOSPACE
- metal_sheets_refunded = 2
/obj/item/mounted/frame/firealarm/do_build(turf/on_wall, mob/user)
new /obj/machinery/firealarm(get_turf(src), get_dir(user, on_wall), 1)
diff --git a/code/game/objects/items/mountable_frames/frames.dm b/code/game/objects/items/mountable_frames/frames.dm
index 30e4af872cc..a10673b85b1 100644
--- a/code/game/objects/items/mountable_frames/frames.dm
+++ b/code/game/objects/items/mountable_frames/frames.dm
@@ -2,7 +2,6 @@
name = "mountable frame"
desc = "Place it on a wall."
origin_tech = "materials=1;engineering=1"
- toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
///amount of metal sheets returned upon the frame being wrenched
diff --git a/code/game/objects/items/mountable_frames/intercom_frame.dm b/code/game/objects/items/mountable_frames/intercom_frame.dm
index c1468045d5c..120af60e4a1 100644
--- a/code/game/objects/items/mountable_frames/intercom_frame.dm
+++ b/code/game/objects/items/mountable_frames/intercom_frame.dm
@@ -5,7 +5,6 @@
icon_state = "intercom-frame"
mount_requirements = MOUNTED_FRAME_SIMFLOOR | MOUNTED_FRAME_NOSPACE
- metal_sheets_refunded = 2
/obj/item/mounted/frame/intercom/do_build(turf/on_wall, mob/user)
new /obj/item/radio/intercom(get_turf(src), get_dir(user, on_wall), 0)
diff --git a/code/game/objects/items/mountable_frames/light_frames.dm b/code/game/objects/items/mountable_frames/light_frames.dm
index 6f6002122b7..53f79110e68 100644
--- a/code/game/objects/items/mountable_frames/light_frames.dm
+++ b/code/game/objects/items/mountable_frames/light_frames.dm
@@ -5,7 +5,6 @@
icon_state = "tube-construct-item"
mount_requirements = MOUNTED_FRAME_SIMFLOOR
- metal_sheets_refunded = 2
///specifies which type of light fixture this frame will build
var/fixture_type = "tube"
@@ -44,7 +43,6 @@
/obj/item/mounted/frame/light_fixture/small
name = "small light fixture frame"
desc = "Used for building small lights."
- icon = 'icons/obj/lighting.dmi'
icon_state = "bulb-construct-item"
fixture_type = "bulb"
metal_sheets_refunded = 1
@@ -52,7 +50,6 @@
/obj/item/mounted/frame/light_fixture/floor
name = "floor light fixture frame"
desc = "Used for building floor lights."
- icon = 'icons/obj/lighting.dmi'
icon_state = "floor-construct-item"
fixture_type = "floor"
metal_sheets_refunded = 3
@@ -70,19 +67,15 @@
/obj/item/mounted/frame/light_fixture/clockwork/small
name = "brass small light fixture frame"
desc = "Used for building small brass lights."
- icon = 'icons/obj/lighting.dmi'
icon_state = "clockwork_bulb-construct-item"
fixture_type = "clockwork_bulb"
- metal_sheets_refunded = 0
brass_sheets_refunded = 1
/obj/item/mounted/frame/light_fixture/clockwork/floor
name = "brass floor light fixture frame"
desc = "Used for building brass floor lights."
- icon = 'icons/obj/lighting.dmi'
icon_state = "clockwork_floor-construct-item"
fixture_type = "clockwork_floor"
- metal_sheets_refunded = 0
brass_sheets_refunded = 3
buildon_types = list(/turf/simulated/floor)
allow_floor_mounting = TRUE
diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm
index fc256cf698e..b5fd094b169 100644
--- a/code/game/objects/items/random_items.dm
+++ b/code/game/objects/items/random_items.dm
@@ -27,7 +27,6 @@
/obj/item/reagent_containers/drinks/bottle/random_drink
name = "unlabelled drink"
- icon = 'icons/obj/drinks.dmi'
/obj/item/reagent_containers/drinks/bottle/random_drink/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/items/robot/items/inflatable_tool.dm b/code/game/objects/items/robot/items/inflatable_tool.dm
index 0bf7cd77f68..6d7b999602f 100644
--- a/code/game/objects/items/robot/items/inflatable_tool.dm
+++ b/code/game/objects/items/robot/items/inflatable_tool.dm
@@ -1,6 +1,4 @@
/obj/item/inflatable/cyborg
- name = "inflatable wall"
- desc = "A folded membrane which rapidly expands into a large cubical shape on activation."
var/power_use = 400
var/structure_type = /obj/structure/inflatable
/// How long it takes to inflate
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index 93343db6452..eaeb81449e0 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -7,7 +7,6 @@
var/list/part = null
var/sabotaged = FALSE //Emagging limbs can have repercussions when installed as prosthetics.
var/model_info = "Unbranded"
- dir = SOUTH
/obj/item/robot_parts/New(newloc, model)
..(newloc)
diff --git a/code/game/objects/items/salvage.dm b/code/game/objects/items/salvage.dm
index 05dd4d4175f..56b8a95dbe2 100644
--- a/code/game/objects/items/salvage.dm
+++ b/code/game/objects/items/salvage.dm
@@ -9,7 +9,6 @@
hitsound = 'sound/items/handling/salvagepickup.ogg'
pickup_sound = 'sound/items/handling/salvagepickup.ogg'
drop_sound = 'sound/items/handling/salvagedrop.ogg'
- w_class = WEIGHT_CLASS_NORMAL
/obj/item/salvage/examine(mob/user)
. = ..()
diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm
index 267ec6fec6a..88f712cb6a5 100644
--- a/code/game/objects/items/shooting_range.dm
+++ b/code/game/objects/items/shooting_range.dm
@@ -4,7 +4,6 @@
desc = "A shooting target."
icon = 'icons/obj/objects.dmi'
icon_state = "target_h"
- density = FALSE
var/hp = 1800
/obj/item/target/Destroy()
diff --git a/code/game/objects/items/sport.dm b/code/game/objects/items/sport.dm
index 3e9e08b3f76..6a094b935f5 100644
--- a/code/game/objects/items/sport.dm
+++ b/code/game/objects/items/sport.dm
@@ -4,11 +4,6 @@
desc = "An inflatable ball of fun, enjoyed on many beaches."
icon_state = "ball"
item_state = "beachball"
- density = FALSE
- anchored = FALSE
- w_class = WEIGHT_CLASS_NORMAL
- force = 0
- throwforce = 0
throw_speed = 1
throw_range = 20
flags = CONDUCT
diff --git a/code/game/objects/items/stacks/medical_packs.dm b/code/game/objects/items/stacks/medical_packs.dm
index 56119f68b74..fc94995a094 100644
--- a/code/game/objects/items/stacks/medical_packs.dm
+++ b/code/game/objects/items/stacks/medical_packs.dm
@@ -6,7 +6,6 @@
max_amount = 6
w_class = WEIGHT_CLASS_TINY
throw_speed = 3
- throw_range = 7
resistance_flags = FLAMMABLE
max_integrity = 40
parent_stack = TRUE
diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm
index 4c244f375d4..a8946b749fa 100644
--- a/code/game/objects/items/stacks/nanopaste.dm
+++ b/code/game/objects/items/stacks/nanopaste.dm
@@ -8,7 +8,6 @@
origin_tech = "materials=2;engineering=3"
amount = 6
max_amount = 6
- toolspeed = 1
merge_type = /obj/item/stack/nanopaste
/obj/item/stack/nanopaste/attack__legacy__attackchain(mob/living/M as mob, mob/user as mob)
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 092369e489e..18ef2a39e71 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -27,16 +27,12 @@ GLOBAL_LIST_INIT(rod_recipes, list (
icon_state = "rods-5"
item_state = "rods"
flags = CONDUCT
- w_class = WEIGHT_CLASS_NORMAL
force = 9.0
throwforce = 10.0
throw_speed = 3
- throw_range = 7
materials = list(MAT_METAL=1000)
- max_amount = 50
attack_verb = list("hit", "bludgeoned", "whacked")
hitsound = 'sound/weapons/grenadelaunch.ogg'
- toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
merge_type = /obj/item/stack/rods
@@ -97,10 +93,7 @@ GLOBAL_LIST_INIT(rod_recipes, list (
desc = "Treated, specialized iron rods. When exposed to the vacuum of space their coating breaks off, but they can hold up against the extreme heat of molten liquids."
singular_name = "heat resistant rod"
color = "#5286b9ff"
- flags = CONDUCT
- w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL = 1000, MAT_TITANIUM = 1000, MAT_PLASMA = 1000)
- max_amount = 50
resistance_flags = FIRE_PROOF | LAVA_PROOF
merge_type = /obj/item/stack/rods/lava
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index 69973e1d970..dbffc34196d 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -33,7 +33,6 @@ GLOBAL_LIST_INIT(glass_recipes, list (
materials = list(MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 100)
resistance_flags = ACID_PROOF
- origin_tech = "materials=1"
created_window = /obj/structure/window/basic
full_window = /obj/structure/window/full/basic
merge_type = /obj/item/stack/sheet/glass
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 482adb9c3f4..100ff35c44a 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -68,7 +68,6 @@ GLOBAL_LIST_INIT(lizard_recipes, list(
icon = 'icons/obj/stacks/organic.dmi'
icon_state = "sheet-hide"
origin_tech = "materials=2"
- max_amount = 50
/obj/item/stack/sheet/animalhide/xeno
name = "alien hide"
@@ -180,12 +179,10 @@ GLOBAL_LIST_INIT(sinew_recipes, list (
/obj/item/stack/sheet/animalhide/goliath_hide
name = "goliath hide plates"
desc = "Pieces of a goliath's rocky hide, these might be able to make your miner equipment such as suits, plasmaman helmets, borgs and Ripley class exosuits a bit more durable to attack from the local fauna."
- icon = 'icons/obj/stacks/organic.dmi'
icon_state = "goliath_hide"
item_state = "goliath_hide"
singular_name = "hide plate"
flags = NOBLUDGEON
- w_class = WEIGHT_CLASS_NORMAL
layer = MOB_LAYER
dynamic_icon_state = TRUE
var/static/list/goliath_platable_armor_typecache = typecacheof(list(
@@ -244,7 +241,6 @@ GLOBAL_LIST_INIT(sinew_recipes, list (
item_state = "armor_plate"
singular_name = "armor plate"
flags = NOBLUDGEON
- w_class = WEIGHT_CLASS_NORMAL
layer = MOB_LAYER
/obj/item/stack/sheet/animalhide/armor_plate/afterattack__legacy__attackchain(atom/target, mob/user, proximity_flag)
@@ -271,12 +267,10 @@ GLOBAL_LIST_INIT(sinew_recipes, list (
/obj/item/stack/sheet/animalhide/ashdrake
name = "ash drake hide"
desc = "The strong, scaled hide of an ash drake. Can be attached to the mech itself, greatly enhancing its protective characteristics. Unfortunately, only working class exosuits have notches for such armor."
- icon = 'icons/obj/stacks/organic.dmi'
icon_state = "dragon_hide"
item_state = "dragon_hide"
singular_name = "drake plate"
flags = NOBLUDGEON
- w_class = WEIGHT_CLASS_NORMAL
layer = MOB_LAYER
dynamic_icon_state = TRUE
diff --git a/code/game/objects/items/stacks/sheets/light.dm b/code/game/objects/items/stacks/sheets/light.dm
index d0a3c536124..adf1749ba6c 100644
--- a/code/game/objects/items/stacks/sheets/light.dm
+++ b/code/game/objects/items/stacks/sheets/light.dm
@@ -5,7 +5,6 @@
desc = "A glass tile, which is wired, somehow."
icon = 'icons/obj/tiles.dmi'
icon_state = "glass_wire"
- w_class = WEIGHT_CLASS_NORMAL
force = 3.0
throwforce = 5.0
throw_speed = 5
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 384826dcbcf..b75f13a0b30 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -144,8 +144,6 @@ GLOBAL_LIST_INIT(snow_recipes, list(
))
/obj/item/stack/sheet/mineral
- force = 5
- throwforce = 5
throw_speed = 3
/obj/item/stack/sheet/mineral/Initialize(mapload, new_amount, merge)
@@ -163,7 +161,6 @@ GLOBAL_LIST_INIT(snow_recipes, list(
icon_state = "sheet-sandstone"
item_state = "sheet-sandstone"
throw_range = 5
- origin_tech = "materials=1"
sheettype = "sandstone"
materials = list(MAT_GLASS = MINERAL_MATERIAL_AMOUNT)
@@ -506,11 +503,7 @@ GLOBAL_LIST_INIT(sandbag_recipes, list (
icon_state = "sheet-titanium"
item_state = "sheet-titanium"
singular_name = "titanium sheet"
- force = 5
- throwforce = 5
- w_class = WEIGHT_CLASS_NORMAL
throw_speed = 1
- throw_range = 3
sheettype = "titanium"
merge_type = /obj/item/stack/sheet/mineral/titanium
materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT)
@@ -548,11 +541,7 @@ GLOBAL_LIST_INIT(titanium_recipes, list(
icon_state = "sheet-plastitanium"
item_state = "sheet-plastitanium"
singular_name = "plastitanium sheet"
- force = 5
- throwforce = 5
- w_class = WEIGHT_CLASS_NORMAL
throw_speed = 1
- throw_range = 3
sheettype = "plastitanium"
merge_type = /obj/item/stack/sheet/mineral/plastitanium
materials = list(MAT_TITANIUM = MINERAL_MATERIAL_AMOUNT, MAT_PLASMA = MINERAL_MATERIAL_AMOUNT)
@@ -588,9 +577,6 @@ GLOBAL_LIST_INIT(plastitanium_recipes, list(
item_state = "sheet-abductor"
dynamic_icon_state = FALSE
singular_name = "alien alloy sheet"
- force = 5
- throwforce = 5
- w_class = WEIGHT_CLASS_NORMAL
throw_speed = 1
origin_tech = "materials=6;abductor=1"
sheettype = "abductor"
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 2098a89f918..e2af3ddf222 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -139,7 +139,6 @@ GLOBAL_LIST_INIT(metal_recipes, list(
throwforce = 10.0
flags = CONDUCT
resistance_flags = FIRE_PROOF
- origin_tech = "materials=1"
merge_type = /obj/item/stack/sheet/metal
point_value = 2
table_type = /obj/structure/table
@@ -464,7 +463,6 @@ GLOBAL_LIST_INIT(durathread_recipes, list (
name = "raw durathread bundle"
desc = "A bundle of raw durathread ready to be spun on the loom."
singular_name = "raw durathread ball"
- icon_state = "sheet-durathreadraw"
icon = 'icons/obj/stacks/organic.dmi'
merge_type = /obj/item/stack/sheet/cotton/durathread
pull_effort = 70
@@ -523,7 +521,6 @@ GLOBAL_LIST_INIT(cardboard_recipes, list (
icon = 'icons/obj/stacks/miscellaneous.dmi'
icon_state = "sheet-card"
item_state = "sheet-card"
- origin_tech = "materials=1"
resistance_flags = FLAMMABLE
merge_type = /obj/item/stack/sheet/cardboard
@@ -545,7 +542,6 @@ GLOBAL_LIST_INIT(soil_recipes, list (
icon = 'icons/obj/stacks/organic.dmi'
icon_state = "sheet-soil"
item_state = "sheet-soil"
- origin_tech = "materials=1"
resistance_flags = FIRE_PROOF
merge_type = /obj/item/stack/sheet/soil
@@ -690,10 +686,6 @@ GLOBAL_LIST_INIT(brass_recipes, list (
singular_name = "bone"
desc = "Someone's been drinking their milk."
force = 7
- throwforce = 5
- w_class = WEIGHT_CLASS_NORMAL
- throw_speed = 1
- throw_range = 3
origin_tech = "materials=2;biotech=2"
//////////////////////////////
diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm
index 2b71ec3e960..130bc4aece7 100644
--- a/code/game/objects/items/stacks/sheets/sheets.dm
+++ b/code/game/objects/items/stacks/sheets/sheets.dm
@@ -3,10 +3,8 @@
icon = 'icons/obj/stacks/minerals.dmi'
lefthand_file = 'icons/mob/inhands/sheet_lefthand.dmi'
righthand_file = 'icons/mob/inhands/sheet_righthand.dmi'
- w_class = WEIGHT_CLASS_NORMAL
force = 5
throwforce = 5
- max_amount = 50
throw_speed = 1
throw_range = 3
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
@@ -17,7 +15,6 @@
var/created_window = null //apparently glass sheets don't share a base type for glass specifically, so each had to define these vars individually
var/full_window = null //moving the var declaration to here so this can be checked cleaner until someone is willing to make them share a base type properly
usesound = 'sound/items/deconstruct.ogg'
- toolspeed = 1
var/wall_allowed = TRUE //determines if sheet can be used in wall construction or not.
dynamic_icon_state = TRUE
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index dbb39b37c38..bcfa197b9f6 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -5,14 +5,12 @@
icon = 'icons/obj/tiles.dmi'
icon_state = "tile"
item_state = "tile"
- w_class = WEIGHT_CLASS_NORMAL
force = 1
throwforce = 1
throw_speed = 5
throw_range = 20
max_amount = 60
flags = CONDUCT
- origin_tech = "materials=1"
var/turf_type = null
var/mineralType = null
scatter_distance = 3
@@ -229,13 +227,11 @@
gender = PLURAL
singular_name = "floor tile"
desc = "Those could work as a pretty decent throwing weapon."
- icon_state = "tile"
force = 6
materials = list(MAT_METAL=500)
throwforce = 10
throw_speed = 3
throw_range = 7
- flags = CONDUCT
turf_type = /turf/simulated/floor/plasteel
mineralType = "metal"
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 70)
@@ -297,7 +293,6 @@
singular_name = "light pod floor tile"
desc = "A lightly colored grooved floor tile."
icon_state = "tile_podlight"
- turf_type = /turf/simulated/floor/pod
/obj/item/stack/tile/pod/dark
name = "dark pod floor tile"
@@ -340,7 +335,6 @@
throwforce = 10
throw_speed = 3
throw_range = 7
- flags = CONDUCT
turf_type = /turf/simulated/floor/catwalk
mineralType = "metal"
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 70)
diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm
index 47c68618fbc..991af6c4950 100644
--- a/code/game/objects/items/tools/crowbar.dm
+++ b/code/game/objects/items/tools/crowbar.dm
@@ -10,13 +10,11 @@
slot_flags = ITEM_SLOT_BELT
force = 5
throwforce = 7
- w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL = 300)
drop_sound = 'sound/items/handling/crowbar_drop.ogg'
pickup_sound = 'sound/items/handling/crowbar_pickup.ogg'
origin_tech = "engineering=1;combat=1"
attack_verb = list("attacked", "bashed", "battered", "bludgeoned", "whacked")
- toolspeed = 1
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
tool_behaviour = TOOL_CROWBAR
@@ -117,7 +115,6 @@
/obj/item/crowbar/power
name = "jaws of life"
desc = "A compact and powerful industrial tool with a modular head. This one has a set of prying jaws attached, which are strong enough to pry open powered airlocks."
- flags = CONDUCT
icon_state = "jaws_pry"
item_state = "jawsoflife"
belt_icon = "jaws"
@@ -126,7 +123,6 @@
usesound = 'sound/items/jaws_pry.ogg'
force = 15
toolspeed = 0.25
- w_class = WEIGHT_CLASS_NORMAL
var/airlock_open_time = 100 // Time required to open powered airlocks
/obj/item/crowbar/power/Initialize(mapload)
diff --git a/code/game/objects/items/tools/hammer.dm b/code/game/objects/items/tools/hammer.dm
index 7596dd9be47..6475ca99b39 100644
--- a/code/game/objects/items/tools/hammer.dm
+++ b/code/game/objects/items/tools/hammer.dm
@@ -10,11 +10,9 @@
slot_flags = ITEM_SLOT_BELT
force = 10
throwforce = 7
- w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL = 300)
origin_tech = "engineering=1;combat=1"
attack_verb = list("attacked", "hammered", "smashed", "bludgeoned", "whacked")
- toolspeed = 1
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
tool_behaviour = TOOL_HAMMER
diff --git a/code/game/objects/items/tools/multitool.dm b/code/game/objects/items/tools/multitool.dm
index 3b193750d7c..005b80db5af 100644
--- a/code/game/objects/items/tools/multitool.dm
+++ b/code/game/objects/items/tools/multitool.dm
@@ -13,16 +13,11 @@
icon_state = "multitool"
belt_icon = "multitool"
flags = CONDUCT
- force = 0
- w_class = WEIGHT_CLASS_NORMAL
- throwforce = 0
- throw_range = 7
throw_speed = 3
drop_sound = 'sound/items/handling/multitool_drop.ogg'
pickup_sound = 'sound/items/handling/multitool_pickup.ogg'
materials = list(MAT_METAL = 300, MAT_GLASS = 140)
origin_tech = "magnets=1;engineering=2"
- toolspeed = 1
tool_behaviour = TOOL_MULTITOOL
hitsound = 'sound/weapons/tap.ogg'
new_attack_chain = TRUE
@@ -170,7 +165,6 @@
return OBLITERATION
/obj/item/multitool/cyborg
- name = "multitool"
desc = "An integrated multitool used for electrical maintenance, typically found in construction and engineering robots."
toolspeed = 0.5
diff --git a/code/game/objects/items/tools/screwdriver.dm b/code/game/objects/items/tools/screwdriver.dm
index f5de9302e37..f2dd18947e6 100644
--- a/code/game/objects/items/tools/screwdriver.dm
+++ b/code/game/objects/items/tools/screwdriver.dm
@@ -16,7 +16,6 @@
attack_verb = list("stabbed")
hitsound = 'sound/weapons/bladeslice.ogg'
usesound = 'sound/items/screwdriver.ogg'
- toolspeed = 1
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
drop_sound = 'sound/items/handling/screwdriver_drop.ogg'
pickup_sound = 'sound/items/handling/screwdriver_pickup.ogg'
@@ -33,7 +32,6 @@
RegisterSignal(src, COMSIG_CLICK_ALT, PROC_REF(remove_bit))
/obj/item/screwdriver/nuke
- name = "screwdriver"
desc = "A specialized screwdriver with an ultra-thin flathead tip, meant for accessing very specific machinery."
icon_state = "screwdriver_nuke"
belt_icon = "screwdriver_nuke"
diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm
index 75fde4c9a39..639fcc722ee 100644
--- a/code/game/objects/items/tools/welder.dm
+++ b/code/game/objects/items/tools/welder.dm
@@ -14,13 +14,11 @@
throw_speed = 3
throw_range = 5
hitsound = "swing_hit"
- w_class = WEIGHT_CLASS_NORMAL
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 30)
resistance_flags = FIRE_PROOF
materials = list(MAT_METAL = 400, MAT_GLASS = 100)
origin_tech = "engineering=1;plasmatech=1"
tool_behaviour = TOOL_WELDER
- toolspeed = 1
tool_enabled = FALSE
usesound = 'sound/items/welder.ogg'
drop_sound = 'sound/items/handling/weldingtool_drop.ogg'
diff --git a/code/game/objects/items/tools/wirecutters.dm b/code/game/objects/items/tools/wirecutters.dm
index d301b7b3715..172e6259d0d 100644
--- a/code/game/objects/items/tools/wirecutters.dm
+++ b/code/game/objects/items/tools/wirecutters.dm
@@ -9,7 +9,6 @@
force = 6
throwforce = 5
throw_speed = 3
- throw_range = 7
w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL = 370)
origin_tech = "materials=1;engineering=1"
@@ -19,7 +18,6 @@
drop_sound = 'sound/items/handling/wirecutter_drop.ogg'
pickup_sound = 'sound/items/handling/wirecutter_pickup.ogg'
sharp = TRUE
- toolspeed = 1
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
tool_behaviour = TOOL_WIRECUTTER
var/random_color = TRUE
@@ -107,7 +105,6 @@
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/wirecutters/cyborg
- name = "wirecutters"
desc = "A pair of integrated wirecutters used by construction and engineering robots."
toolspeed = 0.5
diff --git a/code/game/objects/items/tools/wrench.dm b/code/game/objects/items/tools/wrench.dm
index 88966e28f35..2095d60df1e 100644
--- a/code/game/objects/items/tools/wrench.dm
+++ b/code/game/objects/items/tools/wrench.dm
@@ -15,7 +15,6 @@
pickup_sound = 'sound/items/handling/wrench_pickup.ogg'
origin_tech = "materials=1;engineering=1"
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
- toolspeed = 1
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
tool_behaviour = TOOL_WRENCH
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 3c88cdb26ee..8c735182734 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -20,10 +20,8 @@
/obj/item/toy
- throwforce = 0
throw_speed = 4
throw_range = 20
- force = 0
new_attack_chain = TRUE
@@ -111,10 +109,6 @@
/obj/item/toy/syndicateballoon
name = "syndicate balloon"
desc = "There is a tag on the back that reads \"FUK NT!11!\"."
- throwforce = 0
- throw_speed = 4
- throw_range = 20
- force = 0
icon_state = "syndballoon"
item_state = "syndballoon"
w_class = WEIGHT_CLASS_BULKY
@@ -304,7 +298,6 @@
force = 0
throwforce = 0
throw_speed = 3
- throw_range = 5
origin_tech = null
attack_verb = list("attacked", "struck", "hit")
brightness_on = 0
@@ -334,7 +327,6 @@
flags_2 = ALLOW_BELT_NO_JUMPSUIT_2 //Look, you can strap it to your back. You can strap it to your waist too.
force = 5
throwforce = 5
- w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("attacked", "slashed", "stabbed", "sliced")
hitsound = 'sound/weapons/bladeslice.ogg'
@@ -358,7 +350,6 @@
throwforce = 5.0
throw_speed = 10
throw_range = 30
- w_class = WEIGHT_CLASS_TINY
/obj/item/toy/snappop/virus/throw_impact(atom/hit_atom)
@@ -477,7 +468,6 @@
cooldown = world.time
/obj/item/toy/therapy/red
- item_state = "egg4" // It's the red egg in items_left/righthand
item_color = "red"
/obj/item/toy/therapy/purple
@@ -493,7 +483,6 @@
item_color = "yellow"
/obj/item/toy/therapy/orange
- item_state = "egg4" // It's the red one again, lacking an orange item_state and making a new one is pointless
item_color = "orange"
/obj/item/toy/therapy/green
@@ -1541,9 +1530,7 @@
flags = CONDUCT
slot_flags = ITEM_SLOT_BELT
materials = list(MAT_METAL=2000)
- w_class = WEIGHT_CLASS_NORMAL
throwforce = 5
- throw_speed = 4
throw_range = 5
force = 5
origin_tech = "combat=1"
diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm
index a66e55b12f9..8379e1a4439 100644
--- a/code/game/objects/items/trash.dm
+++ b/code/game/objects/items/trash.dm
@@ -152,7 +152,6 @@
/obj/item/trash/spentcasing/shotgun
name = "spent buckshot shell"
desc = "A spent shotgun shell. It smells like cordite."
- icon_state = "gshell"
/obj/item/trash/spentcasing/shotgun/rubbershot
name = "spent rubbershot shell"
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 4d2a3a50c62..8641548f4df 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -223,14 +223,11 @@
icon_state = "rcd"
item_state = "rcd"
flags = CONDUCT | NOBLUDGEON
- force = 0
throwforce = 10
throw_speed = 3
throw_range = 5
- w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL = 30000)
origin_tech = "engineering=4;materials=2"
- toolspeed = 1
flags_2 = NO_MAT_REDEMPTION_2
req_access = list(ACCESS_ENGINE)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 50)
@@ -722,9 +719,6 @@
icon = 'icons/obj/ammo.dmi'
icon_state = "rcd"
item_state = "rcdammo"
- opacity = FALSE
- density = FALSE
- anchored = FALSE
origin_tech = "materials=3"
materials = list(MAT_METAL=16000, MAT_GLASS=8000)
new_attack_chain = TRUE
diff --git a/code/game/objects/items/weapons/RCL.dm b/code/game/objects/items/weapons/RCL.dm
index b509cba8bee..a2c87f2c519 100644
--- a/code/game/objects/items/weapons/RCL.dm
+++ b/code/game/objects/items/weapons/RCL.dm
@@ -4,12 +4,9 @@
icon = 'icons/obj/tools.dmi'
icon_state = "rcl-0"
item_state = "rcl-0"
- opacity = FALSE
force = 5 //Plastic is soft
throwforce = 5
throw_speed = 1
- throw_range = 7
- w_class = WEIGHT_CLASS_NORMAL
origin_tech = "engineering=4;materials=2"
var/max_amount = 90
var/active = FALSE
diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index 5286a057b08..03d13645aff 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -8,11 +8,7 @@
icon = 'icons/obj/tools.dmi'
icon_state = "rsf"
item_state = "rsf"
- opacity = FALSE
- density = FALSE
- anchored = FALSE
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
- w_class = WEIGHT_CLASS_NORMAL
var/atom/currently_dispensing
var/power_mode = POWER_NONE
diff --git a/code/game/objects/items/weapons/agent_id.dm b/code/game/objects/items/weapons/agent_id.dm
index 8868213c341..aacb66a72d1 100644
--- a/code/game/objects/items/weapons/agent_id.dm
+++ b/code/game/objects/items/weapons/agent_id.dm
@@ -27,10 +27,8 @@
initial_access = list(ACCESS_SYNDICATE)
assignment = "Syndicate Researcher"
icon_state = "syndie"
- untrackable = TRUE
/obj/item/card/id/syndicate/vox
- name = "agent card"
initial_access = list(ACCESS_MAINT_TUNNELS, ACCESS_VOX, ACCESS_EXTERNAL_AIRLOCKS)
/obj/item/card/id/syndicate/ghost_bar
diff --git a/code/game/objects/items/weapons/alien_specific.dm b/code/game/objects/items/weapons/alien_specific.dm
index 870f0f1ece4..5c20be2410b 100644
--- a/code/game/objects/items/weapons/alien_specific.dm
+++ b/code/game/objects/items/weapons/alien_specific.dm
@@ -12,7 +12,6 @@
throwforce_on = 5
throw_speed = 1
throw_range = 5
- w_class = WEIGHT_CLASS_SMALL
w_class_on = WEIGHT_CLASS_SMALL
attack_verb = list("attacked", "slashed", "gored", "sliced", "torn", "ripped", "butchered", "cut")
attack_verb_on = list()
@@ -27,7 +26,6 @@
/obj/item/reagent_containers/spray/alien/smoke
name = "smokescreen module"
desc = "Releases a dense smoke cloud that cannot be seen through. Your thermal vision is still able to see targets through it."
- icon = 'icons/mob/alien.dmi'
icon_state = "borg-spray-smoke"
list_reagents = list("water" = 50)
@@ -53,7 +51,6 @@
/obj/item/reagent_containers/spray/alien/acid
name = "polyacid synthesizer"
desc = "Sprays concentrated polyacid."
- icon = 'icons/mob/alien.dmi'
icon_state = "borg-spray-acid"
list_reagents = list("facid" = 125, "sacid" = 125)
diff --git a/code/game/objects/items/weapons/batons.dm b/code/game/objects/items/weapons/batons.dm
index 0885bdca91a..a1957cbea53 100644
--- a/code/game/objects/items/weapons/batons.dm
+++ b/code/game/objects/items/weapons/batons.dm
@@ -13,7 +13,6 @@
item_state = "classic_baton"
slot_flags = ITEM_SLOT_BELT
force = 12 //9 hit crit
- w_class = WEIGHT_CLASS_NORMAL
// Settings
/// Whether the baton can stun silicon mobs
var/affect_silicon = FALSE
@@ -154,7 +153,6 @@
desc = "A compact yet robust personal defense weapon. Can be concealed when folded."
icon_state = "telebaton_0" // For telling what it is when mapping
item_state = null
- slot_flags = ITEM_SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
on = FALSE
/// Force when concealed
diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_abductor.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_abductor.dm
index d1dfad0363e..517a0cbb1cf 100644
--- a/code/game/objects/items/weapons/bio_chips/bio_chip_abductor.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_abductor.dm
@@ -3,7 +3,6 @@
desc = "Returns you to the mothership."
icon = 'icons/obj/abductor.dmi'
icon_state = "implant"
- activated = BIOCHIP_ACTIVATED_ACTIVE
origin_tech = "materials=2;biotech=7;magnets=4;bluespace=4;abductor=5"
implant_data = /datum/implant_fluff/abductor
implant_state = "implant-alien"
diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_case.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_case.dm
index 1a9e927f57d..06ad1727c00 100644
--- a/code/game/objects/items/weapons/bio_chips/bio_chip_case.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_case.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/bio_chips.dmi'
icon_state = "implantcase"
item_state = "implantcase"
- throw_speed = 2
throw_range = 5
w_class = WEIGHT_CLASS_TINY
origin_tech = "materials=1;biotech=2"
diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_dust.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_dust.dm
index b4b0a21e37a..1830a5e3e6f 100644
--- a/code/game/objects/items/weapons/bio_chips/bio_chip_dust.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_dust.dm
@@ -3,7 +3,6 @@
/obj/item/bio_chip/dust
name = "duster bio-chip"
desc = "A remote controlled bio-chip that will dust the user upon activation (or death of user)."
- icon = 'icons/obj/bio_chips.dmi'
icon_state = "dust"
actions_types = list(/datum/action/item_action/hands_free/activate/always)
trigger_causes = BIOCHIP_TRIGGER_DEATH_ONCE | BIOCHIP_TRIGGER_NOT_WHEN_GIBBED
diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_explosive.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_explosive.dm
index c81144883dc..31deceb24ed 100644
--- a/code/game/objects/items/weapons/bio_chips/bio_chip_explosive.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_explosive.dm
@@ -98,7 +98,6 @@
/obj/item/bio_chip/explosive/macro
name = "macrobomb bio-chip"
desc = "And boom goes the weasel. And everything else nearby."
- icon_state = "explosive"
origin_tech = "materials=3;combat=5;biotech=4;syndicate=5"
weak = 16
medium = 8
diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_freedom.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_freedom.dm
index ae9b6ad062d..f540503e8d2 100644
--- a/code/game/objects/items/weapons/bio_chips/bio_chip_freedom.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_freedom.dm
@@ -39,12 +39,9 @@
/obj/item/bio_chip/freedom/prototype
name = "prototype freedom bio-chip"
desc = "Use this to escape from those evil Red Shirts. Works only once!"
- icon_state = "freedom"
- item_color = "r"
origin_tech = "combat=5;magnets=3;biotech=3;syndicate=1"
uses = 1
implant_data = /datum/implant_fluff/protofreedom
- implant_state = "implant-syndicate"
/obj/item/bio_chip_implanter/freedom/prototype
name = "bio-chip implanter (proto-freedom)"
diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_krav_maga.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_krav_maga.dm
index d79a03409bb..949b786859d 100644
--- a/code/game/objects/items/weapons/bio_chips/bio_chip_krav_maga.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_krav_maga.dm
@@ -3,10 +3,8 @@
desc = "Teaches you the arts of Krav Maga in 5 short instructional videos beamed directly into your eyeballs."
icon = 'icons/obj/wizard.dmi'
icon_state ="scroll2"
- activated = BIOCHIP_ACTIVATED_ACTIVE
origin_tech = "materials=2;biotech=4;combat=5;syndicate=4"
implant_data = /datum/implant_fluff/krav_maga
- implant_state = "implant-default"
var/datum/martial_art/krav_maga/style = new
diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_prescan.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_prescan.dm
index c4eb39d3072..436754dadbe 100644
--- a/code/game/objects/items/weapons/bio_chips/bio_chip_prescan.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chip_prescan.dm
@@ -1,7 +1,6 @@
/obj/item/bio_chip/grey_autocloner
name = "technocracy cloning bio-chip"
desc = "Allows for advanced instantanious cloning!"
- icon_state = "generic"
origin_tech = "materials=3;combat=5;syndicate=2"
activated = FALSE
trigger_causes = BIOCHIP_TRIGGER_DEATH_ANY
diff --git a/code/game/objects/items/weapons/bio_chips/bio_chipper.dm b/code/game/objects/items/weapons/bio_chips/bio_chipper.dm
index 25d0b9d7cc3..c3dae54d18f 100644
--- a/code/game/objects/items/weapons/bio_chips/bio_chipper.dm
+++ b/code/game/objects/items/weapons/bio_chips/bio_chipper.dm
@@ -9,7 +9,6 @@
w_class = WEIGHT_CLASS_SMALL
origin_tech = "materials=2;biotech=3"
materials = list(MAT_METAL = 600, MAT_GLASS = 200)
- toolspeed = 1
var/obj/item/bio_chip/imp
var/obj/item/bio_chip/implant_type
diff --git a/code/game/objects/items/weapons/c_foam_launcher.dm b/code/game/objects/items/weapons/c_foam_launcher.dm
index 6d24188c78d..0bcdfd74038 100644
--- a/code/game/objects/items/weapons/c_foam_launcher.dm
+++ b/code/game/objects/items/weapons/c_foam_launcher.dm
@@ -11,7 +11,6 @@
desc = "The C-Foam launcher. Shoots blobs of quickly hardening and growing foam. Can be used to slow down humanoids or block airlocks"
icon_state = "c_foam_launcher"
item_state = "c_foam_launcher"
- w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=4;syndicate=1;materials=3"
needs_permit = FALSE
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index e3b10e069e6..ff036d373bb 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -369,13 +369,11 @@
add_fingerprint(user)
/obj/item/card/id/silver
- name = "identification card"
desc = "A silver card which shows honour and dedication."
icon_state = "silver"
item_state = "silver_id"
/obj/item/card/id/gold
- name = "identification card"
desc = "A golden card which shows power and might."
icon_state = "gold"
item_state = "gold_id"
@@ -596,7 +594,6 @@
/obj/item/card/id/captains_spare/assigned
name = "Captain ID"
- registered_name = "Captain"
icon_state = "captain"
/obj/item/card/id/hop
diff --git a/code/game/objects/items/weapons/cash.dm b/code/game/objects/items/weapons/cash.dm
index db8b59d5c16..0e23bcf8032 100644
--- a/code/game/objects/items/weapons/cash.dm
+++ b/code/game/objects/items/weapons/cash.dm
@@ -4,10 +4,7 @@
icon = 'icons/obj/money.dmi'
icon_state = "cash"
hitsound = "swing_hit"
- force = 0
- throwforce = 0
throw_speed = 1
- throw_range = 7
w_class = WEIGHT_CLASS_TINY
resistance_flags = FLAMMABLE
singular_name = "credit"
diff --git a/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm b/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
index 21a830842d9..86b639c8a86 100644
--- a/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
+++ b/code/game/objects/items/weapons/chemical_flamethrower/chemical_flamethrower.dm
@@ -10,7 +10,6 @@
throwforce = 10
throw_speed = 1
throw_range = 5
- w_class = WEIGHT_CLASS_NORMAL
slot_flags = ITEM_SLOT_BACK
materials = list(MAT_METAL = 5000)
resistance_flags = FIRE_PROOF
diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm
index 47449644e69..0e0e98355fe 100644
--- a/code/game/objects/items/weapons/chrono_eraser.dm
+++ b/code/game/objects/items/weapons/chrono_eraser.dm
@@ -46,7 +46,6 @@
icon = 'icons/obj/chronos.dmi'
icon_state = "chronogun"
item_state = "chronogun"
- w_class = WEIGHT_CLASS_NORMAL
flags = NODROP | DROPDEL
ammo_type = list(/obj/item/ammo_casing/energy/chrono_beam)
can_charge = FALSE
@@ -141,7 +140,6 @@
/obj/item/ammo_casing/energy/chrono_beam
name = "eradication beam"
projectile_type = /obj/item/projectile/energy/chrono_beam
- muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash/energy
muzzle_flash_color = null
icon = 'icons/obj/projectiles.dmi'
icon_state = "chronobolt"
@@ -152,7 +150,6 @@
desc = "An aura of time-bluespace energy."
icon = 'icons/effects/effects.dmi'
icon_state = "chronofield"
- density = FALSE
anchored = TRUE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
move_resist = INFINITY
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index cc6de590e0d..253614f9fd7 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -23,7 +23,6 @@ LIGHTERS ARE IN LIGHTERS.DM
icon_state = "cig"
lefthand_file = 'icons/mob/inhands/smoking_lefthand.dmi'
righthand_file = 'icons/mob/inhands/smoking_righthand.dmi'
- slot_flags = ITEM_SLOT_MASK
w_class = WEIGHT_CLASS_TINY
body_parts_covered = null
attack_verb = null
@@ -435,7 +434,6 @@ LIGHTERS ARE IN LIGHTERS.DM
/obj/item/cigbutt/syndie
name = "suspicious cigarette butt"
desc = "A manky old cigarette butt with an evil look about it."
- icon = 'icons/obj/clothing/smoking.dmi'
icon_state = "syndie_cig_butt"
/obj/item/cigbutt/Initialize(mapload)
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 599f9ee97d5..39dd34b2053 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -12,7 +12,6 @@
/obj/item/bikehorn
name = "bike horn"
desc = "A horn off of a bicycle."
- icon = 'icons/obj/items.dmi'
icon_state = "bike_horn"
item_state = "bike_horn"
hitsound = null
@@ -75,7 +74,6 @@
slot_flags = ITEM_SLOT_BELT
materials = list(MAT_METAL = 180, MAT_GLASS = 90)
force = 2
- throwforce = 0
drop_sound = 'sound/items/handling/taperecorder_drop.ogg'
pickup_sound = 'sound/items/handling/taperecorder_pickup.ogg'
actions_types = list(/datum/action/item_action/laugh_track)
diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm
index 4b15f6244e5..6d906dacd5a 100644
--- a/code/game/objects/items/weapons/cosmetics.dm
+++ b/code/game/objects/items/weapons/cosmetics.dm
@@ -1,7 +1,6 @@
/obj/item/lipstick
name = "red lipstick"
desc = "A generic brand of lipstick."
- icon = 'icons/obj/items.dmi'
icon_state = "lipstick"
w_class = WEIGHT_CLASS_TINY
var/colour = "red"
@@ -100,12 +99,10 @@
/obj/item/razor
name = "electric razor"
desc = "The latest and greatest power razor born from the science of shaving."
- icon = 'icons/obj/items.dmi'
icon_state = "razor"
flags = CONDUCT
w_class = WEIGHT_CLASS_TINY
usesound = 'sound/items/welder2.ogg'
- toolspeed = 1
/obj/item/razor/attack__legacy__attackchain(mob/living/carbon/M as mob, mob/user as mob)
if(ishuman(M))
diff --git a/code/game/objects/items/weapons/courtroom.dm b/code/game/objects/items/weapons/courtroom.dm
index 07ba7116a9d..32fbdc45f4e 100644
--- a/code/game/objects/items/weapons/courtroom.dm
+++ b/code/game/objects/items/weapons/courtroom.dm
@@ -5,7 +5,6 @@
/obj/item/gavelhammer
name = "gavel hammer"
desc = "Order, order! No bombs in my courthouse."
- icon = 'icons/obj/items.dmi'
icon_state = "gavelhammer"
force = 5.0
throwforce = 6.0
@@ -21,7 +20,6 @@
/obj/item/gavelblock
name = "gavel block"
desc = "Smack it with a gavel hammer when the assistants get rowdy."
- icon = 'icons/obj/items.dmi'
icon_state = "gavelblock"
force = 2.0
throwforce = 2.0
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index cadbd3bc5d7..c76d4678e50 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -247,7 +247,6 @@
item_state = "defibnt"
paddle_type = /obj/item/shockpaddles/advanced
combat = TRUE
- safety = TRUE
hardened = TRUE // EMP-proof (on the component), but not emag-proof.
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF // Objective item, better not have it destroyed.
heart_attack_probability = 10
@@ -293,11 +292,9 @@
icon = 'icons/obj/defib.dmi'
icon_state = "defibpaddles0"
item_state = "defibpaddles0"
- force = 0
throwforce = 6
w_class = WEIGHT_CLASS_BULKY
resistance_flags = INDESTRUCTIBLE
- toolspeed = 1
base_icon_state = "defibpaddles"
/// Amount of power used on a shock.
var/revivecost = 1000
@@ -424,12 +421,10 @@
icon = 'icons/obj/defib.dmi'
icon_state = "defibpaddles0"
item_state = "defibpaddles0"
- force = 0
w_class = WEIGHT_CLASS_BULKY
var/revivecost = 1000
var/safety = TRUE
flags = NODROP
- toolspeed = 1
/obj/item/borg_defib/Initialize(mapload)
. = ..()
diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm
index abe0740e846..63d71418408 100644
--- a/code/game/objects/items/weapons/dice.dm
+++ b/code/game/objects/items/weapons/dice.dm
@@ -4,7 +4,6 @@
desc = "Contains all the luck you'll ever need."
icon = 'icons/obj/dice.dmi'
icon_state = "dicebag"
- use_sound = "rustle"
storage_slots = 50
max_combined_w_class = 50
can_hold = list(/obj/item/dice)
@@ -124,7 +123,6 @@
/obj/item/dice/d20/fate
name = "\improper Die of Fate"
desc = "A die with twenty sides. You can feel unearthly energies radiating from it. Using this might be VERY risky."
- icon_state = "d20"
var/reusable = TRUE
var/used = FALSE
@@ -418,7 +416,6 @@
/obj/item/storage/box/dice
name = "Box of dice"
desc = "ANOTHER ONE!? FUCK!"
- icon_state = "box"
/obj/item/storage/box/dice/populate_contents()
new /obj/item/dice/d2(src)
diff --git a/code/game/objects/items/weapons/disks.dm b/code/game/objects/items/weapons/disks.dm
index e81e6f58732..c4687b75f79 100644
--- a/code/game/objects/items/weapons/disks.dm
+++ b/code/game/objects/items/weapons/disks.dm
@@ -8,7 +8,6 @@
/obj/item/disk/data
name = "Cloning Data Disk"
- icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk.
var/datum/dna2_record/buf = null
var/read_only = FALSE //Well,it's still a floppy disk
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index 0974fa4dc76..a8e8a812a1a 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -7,7 +7,6 @@
det_time = 10
display_timer = FALSE
origin_tech = "syndicate=1"
- toolspeed = 1
var/atom/target = null
var/image_overlay = null
var/obj/item/assembly/nadeassembly = null
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index 7799ab71729..b727ef688cc 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -1,16 +1,12 @@
/obj/item/extinguisher
name = "fire extinguisher"
desc = "A traditional red fire extinguisher."
- icon = 'icons/obj/items.dmi'
icon_state = "fire_extinguisher0"
item_state = "fire_extinguisher"
base_icon_state = "fire_extinguisher"
hitsound = 'sound/weapons/smash.ogg'
flags = CONDUCT
throwforce = 10
- w_class = WEIGHT_CLASS_NORMAL
- throw_speed = 2
- throw_range = 7
force = 10
container_type = AMOUNT_VISIBLE
materials = list(MAT_METAL = 200)
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index 92c69d0b8a1..338b1b03363 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -11,7 +11,6 @@
throwforce = 10
throw_speed = 1
throw_range = 5
- w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL = 5000)
resistance_flags = FIRE_PROOF
origin_tech = "combat=1;plasmatech=2;engineering=2"
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index 2b5d141bb57..9d6b036d5a4 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -10,7 +10,6 @@
/obj/item/a_gift
name = "gift"
desc = "PRESENTS!!!! eek!"
- icon = 'icons/obj/items.dmi'
icon_state = "gift1"
item_state = "gift1"
resistance_flags = FLAMMABLE
diff --git a/code/game/objects/items/weapons/grenades/atmosgrenade.dm b/code/game/objects/items/weapons/grenades/atmosgrenade.dm
index c304f625f0c..d5a4fb4890c 100644
--- a/code/game/objects/items/weapons/grenades/atmosgrenade.dm
+++ b/code/game/objects/items/weapons/grenades/atmosgrenade.dm
@@ -2,9 +2,7 @@
name = "plasma fire grenade"
desc = "A compressed plasma grenade, used to start horrific plasma fires."
origin_tech = "materials=3;magnets=4;syndicate=3"
- icon = 'icons/obj/grenade.dmi'
icon_state = "syndicate"
- item_state = "grenade"
var/spawn_contents = LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS
var/spawn_amount = 100
@@ -33,9 +31,7 @@
/obj/item/grenade/gluon
desc = "An advanced grenade that releases a harmful stream of gluons inducing radiation in those nearby. These gluon streams will also make victims feel exhausted, and induce shivering. This extreme coldness will also wet any nearby floors."
name = "gluon grenade"
- icon = 'icons/obj/grenade.dmi'
icon_state = "gluon"
- item_state = "grenade"
var/freeze_range = 4
var/rad_damage = 1400
var/stamina_damage = 30
diff --git a/code/game/objects/items/weapons/grenades/bananade.dm b/code/game/objects/items/weapons/grenades/bananade.dm
index a7f7a9628f6..d38dca7d3ff 100644
--- a/code/game/objects/items/weapons/grenades/bananade.dm
+++ b/code/game/objects/items/weapons/grenades/bananade.dm
@@ -4,10 +4,7 @@
/obj/item/grenade/bananade
name = "bananade"
desc = "A yellow grenade."
- w_class = WEIGHT_CLASS_SMALL
- icon = 'icons/obj/grenade.dmi'
icon_state = "banana"
- item_state = "grenade"
var/deliveryamt = 8
var/spawner_type = /obj/item/grown/bananapeel
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index 11aa55d6a90..a1375f07b47 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -6,10 +6,8 @@
name = "grenade casing"
desc = "A do it yourself grenade casing!"
icon_state = "chemg"
- item_state = "grenade"
var/bomb_state = "chembomb"
var/payload_name = null // used for spawned grenades
- w_class = WEIGHT_CLASS_SMALL
force = 2
var/prime_sound = 'sound/items/screwdriver2.ogg'
var/stage = EMPTY
@@ -394,7 +392,6 @@
desc = "A custom made pyrotechnical grenade. It heats up and ignites its contents upon detonation."
icon_state = "pyrog"
origin_tech = "combat=4;engineering=4"
- affected_area = 3
ignition_temp = 500 // This is enough to expose a hotspot.
/// Intended for weaker, but longer lasting effects. Could have some interesting uses.
diff --git a/code/game/objects/items/weapons/grenades/clowngrenade.dm b/code/game/objects/items/weapons/grenades/clowngrenade.dm
index d76ca1ad7f8..41270a01b00 100644
--- a/code/game/objects/items/weapons/grenades/clowngrenade.dm
+++ b/code/game/objects/items/weapons/grenades/clowngrenade.dm
@@ -2,8 +2,6 @@
name = "Banana Grenade"
desc = "HONK! brand Bananas. In a special applicator for rapid slipping of wide areas."
icon_state = "banana"
- item_state = "grenade"
- w_class = WEIGHT_CLASS_SMALL
force = 2.0
var/stage = 0
var/state = 0
diff --git a/code/game/objects/items/weapons/grenades/clusterbuster.dm b/code/game/objects/items/weapons/grenades/clusterbuster.dm
index e1ad9530e9e..f189f9edfd9 100644
--- a/code/game/objects/items/weapons/grenades/clusterbuster.dm
+++ b/code/game/objects/items/weapons/grenades/clusterbuster.dm
@@ -4,7 +4,6 @@
/obj/item/grenade/clusterbuster
name = "clusterbang"
desc = "Use of this weapon may constitute a war crime in your area, consult your local captain."
- icon = 'icons/obj/grenade.dmi'
icon_state = "clusterbang"
item_state = "flashbang"
var/payload = /obj/item/grenade/flashbang/cluster
@@ -39,7 +38,6 @@
/obj/item/grenade/clusterbuster/segment
name = "clusterbang bomblet"
desc = "A bomblet released by a clusterbang. Better run!"
- icon = 'icons/obj/grenade.dmi'
icon_state = "clusterbang_segment"
/obj/item/grenade/clusterbuster/segment/Initialize(mapload, payload_type = /obj/item/grenade/flashbang/cluster)
diff --git a/code/game/objects/items/weapons/grenades/frag.dm b/code/game/objects/items/weapons/grenades/frag.dm
index 80f66b97236..03b29c36253 100644
--- a/code/game/objects/items/weapons/grenades/frag.dm
+++ b/code/game/objects/items/weapons/grenades/frag.dm
@@ -4,7 +4,6 @@
name = "fragmentation grenade"
desc = "A grenade with a specially designed casing that will launch lethal fragments in all directions upon detonation. Fire in the hole!"
icon_state = "frag"
- item_state = "grenade"
origin_tech = "materials=3;magnets=4"
/// How much shrapnel the grenade will launch.
var/shrapnel_contained = 20
@@ -21,8 +20,6 @@
name = "stingball grenade"
desc = "A specialized less-lethal hand grenade used for police action. Launches hard rubber balls in all directions upon detonation."
icon_state = "stinger"
- item_state = "grenade"
- det_time = 5 SECONDS
modifiable_timer = FALSE
shrapnel_contained = 50
embedded_type = /obj/item/projectile/bullet/pellet/rubber/stinger
diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm
index fdc2223361c..275992e1211 100644
--- a/code/game/objects/items/weapons/grenades/ghettobomb.dm
+++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm
@@ -3,16 +3,8 @@
/obj/item/grenade/iedcasing
name = "improvised firebomb"
desc = "A sketchy improvised incendiary device."
- w_class = WEIGHT_CLASS_SMALL
- icon = 'icons/obj/grenade.dmi'
icon_state = "improvised_grenade"
- item_state = "grenade"
- throw_speed = 3
throw_range = 7
- flags = CONDUCT
- slot_flags = ITEM_SLOT_BELT
- active = FALSE
- det_time = 5 SECONDS
display_timer = FALSE
modifiable_timer = FALSE
var/list/times
diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm
index b6943f10282..3a2fdb08663 100644
--- a/code/game/objects/items/weapons/grenades/smokebomb.dm
+++ b/code/game/objects/items/weapons/grenades/smokebomb.dm
@@ -1,12 +1,10 @@
/obj/item/grenade/smokebomb
name = "smoke bomb"
desc = "A grenade filled with chemical agents that will turn into a dense smoke when detonated, making it impossible to see through without specialised optics."
- icon = 'icons/obj/grenade.dmi'
icon_state = "smoke"
det_time = 2 SECONDS
modifiable_timer = FALSE
item_state = "smoke"
- slot_flags = ITEM_SLOT_BELT
var/datum/effect_system/smoke_spread/bad/smoke
/obj/item/grenade/smokebomb/Initialize(mapload)
diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
index 3cfc803f28c..59bb0a30b83 100644
--- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm
+++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
@@ -1,9 +1,7 @@
/obj/item/grenade/spawnergrenade
name = "delivery grenade"
desc = "Upon detonation, this will unleash an unspecified anomaly into the vicinity."
- icon = 'icons/obj/grenade.dmi'
icon_state = "delivery"
- item_state = "grenade"
origin_tech = "materials=3;magnets=4"
var/spawner_type = null // must be an object path
var/deliveryamt = 1 // amount of type to deliver
@@ -35,7 +33,6 @@
/obj/item/grenade/spawnergrenade/manhacks
name = "viscerator delivery grenade"
desc = "This grenade contains 5 viscerators, tiny flying drones with lethally sharp blades. Upon detonation, they will be deployed and begin searching the area for targets."
- spawner_type = /mob/living/simple_animal/hostile/viscerator
deliveryamt = 5
origin_tech = "materials=3;magnets=4;syndicate=3"
diff --git a/code/game/objects/items/weapons/grenades/syndieminibomb.dm b/code/game/objects/items/weapons/grenades/syndieminibomb.dm
index a98842e30ca..bc4dc74c91b 100644
--- a/code/game/objects/items/weapons/grenades/syndieminibomb.dm
+++ b/code/game/objects/items/weapons/grenades/syndieminibomb.dm
@@ -1,9 +1,7 @@
/obj/item/grenade/syndieminibomb
name = "\improper Syndicate minibomb"
desc = "A Syndicate-manufactured high-explosive grenade used to sow destruction and chaos."
- icon = 'icons/obj/grenade.dmi'
icon_state = "syndicate"
- item_state = "grenade"
origin_tech = "materials=3;magnets=4;syndicate=3"
var/explosion_cause = "Syndicate minibomb"
diff --git a/code/game/objects/items/weapons/handcuffs.dm b/code/game/objects/items/weapons/handcuffs.dm
index c725c10781e..3be0a3fde49 100644
--- a/code/game/objects/items/weapons/handcuffs.dm
+++ b/code/game/objects/items/weapons/handcuffs.dm
@@ -47,7 +47,6 @@
slot_flags = ITEM_SLOT_BELT
throwforce = 5
w_class = WEIGHT_CLASS_SMALL
- throw_speed = 2
throw_range = 5
materials = list(MAT_METAL=500)
origin_tech = "engineering=3;combat=3"
@@ -211,7 +210,6 @@
/obj/item/restraints/handcuffs/cable/zipties
name = "zipties"
desc = "Plastic, disposable zipties that can be used to restrain temporarily but are destroyed after use."
- icon_state = "cablecuff"
breakouttime = 45 SECONDS
materials = list()
trashtype = /obj/item/restraints/handcuffs/cable/zipties/used
diff --git a/code/game/objects/items/weapons/holosign_projector.dm b/code/game/objects/items/weapons/holosign_projector.dm
index b5dce07a1e4..f3e496062b7 100644
--- a/code/game/objects/items/weapons/holosign_projector.dm
+++ b/code/game/objects/items/weapons/holosign_projector.dm
@@ -5,11 +5,8 @@
icon_state = "signmaker"
item_state = "electronic"
belt_icon = "holosign_creator"
- force = 0
w_class = WEIGHT_CLASS_SMALL
- throwforce = 0
throw_speed = 3
- throw_range = 7
origin_tech = "magnets=1;programming=3"
flags = NOBLUDGEON
var/list/signs = list()
@@ -116,7 +113,6 @@
icon_state = "signmaker_engi"
belt_icon = null
holosign_type = /obj/structure/holosign/barrier/atmos
- creation_time = 0
max_signs = 3
/obj/item/holosign_creator/cyborg
diff --git a/code/game/objects/items/weapons/holy_weapons.dm b/code/game/objects/items/weapons/holy_weapons.dm
index 5148b6696fa..5ab18618959 100644
--- a/code/game/objects/items/weapons/holy_weapons.dm
+++ b/code/game/objects/items/weapons/holy_weapons.dm
@@ -198,7 +198,6 @@
desc = "Capable of cutting clean through a holy claymore."
icon_state = "katana"
item_state = "katana"
- slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
/obj/item/nullrod/claymore/multiverse
name = "extradimensional blade"
@@ -273,7 +272,6 @@
icon = 'icons/obj/guns/magic.dmi'
name = "dormant spellblade"
desc = "The blade grants the wielder nearly limitless power...if they can figure out how to turn it on, that is."
- hitsound = 'sound/weapons/rapierhit.ogg'
/obj/item/nullrod/scythe/talking
name = "possessed blade"
@@ -284,7 +282,6 @@
item_state = "talking_sword"
desc = "When the station falls into chaos, it's nice to have a friend by your side."
attack_verb = list("chopped", "sliced", "cut")
- hitsound = 'sound/weapons/rapierhit.ogg'
force = 12
can_be_hit = TRUE // be a shit and you can get your ass beat
max_integrity = 100
@@ -484,12 +481,10 @@
/obj/item/nullrod/claymore/bostaff
name = "monk's staff"
desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts, now used to harass the clown."
- icon = 'icons/obj/weapons/melee.dmi'
icon_state = "bostaff0"
lefthand_file = 'icons/mob/inhands/staves_lefthand.dmi'
righthand_file = 'icons/mob/inhands/staves_righthand.dmi'
item_state = "bostaff0"
- w_class = WEIGHT_CLASS_BULKY
force = 13
slot_flags = ITEM_SLOT_BACK
sharp = FALSE
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 60af27cd6ad..34da3ee34ad 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -27,14 +27,12 @@
righthand_file = 'icons/mob/inhands/utensil_righthand.dmi'
force = 5.0
w_class = WEIGHT_CLASS_TINY
- throwforce = 0.0
throw_speed = 3
throw_range = 5
flags = CONDUCT
attack_verb = list("attacked", "stabbed", "poked")
hitsound = 'sound/weapons/bladeslice.ogg'
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
- sharp = FALSE
var/max_contents = 1
/obj/item/kitchen/utensil/New()
@@ -168,7 +166,6 @@
name = "butcher's cleaver"
icon_state = "butch"
desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products."
- flags = CONDUCT
force = 15
throwforce = 8
attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -242,8 +239,6 @@
force = 8.0
throwforce = 10.0
throw_speed = 3
- throw_range = 7
- w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
/* Trays moved to /obj/item/storage/bag */
@@ -261,7 +256,6 @@
throwforce = 5
throw_speed = 3
throw_range = 3
- w_class = WEIGHT_CLASS_SMALL
attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "smashed")
/obj/item/reagent_containers/cooking/mould/make_mini()
@@ -315,7 +309,6 @@
/obj/item/kitchen/cutter
name = "generic circular cutter"
desc = "A generic circular cutter for cookies and other things."
- icon = 'icons/obj/kitchen.dmi'
icon_state = "circular_cutter"
force = 5
throwforce = 5
diff --git a/code/game/objects/items/weapons/knuckledusters.dm b/code/game/objects/items/weapons/knuckledusters.dm
index c5a0c744662..49a2945e8ea 100644
--- a/code/game/objects/items/weapons/knuckledusters.dm
+++ b/code/game/objects/items/weapons/knuckledusters.dm
@@ -66,7 +66,6 @@
name = "engraved knuckleduster"
desc = "Perfect for giving that Greytider a golden, painful lesson."
icon_state = "knuckleduster_nt"
- force = 10
throwforce = 5
origin_tech = null
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF // Steal objectives shouldnt be easy to destroy.
diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm
index aac96c88f24..fa66a6ca4db 100644
--- a/code/game/objects/items/weapons/legcuffs.dm
+++ b/code/game/objects/items/weapons/legcuffs.dm
@@ -5,8 +5,6 @@
icon_state = "handcuff"
cuffed_state = "legcuff"
flags = CONDUCT
- throwforce = 0
- w_class = WEIGHT_CLASS_NORMAL
origin_tech = "engineering=3;combat=3"
slowdown = 7
breakouttime = 30 SECONDS
diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm
index 9f428313c07..4bf3174ae9a 100644
--- a/code/game/objects/items/weapons/lighters.dm
+++ b/code/game/objects/items/weapons/lighters.dm
@@ -8,7 +8,6 @@
icon_state = "lighter-g"
item_state = "lighter-g"
w_class = WEIGHT_CLASS_TINY
- throwforce = 0
flags = CONDUCT
slot_flags = ITEM_SLOT_BELT
attack_verb = null
@@ -378,7 +377,6 @@
desc = "A little flame of your own, currently located dangerously in your mouth."
icon_state = "match_unathi"
attack_verb = null
- force = 0
flags = DROPDEL | ABSTRACT
origin_tech = null
lit = TRUE
diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm
index a7af5c55252..4749f522aa1 100644
--- a/code/game/objects/items/weapons/manuals.dm
+++ b/code/game/objects/items/weapons/manuals.dm
@@ -20,7 +20,6 @@
/obj/item/book/manual
//While piracy is a heinious deed, we don't want people uploading programmatic books into the player book DB for obvious reasons
copyright = TRUE
- protected = FALSE //No reason players shouldn't write in regular manuals
name = "Book Manual"
desc = "Please make a report on the github if you somehow get ahold of one of these in-game."
summary = "This is a manual procured by Nanotrasen, it contains important information!"
@@ -581,7 +580,6 @@
name = "APLU \"Ripley\" Construction and Operation Manual"
desc = "A small guidebook on how to operate a Ripley powerloader exosuit. It's filled with disclaimers and pre-signed waivers."
summary = "Standard operational practices and construction requirements for operation of the Ripley mk. 3 powerloader system."
- icon_state ="book"
author = "Hephaestus Industries"
title = "APLU \"Ripley\" Construction and Operation Manual"
@@ -838,7 +836,6 @@
/obj/item/book/manual/wiki
name = "Wiki Book Manual"
desc = "This REALLY shouldn't exist in-game, please contact a coder."
- copyright = TRUE
protected = TRUE //We absolutely do not want players editing these books, it might fuck up the iframes in them :)
pages = null //we don't want people opening this book until it fully initializes
//Wiki Iframes need a decent bit of room, this will be enough to make the readable without having to expand the window immediately
diff --git a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm
index f10f6127010..0f7d6b51d06 100644
--- a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm
+++ b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm
@@ -37,10 +37,8 @@
var/list/attack_verb_on = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
hitsound = 'sound/weapons/blade1.ogg' // Probably more appropriate than the previous hitsound. -- Dave
usesound = 'sound/weapons/blade1.ogg'
- max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 30)
resistance_flags = FIRE_PROOF
- toolspeed = 1
light_power = 2
var/brightness_on = 2
var/colormap = list(red=LIGHT_COLOR_RED, blue=LIGHT_COLOR_LIGHTBLUE, green=LIGHT_COLOR_GREEN, purple=LIGHT_COLOR_PURPLE, rainbow=LIGHT_COLOR_WHITE)
@@ -326,9 +324,7 @@
/obj/item/melee/energy/sword/cyborg/saw
name = "energy saw"
desc = "For heavy duty cutting. It has a carbon-fiber blade in addition to a toggleable hard-light edge to dramatically increase sharpness."
- force_on = 30
force = 18 //About as much as a spear
- sharp = TRUE
hitsound = 'sound/weapons/circsawhit.ogg'
icon = 'icons/obj/surgery.dmi'
icon_state = "esaw_0"
@@ -365,7 +361,6 @@
desc = "A concentrated beam of energy in the shape of a blade. Very stylish... and lethal."
icon_state = "blade"
force = 30 //Normal attacks deal esword damage
- hitsound = 'sound/weapons/blade1.ogg'
throwforce = 1//Throwing or dropping the item deletes it.
throw_speed = 3
throw_range = 1
@@ -397,7 +392,6 @@
force = 12
force_on = 20 //force when active
throwforce = 20
- throwforce_on = 20
icon = 'icons/obj/lavaland/artefacts.dmi'
lefthand_file = 'icons/mob/inhands/64x64_lefthand.dmi'
righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
diff --git a/code/game/objects/items/weapons/melee/melee_misc.dm b/code/game/objects/items/weapons/melee/melee_misc.dm
index f2f73b8de6a..517fbabafff 100644
--- a/code/game/objects/items/weapons/melee/melee_misc.dm
+++ b/code/game/objects/items/weapons/melee/melee_misc.dm
@@ -8,7 +8,6 @@
slot_flags = ITEM_SLOT_BELT
force = 10
throwforce = 7
- w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=5"
attack_verb = list("flogged", "whipped", "lashed", "disciplined")
hitsound = 'sound/weapons/slash.ogg' //pls replace
@@ -36,7 +35,6 @@
item_state = "candy_sword"
force = 10
throwforce = 7
- w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("slashed", "stabbed", "sliced", "caned")
// MARK: FLYSWATTER
diff --git a/code/game/objects/items/weapons/melee/spellblade.dm b/code/game/objects/items/weapons/melee/spellblade.dm
index db18899b2e5..031b161b00a 100644
--- a/code/game/objects/items/weapons/melee/spellblade.dm
+++ b/code/game/objects/items/weapons/melee/spellblade.dm
@@ -250,7 +250,6 @@
plane = GRAVITY_PULSE_PLANE
appearance_flags = PIXEL_SCALE|LONG_GLIDE
duration = 0.5 SECONDS
- mouse_opacity = MOUSE_OPACITY_TRANSPARENT // Let us not have this visual block clicks
/// Who we are orbiting
var/target
/// A funky color matrix to recolor the slash to
diff --git a/code/game/objects/items/weapons/misc_items.dm b/code/game/objects/items/weapons/misc_items.dm
index 03f298f75b0..218de4a8393 100644
--- a/code/game/objects/items/weapons/misc_items.dm
+++ b/code/game/objects/items/weapons/misc_items.dm
@@ -31,7 +31,6 @@
flags = CONDUCT
force = 5.0
throwforce = 7.0
- w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=50)
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed", "Vaudevilled")
@@ -137,7 +136,6 @@
/obj/item/gift
name = "gift"
desc = "A wrapped item."
- icon = 'icons/obj/items.dmi'
icon_state = "gift3"
var/size = 3.0
var/obj/item/gift = null
@@ -196,7 +194,6 @@
/obj/item/phone
name = "red phone"
desc = "Should anything ever go wrong..."
- icon = 'icons/obj/items.dmi'
icon_state = "red_phone"
flags = CONDUCT
force = 3
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index 05b92c8b2ac..f906e669ece 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -10,8 +10,6 @@
force = 3
throwforce = 5
throw_speed = 3
- throw_range = 7
- w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("mopped", "bashed", "bludgeoned", "whacked")
resistance_flags = FLAMMABLE
new_attack_chain = TRUE
diff --git a/code/game/objects/items/weapons/paint_bucket.dm b/code/game/objects/items/weapons/paint_bucket.dm
index a41a5f472c4..a7b49df476a 100644
--- a/code/game/objects/items/weapons/paint_bucket.dm
+++ b/code/game/objects/items/weapons/paint_bucket.dm
@@ -13,7 +13,6 @@
amount_per_transfer_from_this = 5
possible_transfer_amounts = list(5,10,20,30,50,70)
volume = 70
- container_type = OPENCONTAINER
blocks_emissive = EMISSIVE_BLOCK_GENERIC
/obj/item/reagent_containers/glass/paint/interact_with_atom(atom/target, mob/living/user, list/modifiers)
diff --git a/code/game/objects/items/weapons/powerfist.dm b/code/game/objects/items/weapons/powerfist.dm
index ccded486268..5cc14bf0b93 100644
--- a/code/game/objects/items/weapons/powerfist.dm
+++ b/code/game/objects/items/weapons/powerfist.dm
@@ -7,8 +7,6 @@
attack_verb = list("whacked", "fisted", "power-punched")
force = 12
throwforce = 10
- throw_range = 7
- w_class = WEIGHT_CLASS_NORMAL
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 40)
resistance_flags = FIRE_PROOF
origin_tech = "combat=5;powerstorage=3;syndicate=3"
diff --git a/code/game/objects/items/weapons/rpd.dm b/code/game/objects/items/weapons/rpd.dm
index 9d1dd6de549..01a00d3287d 100644
--- a/code/game/objects/items/weapons/rpd.dm
+++ b/code/game/objects/items/weapons/rpd.dm
@@ -13,15 +13,11 @@
desc = "This device can rapidly dispense atmospherics and disposals piping, manipulate loose piping, and recycle any detached pipes it is applied to."
icon = 'icons/obj/tools.dmi'
icon_state = "rpd"
- opacity = FALSE
- density = FALSE
- anchored = FALSE
flags = CONDUCT
force = 10
throwforce = 10
throw_speed = 3
throw_range = 5
- w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL = 75000, MAT_GLASS = 37500)
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
diff --git a/code/game/objects/items/weapons/scissors.dm b/code/game/objects/items/weapons/scissors.dm
index b4fdb6b0ea2..6c1e9d252ae 100644
--- a/code/game/objects/items/weapons/scissors.dm
+++ b/code/game/objects/items/weapons/scissors.dm
@@ -8,13 +8,11 @@
w_class = WEIGHT_CLASS_SMALL
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("slices", "cuts", "stabs", "jabs")
- toolspeed = 1
/obj/item/scissors/barber
name = "Barber's Scissors"
desc = "A pair of scissors used by a barber."
icon_state = "bscissor"
- item_state = "scissor"
attack_verb = list("beautifully sliced", "artistically cut", "smoothly stabbed", "quickly jabbed")
toolspeed = 0.75
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index 87e84330eab..109ca4b2941 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -24,7 +24,6 @@
slot_flags = ITEM_SLOT_BACK
force = 10
throwforce = 5
- throw_speed = 2
throw_range = 3
w_class = WEIGHT_CLASS_BULKY
materials = list(MAT_GLASS=7500, MAT_METAL=1000)
diff --git a/code/game/objects/items/weapons/soap.dm b/code/game/objects/items/weapons/soap.dm
index df83c7e7c53..8480faadc75 100644
--- a/code/game/objects/items/weapons/soap.dm
+++ b/code/game/objects/items/weapons/soap.dm
@@ -7,7 +7,6 @@
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
w_class = WEIGHT_CLASS_TINY
- throwforce = 0
throw_speed = 4
throw_range = 20
discrete = 1
diff --git a/code/game/objects/items/weapons/staff.dm b/code/game/objects/items/weapons/staff.dm
index 150324f7403..a82eb93b54c 100644
--- a/code/game/objects/items/weapons/staff.dm
+++ b/code/game/objects/items/weapons/staff.dm
@@ -21,7 +21,6 @@
/obj/item/staff/broom
name = "broom"
desc = "Used for sweeping, and flying into the night while cackling. Black cat not included."
- icon = 'icons/obj/wizard.dmi'
icon_state = "broom"
item_state = "broom0"
@@ -65,7 +64,6 @@
/obj/item/staff/broom/horsebroom
name = "broomstick horse"
desc = "Saddle up!"
- icon = 'icons/obj/wizard.dmi'
icon_state = "horsebroom"
item_state = "horsebroom0"
diff --git a/code/game/objects/items/weapons/stock_parts.dm b/code/game/objects/items/weapons/stock_parts.dm
index 044eb21e8b1..1bb0c65590c 100644
--- a/code/game/objects/items/weapons/stock_parts.dm
+++ b/code/game/objects/items/weapons/stock_parts.dm
@@ -18,11 +18,9 @@
use_to_pickup = TRUE
allow_quick_gather = TRUE
allow_quick_empty = TRUE
- pickup_all_on_tile = TRUE
display_contents_with_number = TRUE
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 100
- toolspeed = 1
usesound = 'sound/items/rped.ogg'
var/works_from_distance = FALSE
var/primary_sound = 'sound/items/rped.ogg'
@@ -81,7 +79,6 @@
item_state = "BS_RPED"
w_class = WEIGHT_CLASS_NORMAL
storage_slots = 400
- max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 800
works_from_distance = TRUE
primary_sound = 'sound/items/pshoom.ogg'
@@ -116,7 +113,6 @@
icon = 'icons/obj/stock_parts.dmi'
w_class = WEIGHT_CLASS_SMALL
var/rating = 1
- toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
//Rank 1
@@ -173,7 +169,6 @@
/obj/item/stock_parts/scanning_module/adv
name = "advanced scanning module"
- desc = "A compact, high resolution scanning module used in the construction of certain devices."
icon_state = "adv_scan_module"
item_state = "adv_scan_module"
origin_tech = "magnets=3"
@@ -182,7 +177,6 @@
/obj/item/stock_parts/manipulator/nano
name = "nano-manipulator"
- desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "nano_mani"
item_state = "nano_mani"
origin_tech = "materials=3;programming=2"
@@ -191,7 +185,6 @@
/obj/item/stock_parts/micro_laser/high
name = "high-power micro-laser"
- desc = "A tiny laser used in certain devices."
icon_state = "high_micro_laser"
item_state = "high_micro_laser"
origin_tech = "magnets=3"
@@ -200,7 +193,6 @@
/obj/item/stock_parts/matter_bin/adv
name = "advanced matter bin"
- desc = "A container used to hold compressed matter awaiting re-construction."
icon_state = "advanced_matter_bin"
item_state = "advanced_matter_bin"
origin_tech = "materials=3"
@@ -229,7 +221,6 @@
/obj/item/stock_parts/manipulator/pico
name = "pico-manipulator"
- desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "pico_mani"
item_state = "pico_mani"
origin_tech = "materials=4;programming=4;engineering=4"
@@ -240,14 +231,12 @@
name = "ultra-high-power micro-laser"
icon_state = "ultra_high_micro_laser"
item_state = "ultra_high_micro_laser"
- desc = "A tiny laser used in certain devices."
origin_tech = "magnets=4;engineering=4"
rating = 3
materials = list(MAT_METAL=10, MAT_GLASS=20)
/obj/item/stock_parts/matter_bin/super
name = "super matter bin"
- desc = "A container used to hold compressed matter awaiting re-construction."
icon_state = "super_matter_bin"
item_state = "super_matter_bin"
origin_tech = "materials=4;engineering=4"
@@ -276,7 +265,6 @@
/obj/item/stock_parts/manipulator/femto
name = "femto-manipulator"
- desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "femto_mani"
item_state = "femto_mani"
origin_tech = "materials=6;programming=4;engineering=4"
@@ -287,14 +275,12 @@
name = "quad-ultra micro-laser"
icon_state = "quadultra_micro_laser"
item_state = "quadultra_micro_laser"
- desc = "A tiny laser used in certain devices."
origin_tech = "magnets=5;materials=4;engineering=4"
rating = 4
materials = list(MAT_METAL=10, MAT_GLASS=20)
/obj/item/stock_parts/matter_bin/bluespace
name = "bluespace matter bin"
- desc = "A container used to hold compressed matter awaiting re-construction."
icon_state = "bluespace_matter_bin"
item_state = "bluespace_matter_bin"
origin_tech = "materials=6;programming=4;engineering=4"
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 49c04c97b5e..833216d15e9 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -15,7 +15,6 @@
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 21
storage_slots = 21
- resistance_flags = NONE
max_integrity = 300
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/back.dmi',
@@ -98,8 +97,6 @@
desc = "Space Santa uses this to deliver toys to all the nice children in space on Christmas! Wow, it's pretty big!"
icon_state = "giftbag0"
item_state = "giftbag0"
- w_class = WEIGHT_CLASS_BULKY
- max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 400 // can store a ton of shit!
/obj/item/storage/backpack/cultpack
@@ -175,7 +172,6 @@
desc = "It's a fireproof backpack for Atmospherics Staff."
icon_state = "atmospack"
item_state = "atmospack"
- resistance_flags = FIRE_PROOF
/obj/item/storage/backpack/explorer
name = "explorer bag"
@@ -782,7 +778,6 @@
desc = "Not recommended for wizardly consumption. Recommended for mundane consumption!"
icon_state = "holyflask"
color = "#DC0000"
- volume = 100
list_reagents = list("dragonsbreath" = 80, "hell_water" = 20)
/obj/item/reagent_containers/drinks/bottle/immortality
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index a953b9c08cc..7e09e5c9d3f 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -37,7 +37,6 @@
belt_icon = "trashbag"
lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
- max_w_class = WEIGHT_CLASS_SMALL
slot_flags = null
storage_slots = 30
max_combined_w_class = 30
@@ -118,10 +117,7 @@
icon_state = "plasticbag"
item_state = "plasticbag"
slot_flags = ITEM_SLOT_HEAD|ITEM_SLOT_BELT
- throwforce = 0
w_class = WEIGHT_CLASS_BULKY
- max_w_class = WEIGHT_CLASS_SMALL
- storage_slots = 7
display_contents_with_number = 0 //or else this will lead to stupid behavior.
can_hold = list() // any
cant_hold = list(/obj/item/disk/nuclear)
@@ -163,7 +159,6 @@
origin_tech = "engineering=2"
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_POCKETS
prefered_slot_flags = ITEM_SLOT_BOTH_POCKETS
- w_class = WEIGHT_CLASS_NORMAL
storage_slots = 10
max_combined_w_class = 200 //Doesn't matter what this is, so long as it's more or equal to storage_slots * ore.w_class
max_w_class = WEIGHT_CLASS_NORMAL
@@ -298,7 +293,6 @@
/obj/item/storage/bag/plants/seed_sorting_tray
name = "seed sorting tray"
desc = "A simple wooden tray with compartments for manually sorting seeds. It's better than nothing, but a plant analyzer would be more effective."
- icon = 'icons/obj/hydroponics/equipment.dmi'
icon_state = "seed_sorting_tray"
can_hold = list(
/obj/item/seeds,
@@ -322,7 +316,6 @@
////////////////////////////////////////
/obj/item/storage/bag/cash
- icon = 'icons/obj/storage.dmi'
icon_state = "cashbag"
name = "Cash bag"
desc = "A bag for carrying lots of cash. It's got a big dollar sign printed on the front."
@@ -342,7 +335,6 @@
icon = 'icons/obj/library.dmi'
icon_state = "bookbag"
display_contents_with_number = 0 //This would look really stupid otherwise
- storage_slots = 7
max_combined_w_class = 21
max_w_class = WEIGHT_CLASS_NORMAL
w_class = WEIGHT_CLASS_BULKY //Bigger than a book because physics
@@ -568,7 +560,6 @@
origin_tech = "engineering=2"
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_POCKETS
prefered_slot_flags = ITEM_SLOT_BOTH_POCKETS
- w_class = WEIGHT_CLASS_NORMAL
storage_slots = 15
max_combined_w_class = 60
max_w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index d0dd907098f..77ceae34889 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -73,8 +73,6 @@
/obj/item/storage/belt/utility
name = "tool-belt" //Carn: utility belt is nicer, but it bamboozles the text parsing.
desc = "Can hold various tools."
- icon_state = "utilitybelt"
- item_state = "utility"
use_item_overlays = TRUE
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 18
@@ -221,13 +219,10 @@
)
/obj/item/storage/belt/medical/surgery
- max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 17
- use_to_pickup = TRUE
name = "surgical belt"
desc = "Can hold various surgical tools."
storage_slots = 9
- use_item_overlays = TRUE
can_hold = list(
/obj/item/scalpel,
/obj/item/hemostat,
@@ -372,7 +367,6 @@
item_state = "federationwebbing"
storage_slots = 15
max_combined_w_class = 25
- use_item_overlays = FALSE
layer_over_suit = TRUE
w_class_override = list(
/obj/item/crowbar,
@@ -422,7 +416,6 @@
desc = "A syndicate belt designed to be used by boarding parties. Its style is modelled after the hardsuits they wear."
icon_state = "militarybelt"
item_state = "military"
- max_w_class = WEIGHT_CLASS_SMALL
max_combined_w_class = 18
resistance_flags = FIRE_PROOF
use_item_overlays = TRUE // Will show the tools on the sprite
@@ -716,7 +709,6 @@
icon_state = "fannypack_leather"
item_state = "fannypack_leather"
storage_slots = 3
- max_w_class = WEIGHT_CLASS_SMALL
/obj/item/storage/belt/fannypack/black
name = "black fannypack"
@@ -861,7 +853,6 @@
item_state = "holdingbelt"
storage_slots = 14
w_class = WEIGHT_CLASS_BULKY
- max_w_class = WEIGHT_CLASS_SMALL
max_combined_w_class = 21 // = 14 * 1.5, not 14 * 2. This is deliberate
origin_tech = "bluespace=5;materials=4;engineering=4;plasmatech=5"
can_hold = list()
@@ -884,7 +875,6 @@
storage_slots = 6
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 18
- origin_tech = "bluespace=5;materials=4;engineering=4;plasmatech=5"
allow_quick_empty = TRUE
can_hold = list(
/obj/item/grenade/smokebomb,
@@ -998,7 +988,6 @@
storage_slots = 6
max_w_class = WEIGHT_CLASS_BULKY
max_combined_w_class = 20
- use_item_overlays = FALSE
layer_over_suit = TRUE
can_hold = list(
/obj/item/crowbar,
diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm
index 06544e3961a..c43af97986d 100644
--- a/code/game/objects/items/weapons/storage/bible.dm
+++ b/code/game/objects/items/weapons/storage/bible.dm
@@ -6,7 +6,6 @@
icon_state ="bible"
throw_speed = 1
throw_range = 5
- w_class = WEIGHT_CLASS_NORMAL
resistance_flags = FIRE_PROOF
drop_sound = 'sound/items/handling/book_drop.ogg'
pickup_sound = 'sound/items/handling/book_pickup.ogg'
@@ -53,9 +52,7 @@
return TRUE // Don't run the fart emote
/obj/item/storage/bible/booze
- name = "bible"
desc = "To be applied to the head repeatedly."
- icon_state ="bible"
/obj/item/storage/bible/booze/populate_contents()
new /obj/item/reagent_containers/drinks/bottle/beer(src)
@@ -186,5 +183,4 @@
/obj/item/storage/bible/syndi
name = "suspicious bible"
desc = "For treading the line between cultist, contraband, and a hostile corporation."
- customisable = FALSE
icon_state = "syndi"
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index 17badb39ac1..aa703bab45b 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -396,7 +396,6 @@
name = "monkey cube box"
desc = "Drymate brand monkey cubes. Just add water!"
icon_state = "monkey_box"
- storage_slots = 7
can_hold = list(/obj/item/food/monkeycube)
var/monkey_cube_type = /obj/item/food/monkeycube
@@ -1069,7 +1068,6 @@
icon = 'icons/obj/storage.dmi'
icon_state = "paperbag_None"
item_state = "paperbag_None"
- resistance_flags = FLAMMABLE
foldable = null
var/design = NODESIGN
@@ -1301,7 +1299,6 @@
/obj/item/storage/box/wizard/hardsuit
name = "battlemage armour bundle"
desc = "This box contains a bundle of Battlemage Armour."
- icon_state = "wizard_box"
/obj/item/storage/box/wizard/hardsuit/populate_contents()
new /obj/item/clothing/suit/space/hardsuit/wizard(src)
diff --git a/code/game/objects/items/weapons/storage/briefcase.dm b/code/game/objects/items/weapons/storage/briefcase.dm
index 402d6ec2d41..7b8524fe66d 100644
--- a/code/game/objects/items/weapons/storage/briefcase.dm
+++ b/code/game/objects/items/weapons/storage/briefcase.dm
@@ -7,7 +7,6 @@
hitsound = "swing_hit"
use_sound = 'sound/effects/briefcase.ogg'
force = 8
- throw_speed = 2
throw_range = 4
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index d003f232ee5..091fa3cf02d 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -378,7 +378,6 @@
icon_state = "solar_packet"
item_state = "solar_packet"
cigarette_slogan = "Smoked by true patriots."
- cigarette_type = /obj/item/clothing/mask/cigarette
/obj/item/storage/fancy/cigarettes/cigpack_uplift
name = "\improper Uplift Smooth packet"
@@ -449,10 +448,7 @@
desc = "A locked box for keeping things away from children."
icon = 'icons/obj/vialbox.dmi'
icon_state = "vialbox0"
- item_state = "syringe_kit"
- max_w_class = WEIGHT_CLASS_NORMAL
can_hold = list(/obj/item/reagent_containers/glass/bottle)
- max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
storage_slots = 6
req_access = list(ACCESS_VIROLOGY)
@@ -491,8 +487,6 @@
name = "aquatic starter kit"
desc = "It's a starter kit box for an aquarium."
icon_state = "AquaticKit"
- throw_speed = 2
- throw_range = 8
med_bot_skin = "fish"
/obj/item/storage/firstaid/aquatic_kit/full
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index 673d63884bf..b197c8d058c 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -12,7 +12,6 @@
name = "generic first-aid kit"
desc = "If you can see this, make a bug report on GitHub, something went wrong!"
icon_state = "genericfirstaid"
- throw_speed = 2
throw_range = 8
req_one_access =list(ACCESS_MEDICAL, ACCESS_ROBOTICS) //Access and treatment are utilized for medbots.
var/treatment_brute = "salglu_solution"
@@ -176,7 +175,6 @@
treatment_oxy = "perfluorodecalin"
treatment_brute = "bicaridine"
treatment_fire = "kelotane"
- treatment_tox = "charcoal"
req_one_access = list(ACCESS_SYNDICATE)
med_bot_skin = "bezerk"
syndicate_aligned = TRUE
diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index 0c8a96c7436..a867e00c74c 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -5,7 +5,6 @@
item_state = "syringe_kit"
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_NORMAL
- max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
storage_slots = 4
req_access = list(ACCESS_ARMORY)
var/locked = TRUE
@@ -119,7 +118,6 @@
name = "medal box"
desc = "A locked box used to store medals of honor."
icon_state = "medalbox+l"
- item_state = "syringe_kit"
w_class = WEIGHT_CLASS_NORMAL
max_w_class = WEIGHT_CLASS_SMALL
max_combined_w_class = 20
diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm
index 0656ef5e203..2e60afda794 100644
--- a/code/game/objects/items/weapons/storage/secure.dm
+++ b/code/game/objects/items/weapons/storage/secure.dm
@@ -12,9 +12,6 @@
// -----------------------------
/obj/item/storage/secure
name = "secstorage"
- w_class = WEIGHT_CLASS_NORMAL
- max_w_class = WEIGHT_CLASS_SMALL
- max_combined_w_class = 14
var/icon_locking = "secureb"
var/icon_sparking = "securespark"
var/icon_opened = "secure0"
@@ -203,14 +200,12 @@
/obj/item/storage/secure/briefcase
name = "secure briefcase"
desc = "A large briefcase with a digital locking system."
- icon = 'icons/obj/storage.dmi'
icon_state = "secure"
item_state = "sec-case"
flags = CONDUCT
hitsound = "swing_hit"
use_sound = 'sound/effects/briefcase.ogg'
force = 8
- throw_speed = 2
throw_range = 4
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_NORMAL
@@ -249,7 +244,6 @@
/obj/item/storage/secure/safe
name = "secure safe"
- icon = 'icons/obj/storage.dmi'
icon_state = "safe"
icon_opened = "safe0"
icon_locking = null
@@ -258,7 +252,6 @@
w_class = WEIGHT_CLASS_HUGE
max_w_class = 8
anchored = TRUE
- density = FALSE
cant_hold = list(/obj/item/storage/secure/briefcase)
/obj/item/storage/secure/safe/attack_hand(mob/user as mob)
diff --git a/code/game/objects/items/weapons/storage/storage_base.dm b/code/game/objects/items/weapons/storage/storage_base.dm
index b643e5342ef..2ab109d896c 100644
--- a/code/game/objects/items/weapons/storage/storage_base.dm
+++ b/code/game/objects/items/weapons/storage/storage_base.dm
@@ -8,7 +8,6 @@
/obj/item/storage
name = "storage"
icon = 'icons/obj/storage.dmi'
- w_class = WEIGHT_CLASS_NORMAL
flags_2 = BLOCKS_LIGHT_2
/// No message on putting items in.
var/silent = FALSE
diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index 82d882da36a..a0b093cb822 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -8,8 +8,6 @@
flags = CONDUCT
force = 10
throwforce = 10
- throw_speed = 2
- throw_range = 7
w_class = WEIGHT_CLASS_BULKY
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 18
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index aa40c8d208e..b503a3681f4 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -501,7 +501,6 @@
new /obj/item/reagent_containers/syringe/pancuronium(src)
/obj/item/storage/box/syndie_kit/nuke
- name = "box" //Bit of stealth, since you spawn with it
desc = "It's just an ordinary box."
icon_state = "box"
@@ -511,7 +510,6 @@
new /obj/item/paper/guides/antag/nuke_instructions(src)
/obj/item/storage/box/syndie_kit/supermatter
- name = "box"
desc = "It's just an ordinary box."
icon_state = "box"
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index faffa87d1aa..2074cb9d531 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -390,7 +390,6 @@
icon_state = "swarmprod"
base_icon = "swarmprod"
item_state = "swarmprod"
- force = 10
throwforce = 0 // Just in case
knockdown_duration = 6 SECONDS
knockdown_delay = 0 SECONDS
diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index e35157b3196..50d7cd50a8e 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -138,7 +138,6 @@
item_state = "jetpack-void"
/obj/item/tank/jetpack/void/grey
- name = "Void Jetpack (Oxygen)"
icon_state = "jetpack-void-grey"
item_state = "jetpack-void-grey"
@@ -150,8 +149,6 @@
/obj/item/tank/jetpack/oxygen
name = "Jetpack (Oxygen)"
desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution."
- icon_state = "jetpack"
- item_state = "jetpack"
/obj/item/tank/jetpack/oxygen/harness
name = "jet harness (oxygen)"
diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm
index 74dc7de8d51..8f1657a1e89 100644
--- a/code/game/objects/items/weapons/tanks/tank_types.dm
+++ b/code/game/objects/items/weapons/tanks/tank_types.dm
@@ -59,7 +59,6 @@
name = "plasma tank"
desc = "Contains dangerous plasma. Do not inhale. Warning: extremely flammable."
icon_state = "plasma"
- flags = CONDUCT
slot_flags = null //they have no straps!
force = 8
@@ -130,7 +129,6 @@
name = "emergency oxygen tank"
desc = "Used for emergencies. Contains very little oxygen, so try to conserve it until you actually need it."
icon_state = "emergency"
- flags = CONDUCT
slot_flags = ITEM_SLOT_BELT
flags_2 = ALLOW_BELT_NO_JUMPSUIT_2
w_class = WEIGHT_CLASS_SMALL
@@ -213,7 +211,6 @@
/obj/item/tank/internals/generic
name = "gas tank"
desc = "A generic tank used for storing and transporting gasses. Can be used for internals."
- icon_state = "generic"
item_state = "generic"
/obj/item/tank/internals/generic/populate_gas()
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index ee0d349b907..e3cdcda6e12 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -4,7 +4,6 @@
flags = CONDUCT
slot_flags = ITEM_SLOT_BACK
hitsound = 'sound/weapons/smash.ogg'
- w_class = WEIGHT_CLASS_NORMAL
pressure_resistance = ONE_ATMOSPHERE * 5
force = 5
throwforce = 10
diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index e2c7ca02ccb..0dfb915d152 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -9,7 +9,6 @@
slot_flags = ITEM_SLOT_BACK
slowdown = 1
actions_types = list(/datum/action/item_action/toggle_mister)
- max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 30)
resistance_flags = FIRE_PROOF
@@ -115,8 +114,6 @@
amount_per_transfer_from_this = 50
possible_transfer_amounts = list(25,50,100)
volume = 500
- flags = NOBLUDGEON
- container_type = OPENCONTAINER
var/obj/item/watertank/tank
@@ -158,7 +155,6 @@
//Janitor tank
/obj/item/watertank/janitor
- name = "backpack water tank"
desc = "A janitorial watertank backpack with nozzle to clean dirt and graffiti."
icon_state = "waterbackpackjani"
item_state = "waterbackpackjani"
@@ -170,7 +166,6 @@
/obj/item/reagent_containers/spray/mister/janitor
name = "janitor spray nozzle"
desc = "A janitorial spray nozzle attached to a watertank, designed to clean up large messes."
- icon = 'icons/obj/watertank.dmi'
icon_state = "misterjani"
item_state = "misterjani"
spray_maxrange = 4
@@ -200,7 +195,6 @@
desc = "A refridgerated and pressurized backpack tank with extinguisher nozzle, intended to fight fires. Swaps between extinguisher, nanofrost launcher, and metal foam dispenser for breaches. Nanofrost converts plasma in the air to nitrogen, but only if it is combusting at the time."
icon_state = "waterbackpackatmos"
item_state = "waterbackpackatmos"
- volume = 500
/obj/item/watertank/atmos/New()
..()
@@ -357,7 +351,6 @@
/obj/effect/nanofrost_container
name = "nanofrost container"
desc = "A frozen shell of ice containing nanofrost that freezes the surrounding area after activation."
- icon = 'icons/effects/effects.dmi'
icon_state = "frozen_smoke_capsule"
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
pass_flags = PASSTABLE
diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index 1e1ec62192b..a7c45caf4ae 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -12,7 +12,6 @@
icon = 'icons/obj/device.dmi'
icon_state = "hand_tele"
item_state = "electronic"
- throwforce = 0
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 5
diff --git a/code/game/objects/items/weapons/teleprod.dm b/code/game/objects/items/weapons/teleprod.dm
index a22016ea55e..81ab40bfd6b 100644
--- a/code/game/objects/items/weapons/teleprod.dm
+++ b/code/game/objects/items/weapons/teleprod.dm
@@ -1,8 +1,6 @@
/obj/item/melee/baton/cattleprod/teleprod
name = "teleprod"
desc = "A prod with a bluespace crystal on the end. The crystal doesn't look too fun to touch."
- lefthand_file = 'icons/mob/inhands/weapons_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
icon_state = "teleprod_nocell"
base_icon = "teleprod"
origin_tech = "combat=2;bluespace=4;materials=3"
diff --git a/code/game/objects/items/weapons/thurible.dm b/code/game/objects/items/weapons/thurible.dm
index 63f0cbc4e30..8bc8270323a 100644
--- a/code/game/objects/items/weapons/thurible.dm
+++ b/code/game/objects/items/weapons/thurible.dm
@@ -8,7 +8,6 @@
item_state = "thurible"
force = 10
throwforce = 7
- w_class = WEIGHT_CLASS_NORMAL
flags = CONDUCT
container_type = REFILLABLE
/// Whether or not the thurible can be loaded with harmful chems
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index c3e1e5d6699..4667756579c 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -19,7 +19,6 @@
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
hitsound = 'sound/weapons/bladeslice.ogg'
usesound = 'sound/items/crowbar.ogg'
- max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 30)
resistance_flags = FIRE_PROOF
@@ -111,7 +110,6 @@
armour_penetration_percentage = 50
origin_tech = "magnets=4;syndicate=5"
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 70)
resistance_flags = FIRE_PROOF
light_power = 2
@@ -288,7 +286,6 @@
sharp = TRUE
no_spin_thrown = TRUE
var/obj/item/grenade/explosive = null
- max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
needs_permit = TRUE
@@ -367,12 +364,8 @@
/obj/item/spear/grey_tide
name = "\improper Grey Tide"
desc = "Recovered from the aftermath of a revolt aboard Defense Outpost Theta Aegis, in which a seemingly endless tide of Assistants caused heavy casualities among Nanotrasen military forces."
- base_icon_state = "spearglass"
- icon_state = "spearglass0"
force_unwielded = 15
force_wielded = 25
- throwforce = 20
- throw_speed = 4
attack_verb = list("gored")
/obj/item/spear/grey_tide/afterattack__legacy__attackchain(atom/movable/AM, mob/living/user, proximity)
@@ -413,7 +406,6 @@
name = "head on a spear"
desc = "How barbaric."
icon_state = "headspear"
- density = FALSE
anchored = TRUE
var/obj/item/organ/external/head/mounted_head = null
var/obj/item/spear/contained_spear = null
@@ -519,7 +511,6 @@
slot_flags = ITEM_SLOT_BACK
force = 5
throwforce = 30
- throw_range = 7
w_class = WEIGHT_CLASS_HUGE
origin_tech = "combat=4;powerstorage=7"
@@ -776,8 +767,6 @@
force = 8
throwforce = 10
throw_speed = 3
- throw_range = 7
- w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("swept", "brushed off", "bludgeoned", "whacked")
resistance_flags = FLAMMABLE
diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm
index cf8b2b651a0..dd78addbca0 100644
--- a/code/game/objects/items/weapons/vending_items.dm
+++ b/code/game/objects/items/weapons/vending_items.dm
@@ -11,8 +11,6 @@
force = 7
throwforce = 10
throw_speed = 1
- throw_range = 7
- w_class = WEIGHT_CLASS_NORMAL
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 70, ACID = 30)
// Built automatically from the corresponding vending machine.
@@ -144,7 +142,6 @@
/obj/item/vending_refill/sustenance
machine_name = "Sustenance Vendor"
- icon_state = "refill_snack"
/obj/item/vending_refill/donksoft
machine_name = "Donksoft Toy Vendor"
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index aa88a661a4f..6044c793671 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -7,12 +7,10 @@
icon = 'icons/obj/toy.dmi'
icon_state = "toyhammer"
slot_flags = ITEM_SLOT_BELT
- throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_speed = 7
throw_range = 15
attack_verb = list("banned")
- max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 70)
resistance_flags = FIRE_PROOF
@@ -35,7 +33,6 @@
slot_flags = ITEM_SLOT_BELT
force = 2
throwforce = 1
- w_class = WEIGHT_CLASS_NORMAL
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
@@ -58,9 +55,7 @@
force = 40
throwforce = 10
sharp = TRUE
- w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
@@ -94,7 +89,6 @@
w_class = WEIGHT_CLASS_BULKY
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
needs_permit = TRUE
@@ -119,7 +113,6 @@
item_state = "harpoon"
force = 20
throwforce = 15
- w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("jabbed","stabbed","ripped")
/obj/item/wirerod
@@ -130,7 +123,6 @@
flags = CONDUCT
force = 9
throwforce = 10
- w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=1150, MAT_GLASS=75)
attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
@@ -184,7 +176,6 @@
desc = "A one-handed spear brought over from the Kidan homeworld."
icon_state = "kidanspear"
item_state = "kidanspear"
- force = 10
throwforce = 15
/obj/item/melee/baseball_bat
diff --git a/code/game/objects/mail.dm b/code/game/objects/mail.dm
index f0b0171f8cc..decd1dd6dbd 100644
--- a/code/game/objects/mail.dm
+++ b/code/game/objects/mail.dm
@@ -1,8 +1,6 @@
/obj/item/envelope
name = "broken letter"
desc = "We just got a letter, we just got a letter, we just got a letter -- I wonder who it's from?"
- force = 0
- throwforce = 0
w_class = WEIGHT_CLASS_SMALL
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "mail_misc"
@@ -231,8 +229,6 @@
/obj/item/mail_scanner
name = "mail scanner"
desc = "A portable mail scanner, this device allows you to log mail deliveries in exchange for financial compensation."
- force = 0
- throwforce = 0
icon = 'icons/obj/device.dmi'
icon_state = "mail_scanner"
item_state = "mail_scanner"
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index f3ad35bc031..c07c42989d4 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -91,9 +91,6 @@
/obj/structure/alien/resin/wall
name = "resin wall"
desc = "Thick resin solidified into a wall."
- icon = 'icons/obj/smooth_structures/alien/resin_wall.dmi'
- icon_state = "resin_wall-0"
- base_icon_state = "resin_wall"
smoothing_groups = list(SMOOTH_GROUP_ALIEN_RESIN, SMOOTH_GROUP_ALIEN_WALLS)
canSmoothWith = list(SMOOTH_GROUP_ALIEN_WALLS)
@@ -105,16 +102,12 @@
*/
/obj/structure/alien/resin/door
name = "resin door"
- density = TRUE
- anchored = TRUE
- opacity = TRUE
icon = 'icons/obj/smooth_structures/alien/resin_door.dmi'
icon_state = "resin"
base_icon_state = "resin"
max_integrity = 60
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
- damage_deflection = 0
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
rad_insulation_beta = RAD_MEDIUM_INSULATION
rad_insulation_gamma = RAD_LIGHT_INSULATION
@@ -234,7 +227,6 @@
name = "resin floor"
desc = "A thick resin surface covers the floor."
anchored = TRUE
- density = FALSE
plane = FLOOR_PLANE
icon = 'icons/obj/smooth_structures/alien/weeds.dmi'
icon_state = "weeds"
@@ -373,7 +365,6 @@
icon_state = null
anchored = TRUE
layer = ABOVE_WINDOW_LAYER
- plane = GAME_PLANE
max_integrity = 15
var/obj/structure/alien/weeds/weed
@@ -428,9 +419,6 @@
/obj/structure/alien/weeds/node
name = "resin node"
desc = "A large bulbous node pumping resin into the surface bellow it."
- icon = 'icons/obj/smooth_structures/alien/weeds.dmi'
- icon_state = "weeds"
- base_icon_state = "weeds"
light_range = 1
var/node_range = NODERANGE
@@ -459,9 +447,7 @@
name = "egg"
desc = "A large mottled egg."
icon_state = "egg_growing"
- density = FALSE
anchored = TRUE
- max_integrity = 100
integrity_failure = 5
layer = MOB_LAYER
flags_2 = CRITICAL_ATOM_2
diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm
index 1fc97e43a60..f3127df147d 100644
--- a/code/game/objects/structures/barsign.dm
+++ b/code/game/objects/structures/barsign.dm
@@ -10,7 +10,6 @@
icon = 'icons/obj/barsigns.dmi'
icon_state = "off"
req_access = list(ACCESS_BAR)
- max_integrity = 200
integrity_failure = 160
idle_power_consumption = 5
active_power_consumption = 25
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 13248507e26..77f58a53aff 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -272,7 +272,6 @@ LINEN BINS
/obj/structure/bedsheetbin
name = "linen bin"
desc = "A linen bin. It looks rather cozy."
- icon = 'icons/obj/structures.dmi'
icon_state = "linenbin-full"
anchored = TRUE
resistance_flags = FLAMMABLE
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index e1076ab9220..72e993d308e 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -10,7 +10,6 @@
integrity_failure = 0
open_sound = 'sound/machines/cardboard_box.ogg'
close_sound = 'sound/machines/cardboard_box.ogg'
- open_sound_volume = 35
close_sound_volume = 35
material_drop = /obj/item/stack/sheet/cardboard
/// How fast a mob can move inside this box.
diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm
index e1651a81746..2f132f3e2d0 100644
--- a/code/game/objects/structures/crates_lockers/closets/coffin.dm
+++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm
@@ -10,7 +10,6 @@
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
open_sound_volume = 25
- close_sound_volume = 50
/obj/structure/closet/coffin/sarcophagus
name = "sarcophagus"
diff --git a/code/game/objects/structures/crates_lockers/closets/fitness.dm b/code/game/objects/structures/crates_lockers/closets/fitness.dm
index bf9c8fc54ef..caaa1ba4d57 100644
--- a/code/game/objects/structures/crates_lockers/closets/fitness.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fitness.dm
@@ -1,7 +1,6 @@
/obj/structure/closet/athletic_mixed
name = "athletic wardrobe"
desc = "It's a storage unit for athletic wear."
- icon_state = "generic"
closed_door_sprite = "mixed"
/obj/structure/closet/athletic_mixed/populate_contents()
@@ -41,7 +40,6 @@
/obj/structure/closet/lasertag/red
name = "red laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
- icon_state = "generic"
closed_door_sprite = "red"
/obj/structure/closet/lasertag/red/populate_contents()
@@ -57,7 +55,6 @@
/obj/structure/closet/lasertag/blue
name = "blue laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
- icon_state = "generic"
closed_door_sprite = "blue"
/obj/structure/closet/lasertag/blue/populate_contents()
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index 7d35647dcac..e726c31d7f8 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -7,7 +7,6 @@
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
open_sound_volume = 25
- close_sound_volume = 50
max_integrity = 70
/obj/structure/closet/cabinet/wizard
@@ -34,12 +33,10 @@
name = "administrative supply closet"
desc = "It's a storage unit for things that have no right being here."
icon_state = "syndicate1"
- anchored = FALSE
/obj/structure/closet/gimmick/soviet
name = "soviet surplus closet"
desc = "A storage unit for surplus USSP equipment."
- icon_state = "syndicate1"
/obj/structure/closet/gimmick/soviet/populate_contents()
new /obj/item/clothing/head/sovietsidecap(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 9641c45f46a..9521d8f1912 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -12,7 +12,6 @@
/obj/structure/closet/gmcloset
name = "formal closet"
desc = "It's a storage unit for formal clothing."
- icon_state = "generic"
closed_door_sprite = "black"
/obj/structure/closet/gmcloset/populate_contents()
@@ -39,7 +38,6 @@
/obj/structure/closet/chefcloset
name = "chef's closet"
desc = "It's a storage unit for foodservice garments."
- icon_state = "generic"
closed_door_sprite = "black"
@@ -67,7 +65,6 @@
/obj/structure/closet/jcloset
name = "custodial closet"
desc = "It's a storage unit for janitorial clothes and gear."
- icon_state = "generic"
closed_door_sprite = "mixed"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
index 80948affcc9..cc840d5140f 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm
@@ -8,7 +8,6 @@
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
open_sound_volume = 25
- close_sound_volume = 50
/obj/structure/closet/secure_closet/bar/populate_contents()
for(var/i in 1 to 10)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
index c7056037507..892205426e2 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm
@@ -29,7 +29,6 @@
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
open_sound_volume = 25
- close_sound_volume = 50
/obj/structure/closet/secure_closet/personal/cabinet/populate_contents()
new /obj/item/storage/backpack/satchel/withwallet( src )
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index 4e87dc0d71c..df6eb1cb989 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -1,9 +1,7 @@
/obj/structure/closet/secure_closet
name = "secure locker"
desc = "It's an immobile card-locked storage unit."
- icon = 'icons/obj/closet.dmi'
icon_state = "secure"
- opened = FALSE
locked = TRUE
secure = TRUE
can_be_emaged = TRUE
diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm
index a0c584d5be6..88a815a8d19 100644
--- a/code/game/objects/structures/crates_lockers/closets/statue.dm
+++ b/code/game/objects/structures/crates_lockers/closets/statue.dm
@@ -4,7 +4,6 @@
desc = "An incredibly lifelike marble carving."
icon = 'icons/obj/statue.dmi'
icon_state = "human_male"
- density = TRUE
anchored = TRUE
max_integrity = 0 //destroying the statue kills the mob within
var/intialTox = 0 //these are here to keep the mob from taking damage from things that logically wouldn't affect a rock
diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 77d0d6da3a6..40a5cca0316 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -1,7 +1,6 @@
/obj/structure/closet/wardrobe
name = "wardrobe"
desc = "It's a storage unit for standard-issue Nanotrasen attire."
- icon_state = "generic"
closed_door_sprite = "blue"
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 07559ac79a5..f0437dd6544 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -10,8 +10,6 @@
var/rigged = FALSE
open_sound = 'sound/machines/crate_open.ogg'
close_sound = 'sound/machines/crate_close.ogg'
- open_sound_volume = 35
- close_sound_volume = 50
var/obj/item/paper/manifest/manifest
/// A list of beacon names that the crate will announce the arrival of, when delivered.
var/list/announce_beacons = list()
@@ -172,7 +170,6 @@
max_integrity = 500
armor = list(MELEE = 30, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 0, RAD = 0, FIRE = 80, ACID = 80)
damage_deflection = 25
- broken = FALSE
locked = TRUE
can_be_emaged = TRUE
crate_value = 25 // rarer and cannot be crafted, bonus credits for exporting them
diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm
index 99d1e7b2de8..dc8b05f4116 100644
--- a/code/game/objects/structures/crates_lockers/crittercrate.dm
+++ b/code/game/objects/structures/crates_lockers/crittercrate.dm
@@ -11,7 +11,6 @@
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
open_sound_volume = 25
- close_sound_volume = 50
/obj/structure/closet/critter/can_open()
if(welded)
diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm
index c9da80f8132..f77d8607702 100644
--- a/code/game/objects/structures/crates_lockers/walllocker.dm
+++ b/code/game/objects/structures/crates_lockers/walllocker.dm
@@ -21,7 +21,6 @@
name = "emergency locker"
desc = "A wall mounted locker with emergency supplies."
icon_state = "emerg"
- door_anim_time = 0
icon_closed = "emerg"
icon_opened = "emerg_open"
diff --git a/code/game/objects/structures/curtains.dm b/code/game/objects/structures/curtains.dm
index 5d060289b60..ffedc3fed4b 100644
--- a/code/game/objects/structures/curtains.dm
+++ b/code/game/objects/structures/curtains.dm
@@ -8,7 +8,6 @@
face_while_pulling = FALSE
layer = SHOWER_CLOSED_LAYER
opacity = TRUE
- density = FALSE
new_attack_chain = TRUE
var/assembled = TRUE
var/overlay_color = "#ffffff"
diff --git a/code/game/objects/structures/depot_structures.dm b/code/game/objects/structures/depot_structures.dm
index 05e380643c3..1668c331d58 100644
--- a/code/game/objects/structures/depot_structures.dm
+++ b/code/game/objects/structures/depot_structures.dm
@@ -72,7 +72,6 @@
icon_state = "energy_ball"
pixel_x = -32
pixel_y = -32
- anchored = TRUE
var/cycles = 0
var/beepsound = 'sound/items/timer.ogg'
var/deliberate = FALSE
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 94953b6f8ba..13b4fd258a2 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -225,7 +225,6 @@
/obj/structure/displaycase_chassis
anchored = TRUE
- density = FALSE
name = "display case chassis"
desc = "The wooden base of a display case."
icon = 'icons/obj/stationobjs.dmi'
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 7c3205e754e..c5464774f6b 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -2,7 +2,6 @@
name = "airlock assembly"
icon = 'icons/obj/doors/airlocks/station/public.dmi'
icon_state = "construction"
- anchored = FALSE
density = TRUE
max_integrity = 200
cares_about_temperature = TRUE
diff --git a/code/game/objects/structures/engicart.dm b/code/game/objects/structures/engicart.dm
index 642a67b7ba0..51d027ecc24 100644
--- a/code/game/objects/structures/engicart.dm
+++ b/code/game/objects/structures/engicart.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/engicart.dmi'
icon_state = "cart"
face_while_pulling = FALSE
- anchored = FALSE
density = TRUE
new_attack_chain = TRUE
var/obj/item/stack/sheet/glass/my_glass = null
diff --git a/code/game/objects/structures/extinguisher_cabinet.dm b/code/game/objects/structures/extinguisher_cabinet.dm
index f25520be1e0..06244919f9b 100644
--- a/code/game/objects/structures/extinguisher_cabinet.dm
+++ b/code/game/objects/structures/extinguisher_cabinet.dm
@@ -9,7 +9,6 @@
icon = 'icons/obj/closet.dmi'
icon_state = "extinguisher"
anchored = TRUE
- density = FALSE
max_integrity = 200
integrity_failure = 50
var/obj/item/extinguisher/has_extinguisher = null
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 9786e7911c5..cbc23fcebd2 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -186,7 +186,6 @@
base_icon_state = "reinforced_wall"
walltype = /turf/simulated/wall/r_wall
mineral = /obj/item/stack/sheet/plasteel
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REINFORCED_WALLS)
canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS)
@@ -215,7 +214,6 @@
walltype = /turf/simulated/wall/mineral/uranium
var/active = FALSE
var/last_event = 0
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_URANIUM_WALLS)
canSmoothWith = list(SMOOTH_GROUP_URANIUM_WALLS)
@@ -235,7 +233,6 @@
base_icon_state = "gold_wall"
mineral = /obj/item/stack/sheet/mineral/gold
walltype = /turf/simulated/wall/mineral/gold
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_GOLD_WALLS)
canSmoothWith = list(SMOOTH_GROUP_GOLD_WALLS)
@@ -247,7 +244,6 @@
base_icon_state = "silver_wall"
mineral = /obj/item/stack/sheet/mineral/silver
walltype = /turf/simulated/wall/mineral/silver
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SILVER_WALLS)
canSmoothWith = list(SMOOTH_GROUP_SILVER_WALLS)
@@ -259,7 +255,6 @@
base_icon_state = "diamond_wall"
mineral = /obj/item/stack/sheet/mineral/diamond
walltype = /turf/simulated/wall/mineral/diamond
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_DIAMOND_WALLS)
canSmoothWith = list(SMOOTH_GROUP_DIAMOND_WALLS)
max_integrity = 800
@@ -273,7 +268,6 @@
base_icon_state = "plasma_wall"
mineral = /obj/item/stack/sheet/mineral/plasma
walltype = /turf/simulated/wall/mineral/plasma
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_PLASMA_WALLS)
canSmoothWith = list(SMOOTH_GROUP_PLASMA_WALLS)
cares_about_temperature = TRUE
@@ -307,7 +301,6 @@
base_icon_state = "abductor_wall"
mineral = /obj/item/stack/sheet/mineral/abductor
walltype = /turf/simulated/wall/mineral/abductor
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS)
canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS)
@@ -320,7 +313,6 @@
base_icon_state = "bananium_wall"
mineral = /obj/item/stack/sheet/mineral/bananium
walltype = /turf/simulated/wall/mineral/bananium
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BANANIUM_WALLS)
canSmoothWith = list(SMOOTH_GROUP_BANANIUM_WALLS)
@@ -332,7 +324,6 @@
base_icon_state = "sandstone_wall"
mineral = /obj/item/stack/sheet/mineral/sandstone
walltype = /turf/simulated/wall/mineral/sandstone
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_SANDSTONE_WALLS)
canSmoothWith = list(SMOOTH_GROUP_SANDSTONE_WALLS)
@@ -344,7 +335,6 @@
base_icon_state = "wood_wall"
mineral = /obj/item/stack/sheet/wood
walltype = /turf/simulated/wall/mineral/wood
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS)
canSmoothWith = list(SMOOTH_GROUP_WOOD_WALLS)
@@ -357,7 +347,6 @@
mineral = /obj/item/stack/rods
mineral_amount = 5
walltype = /turf/simulated/wall/mineral/iron
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_IRON_WALLS)
canSmoothWith = list(SMOOTH_GROUP_IRON_WALLS)
@@ -369,7 +358,6 @@
base_icon_state = "abductor_wall"
mineral = /obj/item/stack/sheet/mineral/abductor
walltype = /turf/simulated/wall/mineral/abductor
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_ABDUCTOR_WALLS)
canSmoothWith = list(SMOOTH_GROUP_ABDUCTOR_WALLS)
@@ -380,7 +368,6 @@
base_icon_state = "plastinum_wall"
mineral = /obj/item/stack/sheet/mineral/titanium
walltype = /turf/simulated/wall/mineral/titanium
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_TITANIUM_WALLS)
canSmoothWith = list(SMOOTH_GROUP_TITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS)
@@ -391,7 +378,6 @@
base_icon_state = "plastitanium_wall"
mineral = /obj/item/stack/sheet/mineral/plastitanium
walltype = /turf/simulated/wall/mineral/plastitanium
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS)
canSmoothWith = list(SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS)
@@ -400,7 +386,6 @@
icon = 'icons/turf/walls/backrooms_wall.dmi'
icon_state = "backrooms_wall-0"
base_icon_state = "backrooms_wall"
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BACKROOMS_WALLS)
canSmoothWith = list(SMOOTH_GROUP_BACKROOMS_WALLS)
@@ -412,7 +397,6 @@
base_icon_state = "clockwork_wall"
resistance_flags = FIRE_PROOF | ACID_PROOF
mineral_amount = 1
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BRASS_WALL)
canSmoothWith = list(SMOOTH_GROUP_BRASS_WALL)
girder_type = /obj/structure/clockwork/wall_gear/displaced
@@ -432,7 +416,6 @@
icon_state = "smoothrocks-0"
base_icon_state = "smoothrocks"
color = COLOR_ANCIENT_ROCK
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_ASTEROID_WALLS)
canSmoothWith = list(SMOOTH_GROUP_ASTEROID_WALLS)
mineral = /obj/item/stack/ore/glass/basalt/ancient
diff --git a/code/game/objects/structures/fence.dm b/code/game/objects/structures/fence.dm
index 657d374800a..6617e4295a0 100644
--- a/code/game/objects/structures/fence.dm
+++ b/code/game/objects/structures/fence.dm
@@ -191,7 +191,6 @@
/obj/structure/fence/door/opened
icon_state = "door_opened"
open = TRUE
- density = TRUE
/obj/structure/fence/door/attack_hand(mob/user, list/modifiers)
shock(user, 70)
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index b3eabd256af..6c34a2c0ad1 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -26,7 +26,6 @@
/obj/structure/flora/tree/pine/xmas
name = "xmas tree"
- icon = 'icons/obj/flora/pinetrees.dmi'
icon_state = "pine_c"
/obj/structure/flora/tree/dead
@@ -47,7 +46,6 @@
icon_state = pick("palm1","palm2")
/obj/structure/flora/tree/jungle
- name = "tree"
icon_state = "tree"
desc = "It's seriously hampering your view of the jungle."
icon = 'icons/obj/flora/jungletrees.dmi'
@@ -258,11 +256,9 @@
desc = "Some greenery, how nice."
icon = 'icons/obj/flora/plants.dmi'
icon_state = "random-medium"
- anchored = FALSE
layer = ABOVE_MOB_LAYER
force = 10
throwforce = 13
- throw_speed = 2
throw_range = 4
/// Variable to track plant overlay on mob for later removal
var/mutable_appearance/mob_overlay
@@ -379,8 +375,6 @@
//Medium Plants
/obj/item/kirbyplants/medium
- name = "potted plant"
- icon_state = "random-medium"
desc = "An understated houseplant. In enclosed starships and space stations, a bit of greenery is good for morale."
w_class = WEIGHT_CLASS_BULKY
hideable = TRUE
@@ -411,7 +405,6 @@
/obj/item/kirbyplants/small
name = "small potted plant"
icon_state = "random-small"
- w_class = WEIGHT_CLASS_NORMAL
desc = "A small potted houseplant, for setting on tables and shelves."
/obj/item/kirbyplants/small/Initialize(mapload)
@@ -491,7 +484,6 @@
name = "corn stalk"
icon = 'icons/obj/flora/plants.dmi'
icon_state = "cornstalk1"
- anchored = FALSE
layer = 5
/obj/structure/flora/corn_stalk/alt_1
@@ -586,7 +578,6 @@
icon_state = "rock"
desc = "A pile of rocks."
icon = 'icons/obj/flora/jungleflora.dmi'
- density = FALSE
/obj/structure/flora/rock/jungle/Initialize(mapload)
. = ..()
@@ -620,11 +611,9 @@
AddComponent(/datum/component/largetransparency, 0, 0, 0, 0)
/obj/structure/flora/rock/pile/largejungle
- name = "rocks"
icon_state = "rocks1"
base_icon_state = "rocks"
icon = 'icons/obj/flora/largejungleflora.dmi'
- density = FALSE
pixel_x = -16
pixel_y = -16
diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm
index 53d720aa5fd..a703b4c4663 100644
--- a/code/game/objects/structures/fluff.dm
+++ b/code/game/objects/structures/fluff.dm
@@ -6,8 +6,6 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "minibar"
anchored = TRUE
- density = FALSE
- opacity = FALSE
var/deconstructible = TRUE
/obj/structure/fluff/wrench_act(mob/living/user, obj/item/I)
@@ -74,7 +72,6 @@
name = "Miracle"
icon = 'icons/obj/hand_of_god_structures.dmi'
icon_state = null
- anchored = TRUE
density = TRUE
/obj/structure/fluff/divine/nexus
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index fece1842f02..89819bbed7f 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -1,7 +1,6 @@
/obj/structure/grille
desc = "A flimsy framework of metal rods."
name = "grille"
- icon = 'icons/obj/structures.dmi'
icon_state = "grille"
density = TRUE
anchored = TRUE
@@ -11,7 +10,6 @@
layer = BELOW_OBJ_LAYER
level = 3
armor = list(MELEE = 50, BULLET = 70, LASER = 70, ENERGY = 100, BOMB = 10, RAD = 100, FIRE = 0, ACID = 0)
- max_integrity = 300
integrity_failure = 100
cares_about_temperature = TRUE
rad_insulation_beta = RAD_BETA_BLOCKER
diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm
index 692510e8cec..ee55b07cd7d 100644
--- a/code/game/objects/structures/guillotine.dm
+++ b/code/game/objects/structures/guillotine.dm
@@ -19,7 +19,6 @@
icon_state = "guillotine_raised"
can_buckle = TRUE
anchored = TRUE
- density = FALSE
buckle_lying = FALSE
layer = ABOVE_MOB_LAYER
var/blade_status = GUILLOTINE_BLADE_RAISED
diff --git a/code/game/objects/structures/holosigns.dm b/code/game/objects/structures/holosigns.dm
index 21a3094c166..2a4797e5d73 100644
--- a/code/game/objects/structures/holosigns.dm
+++ b/code/game/objects/structures/holosigns.dm
@@ -78,7 +78,6 @@
icon_state = "holo_firelock"
density = FALSE
layer = ABOVE_MOB_LAYER
- anchored = TRUE
alpha = 150
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
rad_insulation_beta = RAD_LIGHT_INSULATION
@@ -103,7 +102,6 @@
/obj/structure/holosign/barrier/cyborg
name = "Energy Field"
desc = "A fragile energy field that blocks movement. Excels at blocking lethal projectiles."
- density = TRUE
max_integrity = 10
allow_walk = FALSE
diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm
index d8e4e975453..81d51d6b53b 100644
--- a/code/game/objects/structures/inflatable.dm
+++ b/code/game/objects/structures/inflatable.dm
@@ -3,7 +3,6 @@
desc = "A folded membrane which rapidly expands into a large cubical shape on activation."
icon = 'icons/obj/inflatable.dmi'
icon_state = "folded_wall"
- w_class = WEIGHT_CLASS_NORMAL
/obj/item/inflatable/examine(mob/user)
. = ..()
@@ -22,7 +21,6 @@
desc = "An inflated membrane. Do not puncture."
density = TRUE
anchored = TRUE
- opacity = FALSE
max_integrity = 50
icon = 'icons/obj/inflatable.dmi'
icon_state = "wall"
@@ -85,7 +83,6 @@
/obj/item/inflatable/door
name = "inflatable door"
desc = "A folded membrane which rapidly expands into a simple door on activation."
- icon = 'icons/obj/inflatable.dmi'
icon_state = "folded_door"
/obj/item/inflatable/door/attack_self__legacy__attackchain(mob/user)
@@ -162,7 +159,6 @@
/obj/item/inflatable/torn
name = "torn inflatable wall"
desc = "A folded membrane which rapidly expands into a large cubical shape on activation. It is too torn to be usable."
- icon = 'icons/obj/inflatable.dmi'
icon_state = "folded_wall_torn"
/obj/item/inflatable/torn/attack_self__legacy__attackchain(mob/user)
@@ -172,7 +168,6 @@
/obj/item/inflatable/door/torn
name = "torn inflatable door"
desc = "A folded membrane which rapidly expands into a simple door on activation. It is too torn to be usable."
- icon = 'icons/obj/inflatable.dmi'
icon_state = "folded_door_torn"
/obj/item/inflatable/door/torn/attack_self__legacy__attackchain(mob/user)
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index dff605b1aa0..cd01da1686e 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -5,7 +5,6 @@
desc = "This is the alpha and omega of sanitation."
icon = 'icons/obj/janitor.dmi'
icon_state = "cart"
- anchored = FALSE
density = TRUE
face_while_pulling = FALSE
container_type = OPENCONTAINER
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index 5038f64fabb..2abb32aadbf 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/smooth_structures/lattice.dmi'
icon_state = "lattice-255"
base_icon_state = "lattice"
- density = FALSE
anchored = TRUE
armor = list(MELEE = 50, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 80, ACID = 50)
max_integrity = 50
@@ -62,7 +61,6 @@
icon_state = "catwalk-0"
base_icon_state = "catwalk"
number_of_rods = 2
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_CATWALK, SMOOTH_GROUP_LATTICE, SMOOTH_GROUP_FLOOR)
canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_CATWALK)
diff --git a/code/game/objects/structures/lavaland/billboard.dm b/code/game/objects/structures/lavaland/billboard.dm
index 04d5a703ba6..71b2b1f7745 100644
--- a/code/game/objects/structures/lavaland/billboard.dm
+++ b/code/game/objects/structures/lavaland/billboard.dm
@@ -3,7 +3,6 @@
icon = 'icons/obj/lavaland/billboard.dmi'
icon_state = "billboard"
bound_width = 64
- bound_height = 32
pixel_x = -2
anchored = TRUE
density = TRUE
@@ -11,7 +10,6 @@
armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 100, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
resistance_flags = LAVA_PROOF | FIRE_PROOF
layer = EDGED_TURF_LAYER
- blocks_emissive = FALSE
var/static/list/billboard_overlay = list("chasmland", "incompatible", "feed", "warm", "adventure", "plasmaland", "gate", "gate2", "ufo", "notfriendly", "gps", "service", "protection", "diamonds", "step", "paradise", "hell")
/obj/structure/lavaland_billboard/Initialize(mapload)
diff --git a/code/game/objects/structures/lavaland/ladder.dm b/code/game/objects/structures/lavaland/ladder.dm
index 3f97db6e9e7..0c55e245a3b 100644
--- a/code/game/objects/structures/lavaland/ladder.dm
+++ b/code/game/objects/structures/lavaland/ladder.dm
@@ -1,6 +1,5 @@
/obj/structure/ladder
name = "shattered ladder"
desc = "The shattered remnants of a ladder hanging over the pitch-black chasm, providing no safe route to the abyss beneath. Its fractured rungs suggest an inevitable plunge, as if the remainder might soon join the void."
- icon = 'icons/obj/structures.dmi'
icon_state = "ladder"
anchored = TRUE
diff --git a/code/game/objects/structures/lavaland/necropolis_tendril.dm b/code/game/objects/structures/lavaland/necropolis_tendril.dm
index dfe5dc3f78e..1aa6aa958d4 100644
--- a/code/game/objects/structures/lavaland/necropolis_tendril.dm
+++ b/code/game/objects/structures/lavaland/necropolis_tendril.dm
@@ -12,7 +12,6 @@
mob_types = list(/mob/living/simple_animal/hostile/asteroid/basilisk/watcher/tendril)
move_resist = INFINITY // just killing it tears a massive hole in the ground, let's not move it
- anchored = TRUE
resistance_flags = FIRE_PROOF | LAVA_PROOF
var/obj/effect/light_emitter/tendril/emitted_light
@@ -69,7 +68,6 @@ GLOBAL_LIST_EMPTY(tendrils)
layer = TABLE_LAYER
icon = 'icons/mob/nest.dmi'
icon_state = "tendril"
- anchored = TRUE
density = TRUE
var/obj/effect/light_emitter/tendril/emitted_light
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index a30e41f0991..5ae9bdab683 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -212,9 +212,7 @@
open_sound = 'sound/effects/doorcreaky.ogg'
close_sound = 'sound/effects/doorcreaky.ogg'
sheetType = /obj/item/stack/sheet/wood
- hardness = 1
resistance_flags = FLAMMABLE
- max_integrity = 200
rad_insulation_beta = RAD_VERY_LIGHT_INSULATION
/obj/structure/mineral_door/wood/Initialize(mapload)
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index c3628f130d6..eeea74eaeb6 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -4,7 +4,6 @@
desc = "Mirror mirror on the wall, who's the most robust of them all?"
icon = 'icons/obj/watercloset.dmi'
icon_state = "mirror"
- density = FALSE
anchored = TRUE
max_integrity = 200
integrity_failure = 100
diff --git a/code/game/objects/structures/misc_structures.dm b/code/game/objects/structures/misc_structures.dm
index ae2ad164de0..985edbd07de 100644
--- a/code/game/objects/structures/misc_structures.dm
+++ b/code/game/objects/structures/misc_structures.dm
@@ -10,7 +10,6 @@
icon = 'icons/obj/stationobjs.dmi'
icon_state = "signpost"
anchored = TRUE
- density = FALSE
new_attack_chain = TRUE
var/writing = ""
@@ -84,7 +83,6 @@
icon = 'icons/obj/ninjaobjects.dmi'
icon_state = "teleconsole"
anchored = TRUE
- density = FALSE
/obj/structure/ninjatele/attack_hand(mob/user as mob)
if(user.mind.special_role=="Ninja")
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 465bbc0731c..e52e0ab9a36 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -590,8 +590,6 @@ GLOBAL_LIST_EMPTY(crematoriums)
icon = 'icons/obj/power.dmi'
icon_state = "crema_switch"
resistance_flags = INDESTRUCTIBLE // could use a more elegant solution like being able to be rebuilt, broken and repaired, or by directly attaching the switch to the crematorium
- power_channel = PW_CHANNEL_EQUIPMENT
- power_state = IDLE_POWER_USE
idle_power_consumption = 100
active_power_consumption = 5000
anchored = TRUE
diff --git a/code/game/objects/structures/nest.dm b/code/game/objects/structures/nest.dm
index fa0759b702a..891d78046b5 100644
--- a/code/game/objects/structures/nest.dm
+++ b/code/game/objects/structures/nest.dm
@@ -15,7 +15,6 @@
move_resist = INFINITY
anchored = TRUE
- density = FALSE
var/faction = list("hostile") // If you spawn auto-attacking mobs, make sure that their faction and the nest's is the same
var/spawn_byproduct = list(/obj/item/stack/ore/glass, /obj/item/stack/ore/iron) // When mobs spawn, these items also spawn on top of the tunnel
diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm
index 3100a070ebf..c7edc835230 100644
--- a/code/game/objects/structures/noticeboard.dm
+++ b/code/game/objects/structures/noticeboard.dm
@@ -16,7 +16,6 @@
desc = "A board for pinning important notices upon."
icon = 'icons/obj/stationobjs.dmi'
icon_state = "noticeboard-5"
- density = FALSE
anchored = TRUE
max_integrity = 150
var/notices = 0
diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm
index f4f3d88ca2b..843b38e9ace 100644
--- a/code/game/objects/structures/plasticflaps.dm
+++ b/code/game/objects/structures/plasticflaps.dm
@@ -3,7 +3,6 @@
desc = "Completely impassable - or are they?"
icon = 'icons/obj/stationobjs.dmi'
icon_state = "plasticflaps"
- density = FALSE
anchored = TRUE
layer = 4
armor = list(melee = 100, bullet = 80, laser = 80, energy = 100, bomb = 50, rad = 100, fire = 50, acid = 50)
diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm
index 80d4e698282..889c6a970a1 100644
--- a/code/game/objects/structures/reflector.dm
+++ b/code/game/objects/structures/reflector.dm
@@ -3,10 +3,8 @@
icon = 'icons/obj/stock_parts.dmi'
icon_state = "box_0"
desc = "A frame to create a reflector.\nUse 5 sheets of glass to create a 1 way reflector.\nUse 10 sheets of reinforced glass to create a 2 way reflector.\nUse 1 diamond to create a reflector cube."
- anchored = FALSE
density = TRUE
max_integrity = 50
- layer = 3
var/finished = FALSE
var/obj/item/stack/sheet/build_stack_type
var/build_stack_amount
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 9ec0494929d..106181499c5 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -20,7 +20,6 @@ GLOBAL_LIST_EMPTY(safes)
/obj/structure/safe
name = "safe"
desc = "A huge chunk of metal with a dial embedded in it. Fine print on the dial reads \"Scarborough Arms tumbler safe, guaranteed thermite resistant, explosion resistant, and assistant resistant.\""
- icon = 'icons/obj/structures.dmi'
icon_state = "safe"
anchored = TRUE
density = TRUE
diff --git a/code/game/objects/structures/shelves.dm b/code/game/objects/structures/shelves.dm
index 13528a723b1..367ee254ed6 100644
--- a/code/game/objects/structures/shelves.dm
+++ b/code/game/objects/structures/shelves.dm
@@ -120,7 +120,6 @@ GLOBAL_LIST_INIT(shelf_colors, list("basic", "sci", "sup", "serv", "med", "sec",
/obj/structure/gunrack
name = "gun rack"
desc = "A rack for stowing firearms."
- icon = 'icons/obj/structures.dmi'
icon_state = "gunrack"
layer = TABLE_LAYER
density = TRUE
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index ba84197cecb..2fe3bf74e08 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -1,8 +1,6 @@
/obj/structure/sign
icon = 'icons/obj/decals.dmi'
anchored = TRUE
- opacity = FALSE
- density = FALSE
layer = NOT_HIGH_OBJ_LAYER
max_integrity = 100
armor = list(MELEE = 50, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
@@ -56,7 +54,6 @@
name = "sign"
desc = ""
icon = 'icons/obj/decals.dmi'
- w_class = WEIGHT_CLASS_NORMAL
resistance_flags = FLAMMABLE
var/sign_state = ""
@@ -383,8 +380,6 @@
icon_state = "explosives"
/obj/structure/sign/explosives/alt
- name = "\improper HIGH EXPLOSIVES"
- desc = "A warning sign which reads 'HIGH EXPLOSIVES'."
icon_state = "explosives2"
/obj/structure/sign/magboots
diff --git a/code/game/objects/structures/snow.dm b/code/game/objects/structures/snow.dm
index ff10a2108d5..06a3abc50ab 100644
--- a/code/game/objects/structures/snow.dm
+++ b/code/game/objects/structures/snow.dm
@@ -2,7 +2,6 @@
name = "snow"
desc = "A crunchy layer of freshly fallen snow."
anchored = TRUE
- density = FALSE
layer = TURF_LAYER
plane = FLOOR_PLANE
icon = 'icons/turf/snow.dmi'
diff --git a/code/game/objects/structures/spirit_board.dm b/code/game/objects/structures/spirit_board.dm
index b1e061569f9..dc5a16a6d70 100644
--- a/code/game/objects/structures/spirit_board.dm
+++ b/code/game/objects/structures/spirit_board.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/objects.dmi'
icon_state = "spirit_board"
density = TRUE
- anchored = FALSE
var/used = FALSE
var/cooldown = 0
var/planchette = "A"
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 863715050a3..0de8b0cee74 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/statue.dmi'
icon_state = ""
density = TRUE
- anchored = FALSE
max_integrity = 100
var/oreAmount = 5
var/material_drop_type = /obj/item/stack/sheet/metal
@@ -378,7 +377,6 @@
return ..()
/obj/structure/statue/cyberiad/center
- icon_state = "center"
density = FALSE
layer = ABOVE_ALL_MOB_LAYER
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index c806af71505..b77664d5ee3 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -14,7 +14,6 @@
desc = "This is used to lie in, sleep in or strap on."
icon = 'icons/obj/objects.dmi'
icon_state = "bed"
- dir = SOUTH
can_buckle = TRUE
anchored = TRUE
buckle_lying = TRUE
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index 84bbbb17f4e..1b6f0b0b026 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -4,14 +4,11 @@
desc = "You sit in this. Either by will or force."
icon = 'icons/obj/chairs.dmi'
icon_state = "chair"
- layer = OBJ_LAYER
can_buckle = TRUE
buckle_lying = FALSE // you sit in a chair, not lay
anchored = TRUE
- resistance_flags = NONE
max_integrity = 250
integrity_failure = 25
- buckle_offset = 0
face_while_pulling = FALSE
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 1
@@ -143,7 +140,6 @@
// Chair types
/obj/structure/chair/light
- name = "chair"
icon_state = "chair_greyscale"
resistance_flags = FLAMMABLE
item_chair = /obj/item/chair/light
@@ -309,7 +305,6 @@
/obj/structure/chair/barber
icon_state = "barber_chair"
- buildstackamount = 1
item_chair = null
// Sofas
@@ -318,9 +313,7 @@
name = "sofa"
icon_state = "sofamiddle"
color = rgb(141,70,0) //this sprite and benches support coloring currently
- anchored = TRUE
item_chair = null
- buildstackamount = 1
var/image/armrest = null
var/colorable = TRUE
@@ -377,7 +370,6 @@
possible_dirs = 8
/obj/structure/chair/sofa/corp
- name = "sofa"
desc = "Soft and cushy."
icon_state = "corp_sofamiddle"
color = null
@@ -413,7 +405,6 @@
desc = "An ornate pew fashioned from brass. It is even less comfortable than a regular pew, but it does radiate a pleasent warmth."
icon_state = "clockwork_pew_middle"
buildstacktype = /obj/item/stack/tile/brass
- buildstackamount = 5
/obj/structure/chair/sofa/pew/clockwork/left
icon_state = "clockwork_pew_left"
@@ -423,7 +414,6 @@
/obj/structure/chair/sofa/bench
name = "bench"
- desc = "You sit in this. Either by will or force."
icon_state = "bench_middle_mapping"
base_icon_state = "bench_middle"
///icon for the cover seat
@@ -556,12 +546,10 @@
/obj/item/chair/stool
name = "stool"
- icon = 'icons/obj/chairs.dmi'
icon_state = "stool_toppled"
item_state = "stool"
force = 8
throwforce = 8
- w_class = WEIGHT_CLASS_HUGE
origin_type = /obj/structure/chair/stool
break_chance = 0 //It's too sturdy.
force_unwielded = 8
@@ -683,7 +671,6 @@
icon_state = "brass_chair"
max_integrity = 150
buildstacktype = /obj/item/stack/tile/brass
- buildstackamount = 1
item_chair = null
var/turns = 0
diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm
index 160e74bbad3..ee8ccf014d0 100644
--- a/code/game/objects/structures/table_frames.dm
+++ b/code/game/objects/structures/table_frames.dm
@@ -12,10 +12,7 @@
/obj/structure/table_frame
name = "table frame"
desc = "Four metal legs with four framing rods for a table. You could easily pass through this."
- icon = 'icons/obj/structures.dmi'
icon_state = "table_frame"
- density = FALSE
- anchored = FALSE
layer = PROJECTILE_HIT_THRESHHOLD_LAYER
max_integrity = 100
///The resource dropped when the table frame is destroyed or deconstructed
@@ -109,7 +106,6 @@
desc = "Four wooden legs with four framing wooden rods for a wooden table. You could easily pass through this."
icon_state = "wood_frame"
framestack = /obj/item/stack/sheet/wood
- framestackamount = 2
resistance_flags = FLAMMABLE
restrict_table_types = list(/obj/item/stack/tile/carpet = /obj/structure/table/wood/poker, /obj/item/stack/sheet/wood = /obj/item/stack/sheet/wood::table_type)
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 013999cbba1..ac0e649cea6 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -806,7 +806,6 @@
framestack = /obj/item/stack/tile/brass
buildstack = /obj/item/stack/tile/brass
framestackamount = 1
- buildstackamount = 1
smoothing_groups = list(SMOOTH_GROUP_BRASS_TABLES) //Don't smooth with SMOOTH_GROUP_TABLES
canSmoothWith = list(SMOOTH_GROUP_BRASS_TABLES)
@@ -1016,7 +1015,6 @@
/obj/item/rack_parts
name = "rack parts"
desc = "Parts of a rack."
- icon = 'icons/obj/items.dmi'
icon_state = "rack_parts"
flags = CONDUCT
materials = list(MAT_METAL=2000)
diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm
index 70df8bf037c..8c9f729d30b 100644
--- a/code/game/objects/structures/transit_tubes/station.dm
+++ b/code/game/objects/structures/transit_tubes/station.dm
@@ -12,7 +12,6 @@
icon = 'icons/obj/pipes/transit_tube_station.dmi'
icon_state = "closed_station0"
base_icon_state = "station0"
- exit_delay = 1
enter_delay = 2
density = TRUE
uninstalled_type = /obj/structure/transit_tube_construction/station
diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm
index b5612911dd1..577d71b93de 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube.dm
@@ -8,7 +8,6 @@
desc = "A pneumatic tube that brings you from here to there."
icon = 'icons/obj/pipes/transit_tube.dmi'
icon_state = "straight"
- density = FALSE
layer = 3.1
anchored = TRUE
var/list/tube_dirs = null
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
index 0878ca196be..3f2aadae9f5 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_construction.dm
@@ -1,8 +1,6 @@
/obj/structure/transit_tube_construction
name = "transit tube segment"
desc = "An uninstalled piece of a transit tube network."
- anchored = FALSE
- density = FALSE
icon = 'icons/obj/pipes/transit_tube_rpd.dmi'
@@ -140,4 +138,3 @@
installed_type = /obj/structure/transit_tube/station/dispenser
base_icon_state = "transit_dispenser_station"
icon_state = "transit_dispenser_station"
- is_station = TRUE
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
index db2fdf55145..29a9b47f636 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
@@ -280,8 +280,6 @@
/obj/structure/transit_tube_pod/dispensed
name = "temporary transit tube pod"
desc = "Gets you from here to there, and no further."
- icon_state = "pod"
- occupied_icon_state = "pod_occupied"
/obj/structure/transit_tube_pod/dispensed/outside_tube()
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 10c37f843f3..69d9ad92e20 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -5,7 +5,6 @@
desc = "The HT-451, a torque rotation-based, waste disposal unit for small matter. This one seems remarkably clean."
icon = 'icons/obj/watercloset.dmi'
icon_state = "toilet00"
- density = FALSE
anchored = TRUE
var/open = FALSE //if the lid is up
var/cistern = FALSE //if the cistern bit is open
@@ -237,7 +236,6 @@ MAPPING_DIRECTIONAL_HELPERS_CUSTOM(/obj/structure/toilet, 8, -8, 0, 0)
desc = "The HU-452, an experimental urinal."
icon = 'icons/obj/watercloset.dmi'
icon_state = "urinal"
- density = FALSE
anchored = TRUE
new_attack_chain = TRUE
@@ -301,7 +299,6 @@ MAPPING_DIRECTIONAL_HELPERS_CUSTOM(/obj/structure/toilet, 8, -8, 0, 0)
desc = "The HS-451. Installed in the 2550s by the Nanotrasen Hygiene Division."
icon = 'icons/obj/watercloset.dmi'
icon_state = "shower"
- density = FALSE
anchored = TRUE
power_state = NO_POWER_USE
///Is the shower on or off?
@@ -310,7 +307,6 @@ MAPPING_DIRECTIONAL_HELPERS_CUSTOM(/obj/structure/toilet, 8, -8, 0, 0)
var/current_temperature = SHOWER_NORMAL
///What sound will be played on loop when the shower is on and pouring water.
var/datum/looping_sound/showering/soundloop
- new_attack_chain = TRUE
MAPPING_DIRECTIONAL_HELPERS_CUSTOM(/obj/machinery/shower, 16, -5, 0, 0)
@@ -351,7 +347,6 @@ MAPPING_DIRECTIONAL_HELPERS_CUSTOM(/obj/machinery/shower, 16, -5, 0, 0)
icon = 'icons/obj/watercloset.dmi'
icon_state = "mist"
layer = FLY_LAYER
- anchored = TRUE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/obj/machinery/shower/attack_hand(mob/M)
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 23ab76e6655..9177012a378 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -16,10 +16,7 @@
name = "windoor assembly"
icon_state = "l_windoor_assembly01"
desc = "A small glass and wire assembly for windoors."
- anchored = FALSE
- density = FALSE
dir = NORTH
- max_integrity = 300
var/ini_dir
var/obj/item/airlock_electronics/electronics
var/created_name
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 549440fc004..22f2d6ffe88 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -8,7 +8,6 @@
anchored = TRUE
flags = ON_BORDER
flags_2 = RAD_PROTECT_CONTENTS_2
- flags_ricochet = RICOCHET_HARD
receive_ricochet_chance_mod = 0.5
can_be_unanchored = TRUE
max_integrity = 25
@@ -546,7 +545,6 @@
/obj/structure/window/reinforced/tinted/frosted
name = "frosted window"
desc = "It looks rather strong and frosted over. Looks like it might take a few less hits then a normal reinforced window."
- icon_state = "twindow"
max_integrity = 30
/obj/structure/window/reinforced/polarized
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 7e30e15d711..04038366790 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -12,7 +12,6 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama
/turf/simulated/floor
name = "floor"
- icon = 'icons/turf/floors.dmi'
icon_state = "dont_use_this_floor"
plane = FLOOR_PLANE
var/icon_regular_floor = "floor" //used to remember what icon the tile should have by default
diff --git a/code/game/turfs/simulated/floor/asteroid_floors.dm b/code/game/turfs/simulated/floor/asteroid_floors.dm
index 2f7afa8da04..e4619fdfcea 100644
--- a/code/game/turfs/simulated/floor/asteroid_floors.dm
+++ b/code/game/turfs/simulated/floor/asteroid_floors.dm
@@ -10,7 +10,6 @@
footstep = FOOTSTEP_SAND
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
var/environment_type = "asteroid"
var/turf_type = /turf/simulated/floor/plating/asteroid //Because caves do whacky shit to revert to normal
var/floor_variance = 20 //probability floor has a different icon state
@@ -115,7 +114,6 @@
icon_plating = "basalt"
environment_type = "basalt"
floor_variance = 15
- digResult = /obj/item/stack/ore/glass/basalt
/// lava underneath
/turf/simulated/floor/plating/asteroid/basalt/lava
@@ -216,7 +214,6 @@
qdel(src)
/turf/simulated/floor/plating/asteroid/snow
- gender = PLURAL
name = "snow"
desc = "Looks cold."
icon = 'icons/turf/snow.dmi'
diff --git a/code/game/turfs/simulated/floor/chasm.dm b/code/game/turfs/simulated/floor/chasm.dm
index 83157e84c9f..08aa0869352 100644
--- a/code/game/turfs/simulated/floor/chasm.dm
+++ b/code/game/turfs/simulated/floor/chasm.dm
@@ -278,7 +278,6 @@
/obj/effect/abstract/chasm_storage
name = "chasm depths"
desc = "The bottom of a hole. You shouldn't be able to interact with this."
- anchored = TRUE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
/obj/effect/abstract/chasm_storage/Entered(atom/movable/arrived)
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index bbfac4d4546..21e3ad6acae 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -4,7 +4,6 @@
footstep = FOOTSTEP_WOOD
barefootstep = FOOTSTEP_WOOD_BAREFOOT
clawfootstep = FOOTSTEP_WOOD_CLAW
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
/turf/simulated/floor/wood/screwdriver_act(mob/user, obj/item/I)
. = TRUE
@@ -77,7 +76,6 @@
footstep = FOOTSTEP_GRASS
barefootstep = FOOTSTEP_GRASS
clawfootstep = FOOTSTEP_GRASS
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
transform = matrix(1, 0, -9, 0, 1, -9) //Yes, these sprites are 50x50px, big grass control the industry
/turf/simulated/floor/grass/get_broken_states()
@@ -133,7 +131,6 @@
footstep = FOOTSTEP_CARPET
barefootstep = FOOTSTEP_CARPET_BAREFOOT
clawfootstep = FOOTSTEP_CARPET_BAREFOOT
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
/turf/simulated/floor/carpet/Initialize(mapload)
. = ..()
@@ -257,7 +254,6 @@
footstep = FOOTSTEP_WOOD
barefootstep = FOOTSTEP_WOOD_BAREFOOT
clawfootstep = FOOTSTEP_WOOD_CLAW
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
/turf/simulated/floor/bamboo/Initialize(mapload)
. = ..()
@@ -317,7 +313,6 @@
icon = 'icons/turf/space.dmi'
icon_state = "0"
floor_tile = /obj/item/stack/tile/fakespace
- smoothing_flags = NONE
plane = PLANE_SPACE
/turf/simulated/floor/fakespace/Initialize(mapload)
diff --git a/code/game/turfs/simulated/floor/indestructible.dm b/code/game/turfs/simulated/floor/indestructible.dm
index 2283079dcc6..9735c67bbcd 100644
--- a/code/game/turfs/simulated/floor/indestructible.dm
+++ b/code/game/turfs/simulated/floor/indestructible.dm
@@ -48,7 +48,6 @@
/turf/simulated/floor/indestructible/necropolis
name = "necropolis floor"
desc = "It's regarding you suspiciously."
- icon = 'icons/turf/floors.dmi'
icon_state = "necro1"
baseturf = /turf/simulated/floor/indestructible/necropolis
oxygen = LAVALAND_OXYGEN
@@ -93,7 +92,6 @@
atmos_environment = null
/turf/simulated/floor/indestructible/hierophant
- name = "floor"
icon = 'icons/turf/floors/hierophant_floor.dmi'
icon_state = "floor"
oxygen = LAVALAND_OXYGEN
diff --git a/code/game/turfs/simulated/floor/lava.dm b/code/game/turfs/simulated/floor/lava.dm
index b26f9db09db..889f95ae1df 100644
--- a/code/game/turfs/simulated/floor/lava.dm
+++ b/code/game/turfs/simulated/floor/lava.dm
@@ -191,7 +191,6 @@
baseturf = /turf/simulated/floor/lava/lava_land_surface/plasma
light_range = 3
- light_power = 0.75
light_color = LIGHT_COLOR_PINK
/turf/simulated/floor/lava/lava_land_surface/plasma/examine(mob/user)
@@ -298,7 +297,6 @@
base_icon_state = "liquidplasma"
baseturf = /turf/simulated/floor/lava/plasma
light_range = 3
- light_power = 0.75
light_color = LIGHT_COLOR_PINK
// special turf for the asteroid core on EmeraldStation
diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm
index 15c0e8665e5..61c5982b4ba 100644
--- a/code/game/turfs/simulated/floor/light_floor.dm
+++ b/code/game/turfs/simulated/floor/light_floor.dm
@@ -1,6 +1,5 @@
/turf/simulated/floor/light
name = "light floor"
- light_range = 0
icon_state = "light_off"
floor_tile = /obj/item/stack/tile/light
/// Are we on
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index 3d010e13cbb..bf96f483584 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -1,7 +1,5 @@
/turf/simulated/floor/vault
- icon = 'icons/turf/floors.dmi'
icon_state = "rockvault"
- smoothing_flags = NONE
/turf/simulated/floor/vault/lavaland_air
oxygen = LAVALAND_OXYGEN
@@ -17,7 +15,6 @@
smoothing_flags = NONE
/turf/simulated/floor/bluegrid
- icon = 'icons/turf/floors.dmi'
icon_state = "bcircuit"
/turf/simulated/floor/bluegrid/telecomms
@@ -29,11 +26,9 @@
name = "server base"
/turf/simulated/floor/greengrid
- icon = 'icons/turf/floors.dmi'
icon_state = "gcircuit"
/turf/simulated/floor/greengrid/airless
- icon_state = "gcircuit"
name = "airless floor"
oxygen = 0
nitrogen = 0
@@ -44,7 +39,6 @@
name = "floor"
/turf/simulated/floor/redgrid
- icon = 'icons/turf/floors.dmi'
icon_state = "rcircuit"
/turf/simulated/floor/beach
@@ -53,7 +47,6 @@
footstep = FOOTSTEP_SAND
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
/turf/simulated/floor/beach/pry_tile(obj/item/C, mob/user, silent = FALSE)
return
@@ -312,7 +305,6 @@
/turf/simulated/floor/backrooms_carpet
name = "backrooms carpet"
desc = "An old, musty carpet. It smells faintly mildewy."
- icon = 'icons/turf/floors.dmi'
icon_state = "backrooms_carpet"
baseturf = /turf/simulated/floor/backrooms_carpet
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index 752eaf28e65..fb35a4c3f0d 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -6,9 +6,6 @@
floor_tile = null
var/unfastened = FALSE
footstep = FOOTSTEP_PLATING
- barefootstep = FOOTSTEP_HARD_BAREFOOT
- clawfootstep = FOOTSTEP_HARD_CLAW
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
smoothing_groups = list(SMOOTH_GROUP_TURF)
real_layer = PLATING_LAYER
@@ -158,7 +155,6 @@
TerraformTurf(baseturf, keep_icon = FALSE)
/turf/simulated/floor/plating/airless
- icon_state = "plating"
name = "airless plating"
oxygen = 0
nitrogen = 0
@@ -182,9 +178,6 @@
heat_capacity = 325000
floor_tile = /obj/item/stack/rods
footstep = FOOTSTEP_PLATING
- barefootstep = FOOTSTEP_HARD_BAREFOOT
- clawfootstep = FOOTSTEP_HARD_CLAW
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
/turf/simulated/floor/engine/break_tile()
return //unbreakable
@@ -335,7 +328,6 @@
/turf/simulated/floor/engine/vacuum
name = "vacuum floor"
- icon_state = "engine"
oxygen = 0
nitrogen = 0
temperature = TCMB
@@ -359,7 +351,6 @@
footstep = FOOTSTEP_SAND
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
/turf/simulated/floor/plating/snow/ex_act(severity)
return
@@ -374,7 +365,6 @@
footstep = FOOTSTEP_SAND
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
/turf/simulated/floor/snow/ex_act(severity)
return
@@ -486,7 +476,6 @@
footstep = FOOTSTEP_SAND
barefootstep = FOOTSTEP_SAND
clawfootstep = FOOTSTEP_SAND
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
var/environment_type = "basalt"
var/turf_type = /turf/simulated/floor/plating/false_asteroid
var/floor_variance = 20 //probability floor has a different icon state
diff --git a/code/game/turfs/simulated/floor/transparent.dm b/code/game/turfs/simulated/floor/transparent.dm
index e22b388cf53..8307228b5c7 100644
--- a/code/game/turfs/simulated/floor/transparent.dm
+++ b/code/game/turfs/simulated/floor/transparent.dm
@@ -4,7 +4,6 @@
icon = 'icons/turf/floors/glass.dmi'
icon_state = "glass-0"
base_icon_state = "glass"
- baseturf = /turf/space
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_GLASS_FLOOR)
canSmoothWith = list(SMOOTH_GROUP_GLASS_FLOOR)
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index 0346141be3d..1128b229074 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -214,7 +214,6 @@
mine_time = 6 SECONDS
color = COLOR_ANCIENT_ROCK
layer = MAP_EDITOR_TURF_LAYER
- real_layer = TURF_LAYER
should_reset_color = FALSE
baseturf = /turf/simulated/floor/plating/asteroid/ancient
@@ -303,8 +302,6 @@
)
/turf/simulated/mineral/random/high_chance/space
- color = COLOR_YELLOW
- mineralChance = 25
mineralSpawnChanceList = list(
/datum/ore/silver = 50,
/datum/ore/plasma = 50,
@@ -367,8 +364,6 @@
)
/turf/simulated/mineral/random/low_chance/space
- color = COLOR_VIOLET
- mineralChance = 6
mineralSpawnChanceList = list(
/datum/ore/iron = 40,
/datum/ore/plasma = 15,
@@ -440,7 +435,4 @@
preset_ore_type = /datum/ore/bananium
/turf/simulated/mineral/volcanic/lava_land_surface
- environment_type = "basalt"
- turf_type = /turf/simulated/floor/plating/asteroid/basalt/lava_land_surface
baseturf = /turf/simulated/floor/lava/mapping_lava
- defer_change = 1
diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm
index d50740d85ae..69e18edfc51 100644
--- a/code/game/turfs/simulated/walls_indestructible.dm
+++ b/code/game/turfs/simulated/walls_indestructible.dm
@@ -1,5 +1,4 @@
/turf/simulated/wall/indestructible
- name = "wall"
desc = "Effectively impervious to conventional methods of destruction."
explosion_block = 50
@@ -67,7 +66,6 @@
icon = 'icons/turf/walls/boss_wall.dmi'
icon_state = "boss_wall-0"
base_icon_state = "boss_wall"
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BOSS_WALLS)
canSmoothWith = list(SMOOTH_GROUP_BOSS_WALLS)
baseturf = /turf/simulated/floor/plating/asteroid/basalt
@@ -76,7 +74,6 @@
opacity = FALSE
/turf/simulated/wall/indestructible/hierophant
- name = "wall"
desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern."
icon = 'icons/turf/walls/hierophant_wall.dmi'
icon_state = "wall"
@@ -104,7 +101,6 @@
icon = 'icons/turf/walls/sandstone_wall.dmi'
icon_state = "sandstone_wall-0"
base_icon_state = "sandstone_wall"
- smoothing_flags = SMOOTH_BITMASK
GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen)
@@ -133,14 +129,12 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen)
icon = 'icons/turf/walls/uranium_wall.dmi'
icon_state = "uranium_wall-0"
base_icon_state = "uranium_wall"
- smoothing_flags = SMOOTH_BITMASK
canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_URANIUM_WALLS)
/turf/simulated/wall/indestructible/wood
icon = 'icons/turf/walls/wood_wall.dmi'
icon_state = "wood_wall-0"
base_icon_state = "wood_wall"
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WOOD_WALLS)
canSmoothWith = list(SMOOTH_GROUP_WOOD_WALLS)
@@ -176,7 +170,6 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen)
icon_state = "fake_window"
base_icon_state = "reinforced_window"
opacity = FALSE
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS) //they are not walls but this lets walls smooth with them
canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_WALLS)
/// Used to define what file the edging sprite is contained within
@@ -220,7 +213,6 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen)
icon_state = "plastitanium_window-0"
base_icon_state = "plastitanium_window"
opacity = FALSE
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_PLASTITANIUM_WALLS)
canSmoothWith = list(SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM, SMOOTH_GROUP_SYNDICATE_WALLS, SMOOTH_GROUP_PLASTITANIUM_WALLS)
@@ -258,7 +250,6 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen)
icon = 'icons/turf/walls/reinforced_wall.dmi'
icon_state = "reinforced_wall-0"
base_icon_state = "reinforced_wall"
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REINFORCED_WALLS)
canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS)
@@ -304,7 +295,6 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen)
/turf/simulated/wall/indestructible/syndicate/no_diagonal
icon_state = "map-shuttle_nd"
- base_icon_state = "plastitanium_wall"
smoothing_flags = SMOOTH_BITMASK
/turf/simulated/wall/mineral/plastitanium/no_smooth
@@ -313,12 +303,10 @@ GLOBAL_DATUM(title_splash, /turf/simulated/wall/indestructible/splashscreen)
smoothing_flags = NONE
/turf/simulated/wall/indestructible/backrooms
- name = "wall"
desc = "A strange wall that looks like cheap wallpaper and drywall."
icon = 'icons/turf/walls/backrooms_wall.dmi'
icon_state = "backrooms_wall-0"
base_icon_state = "backrooms_wall"
explosion_block = 4
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_BACKROOMS_WALLS)
canSmoothWith = list(SMOOTH_GROUP_BACKROOMS_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS)
diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm
index 21c3de2873d..fde37f33e58 100644
--- a/code/game/turfs/simulated/walls_mineral.dm
+++ b/code/game/turfs/simulated/walls_mineral.dm
@@ -2,7 +2,6 @@
name = "mineral wall"
desc = "If you can see this, please make an issue report on GitHub."
icon_state = ""
- smoothing_flags = SMOOTH_BITMASK
canSmoothWith = null
var/last_event = 0
var/active = FALSE
@@ -224,7 +223,6 @@
/turf/simulated/wall/mineral/titanium/overspace
icon_state = "map-overspace"
- smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
fixed_underlay = list("space" = TRUE)
//sub-type to be used for interior shuttle walls
@@ -256,14 +254,10 @@
icon = 'icons/turf/walls/survival_pod_walls.dmi'
icon_state = "survival_pod_walls-0"
base_icon_state = "survival_pod_walls"
- smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
smoothing_groups = list(SMOOTH_GROUP_PLASTITANIUM_WALLS)
canSmoothWith = list(SMOOTH_GROUP_PLASTITANIUM_WALLS, SMOOTH_GROUP_AIRLOCK, SMOOTH_GROUP_SHUTTLE_PARTS)
/turf/simulated/wall/mineral/titanium/survival/nodiagonal
- icon = 'icons/turf/walls/survival_pod_walls.dmi'
- icon_state = "survival_pod_walls-0"
- base_icon_state = "survival_pod_walls"
smoothing_flags = SMOOTH_BITMASK
/turf/simulated/wall/mineral/titanium/survival/pod
@@ -284,7 +278,6 @@
/turf/simulated/wall/mineral/plastitanium/nodiagonal
icon_state = "map-shuttle_nd"
- base_icon_state = "plastitanium_wall"
smoothing_flags = SMOOTH_BITMASK
/turf/simulated/wall/mineral/plastitanium/nosmooth
@@ -294,7 +287,6 @@
/turf/simulated/wall/mineral/plastitanium/overspace
icon_state = "map-overspace"
- smoothing_flags = SMOOTH_BITMASK | SMOOTH_DIAGONAL_CORNERS
fixed_underlay = list("space" = TRUE)
//have to copypaste this code
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index 41a5820d5d7..4d343d72d2e 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -4,7 +4,6 @@
icon = 'icons/turf/walls/cult_wall.dmi'
icon_state = "cult_wall-0"
base_icon_state = "cult_wall"
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_SIMULATED_TURFS, SMOOTH_GROUP_WALLS, SMOOTH_GROUP_CULT_WALLS)
canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_REGULAR_WALLS, SMOOTH_GROUP_REINFORCED_WALLS)
sheet_type = /obj/item/stack/sheet/runed_metal
@@ -49,7 +48,6 @@
hardness = 10
slicing_duration = 80
sheet_type = /obj/item/stack/tile/brass
- sheet_amount = 2
girder_type = /obj/structure/clockwork/wall_gear
var/heated
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BRASS_WALL)
@@ -106,7 +104,6 @@
hardness = 10
heat_resistance = 20000
can_dismantle_with_welder = FALSE
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_BOSS_WALLS)
canSmoothWith = list(SMOOTH_GROUP_BOSS_WALLS)
sheet_type = /obj/item/stack/sheet/runed_metal
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index e7fb5b37b1e..59a8dee1fac 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -4,11 +4,7 @@
icon = 'icons/turf/walls/reinforced_wall.dmi'
icon_state = "reinforced_wall-0"
base_icon_state = "reinforced_wall"
- smoothing_flags = SMOOTH_BITMASK
- opacity = TRUE
- density = TRUE
explosion_block = 2
- rad_insulation_beta = RAD_BETA_BLOCKER
rad_insulation_gamma = RAD_VERY_EXTREME_INSULATION
damage_cap = 600
hardness = 10
diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm
index fd9797795fb..8d50cb011a0 100644
--- a/code/game/turfs/space/transit.dm
+++ b/code/game/turfs/space/transit.dm
@@ -1,7 +1,5 @@
/turf/space/transit
- plane = PLANE_SPACE
icon_state = "black"
- dir = SOUTH
/turf/space/transit/Initialize(mapload)
. = ..()
@@ -10,7 +8,6 @@
/// moving to the north
/turf/space/transit/north
- dir = SOUTH // south because the space tile is scrolling south
/// moving to the south
/turf/space/transit/south
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 6b8978c692b..6753d02a68f 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -34,7 +34,6 @@
var/blocks_air = FALSE
- flags = 0 // TODO, someday move all off the flags here to turf_flags
var/turf_flags = NONE
diff --git a/code/goonstation/modules/power/power_transmission_laser/transmission_laser.dm b/code/goonstation/modules/power/power_transmission_laser/transmission_laser.dm
index 8b4e20c1971..58a6a32f051 100644
--- a/code/goonstation/modules/power/power_transmission_laser/transmission_laser.dm
+++ b/code/goonstation/modules/power/power_transmission_laser/transmission_laser.dm
@@ -14,9 +14,7 @@
max_integrity = 500
density = TRUE
- anchored = TRUE
- pixel_x = 0
pixel_y = -64
// Variables go below here
@@ -84,7 +82,6 @@
dir = NORTH
/obj/machinery/power/transmission_laser/east
- pixel_x = 0
pixel_y = 0
dir = EAST
@@ -508,7 +505,6 @@
name = "Shimmering beam"
icon = 'icons/goonstation/effects/pt_beam.dmi'
icon_state = "ptl_beam"
- anchored = TRUE
/// Used to deal with atoms stepping on us while firing
var/obj/machinery/power/transmission_laser/host
diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm
index 87702960167..9ac3a19a84b 100644
--- a/code/modules/antagonists/_common/antag_spawner.dm
+++ b/code/modules/antagonists/_common/antag_spawner.dm
@@ -94,7 +94,6 @@
//////SYNDICATE BORG
/obj/item/antag_spawner/nuke_ops/borg_tele
name = "syndicate cyborg teleporter"
- desc = "A single-use teleporter designed to quickly reinforce operatives in the field."
var/switch_roles = FALSE
/obj/item/antag_spawner/nuke_ops/borg_tele/assault
@@ -243,7 +242,6 @@
desc = "A magically infused bottle of clown love, distilled from \
countless hugging attacks. Used in funny rituals to attract \
adorable creatures."
- icon = 'icons/obj/wizard.dmi'
icon_state = "vialtickles"
veil_msg = "You sense an adorable presence \
lurking just beyond the veil..."
@@ -255,11 +253,9 @@
desc = "A magically infused bottle of pure darkness, distilled from \
ground up shadowling bones. Used in dark rituals to attract \
dark creatures."
- icon = 'icons/obj/wizard.dmi'
icon_state = "vialshadows"
veil_msg = "You sense a dark presence \
lurking in the shadows..."
- objective_verb = "Kill"
demon_type = /mob/living/simple_animal/demon/shadow
///////////MORPH
diff --git a/code/modules/antagonists/changeling/powers/absorb.dm b/code/modules/antagonists/changeling/powers/absorb.dm
index 728eb1bbba0..1a6c9c5823a 100644
--- a/code/modules/antagonists/changeling/powers/absorb.dm
+++ b/code/modules/antagonists/changeling/powers/absorb.dm
@@ -2,7 +2,6 @@
name = "Absorb DNA"
desc = "Absorb the DNA of our victim. Requires us to strangle them."
button_overlay_icon_state = "absorb_dna"
- chemical_cost = 0
power_type = CHANGELING_INNATE_POWER
req_human = TRUE
diff --git a/code/modules/antagonists/changeling/powers/augmented_eyesight.dm b/code/modules/antagonists/changeling/powers/augmented_eyesight.dm
index e218c99cbd5..61a4c0fd0c7 100644
--- a/code/modules/antagonists/changeling/powers/augmented_eyesight.dm
+++ b/code/modules/antagonists/changeling/powers/augmented_eyesight.dm
@@ -3,9 +3,7 @@
desc = "Creates more light sensing rods in our eyes, allowing our vision to penetrate most blocking objects. Protects our vision from flashes while inactive."
helptext = "Grants us x-ray vision or flash protection. We will become a lot more vulnerable to flash-based devices while x-ray vision is active."
button_overlay_icon_state = "augmented_eyesight"
- chemical_cost = 0
dna_cost = 4
- active = FALSE
power_type = CHANGELING_PURCHASABLE_POWER
category = /datum/changeling_power_category/utility
diff --git a/code/modules/antagonists/changeling/powers/biodegrade.dm b/code/modules/antagonists/changeling/powers/biodegrade.dm
index 63975f29e9e..67bfa926634 100644
--- a/code/modules/antagonists/changeling/powers/biodegrade.dm
+++ b/code/modules/antagonists/changeling/powers/biodegrade.dm
@@ -127,8 +127,6 @@
item_state = null
flags = ABSTRACT | NODROP | DROPDEL
w_class = WEIGHT_CLASS_HUGE
- force = 0
- throwforce = 0
throw_range = 0
throw_speed = 0
var/datum/action/changeling/biodegrade/parent_action
diff --git a/code/modules/antagonists/changeling/powers/mimic_voice.dm b/code/modules/antagonists/changeling/powers/mimic_voice.dm
index c6552a07775..bf478f45dc9 100644
--- a/code/modules/antagonists/changeling/powers/mimic_voice.dm
+++ b/code/modules/antagonists/changeling/powers/mimic_voice.dm
@@ -3,7 +3,6 @@
desc = "We shape our vocal glands to sound like a desired voice."
helptext = "Will turn your voice into the name that you enter."
button_overlay_icon_state = "mimic_voice"
- chemical_cost = 0
dna_cost = 2
req_human = TRUE
power_type = CHANGELING_PURCHASABLE_POWER
diff --git a/code/modules/antagonists/changeling/powers/mutations.dm b/code/modules/antagonists/changeling/powers/mutations.dm
index 755a993a9c7..e13c8667235 100644
--- a/code/modules/antagonists/changeling/powers/mutations.dm
+++ b/code/modules/antagonists/changeling/powers/mutations.dm
@@ -12,7 +12,6 @@
desc = "Go tell a coder if you see this."
helptext = "Yell at coderbus"
chemical_cost = 1000
- power_type = CHANGELING_UNOBTAINABLE_POWER
var/silent = FALSE
var/weapon_type
var/weapon_name_simple
@@ -65,7 +64,6 @@
desc = "Go tell a coder if you see this."
helptext = "Yell at coderbus"
chemical_cost = 1000
- power_type = CHANGELING_UNOBTAINABLE_POWER
var/helmet_type = /obj/item
var/suit_type = /obj/item
var/suit_name_simple = " "
@@ -141,7 +139,6 @@
w_class = WEIGHT_CLASS_HUGE
sharp = TRUE
force = 25
- throwforce = 0 //Just to be on the safe side
throw_range = 0
throw_speed = 0
var/datum/action/changeling/weapon/parent_action
@@ -204,7 +201,6 @@
icon_state = "tentacle"
item_state = "tentacle"
flags = ABSTRACT | NODROP | NOBLUDGEON | DROPDEL
- w_class = WEIGHT_CLASS_HUGE
ammo_type = /obj/item/ammo_casing/magic/tentacle
fire_sound = 'sound/effects/splat.ogg'
force = 0
@@ -278,9 +274,7 @@
/obj/item/projectile/tentacle
name = "tentacle"
icon_state = "tentacle_end"
- pass_flags = PASSTABLE
damage = 0
- damage_type = BRUTE
range = 8
hitsound = 'sound/weapons/thudswoosh.ogg'
reflectability = REFLECTABILITY_NEVER //Let us not reflect this ever. It's not quite a bullet, and a cling should never wrap its tentacle around itself, it controls its body well
diff --git a/code/modules/antagonists/changeling/powers/strained_muscles.dm b/code/modules/antagonists/changeling/powers/strained_muscles.dm
index ffac4bb026a..7da6101062e 100644
--- a/code/modules/antagonists/changeling/powers/strained_muscles.dm
+++ b/code/modules/antagonists/changeling/powers/strained_muscles.dm
@@ -6,7 +6,6 @@
desc = "We evolve the ability to reduce the acid buildup in our muscles, allowing us to move much faster."
helptext = "The strain will use up our chemicals faster over time, and is not sustainable. Can not be used in lesser form."
button_overlay_icon_state = "strained_muscles"
- chemical_cost = 0
dna_cost = 2
req_human = TRUE
power_type = CHANGELING_PURCHASABLE_POWER
diff --git a/code/modules/antagonists/changeling/powers/tiny_prick.dm b/code/modules/antagonists/changeling/powers/tiny_prick.dm
index 985fb92b83b..26462d7dc39 100644
--- a/code/modules/antagonists/changeling/powers/tiny_prick.dm
+++ b/code/modules/antagonists/changeling/powers/tiny_prick.dm
@@ -1,7 +1,6 @@
/datum/action/changeling/sting
name = "Tiny Prick"
desc = "Stabby stabby."
- power_type = CHANGELING_UNOBTAINABLE_POWER
category = /datum/changeling_power_category/stings
var/sting_icon = null
/// A middle click override used to intercept changeling stings performed on a target.
diff --git a/code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm b/code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm
index a757f1034d7..c1cf5561eda 100644
--- a/code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm
+++ b/code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm
@@ -128,7 +128,6 @@
action_icon_state = "pd_cablehop"
upgrade_info = "Double the health of the barrier by reinforcing it with ICE."
category = FLAYER_CATEGORY_DESTROYER
- power_type = FLAYER_UNOBTAINABLE_POWER
base_cost = 100
current_cost = 100
max_level = 2
@@ -182,7 +181,6 @@
icon = 'icons/effects/vampire_effects.dmi'
density = TRUE
anchored = TRUE
- opacity = FALSE
alpha = 200
var/upgraded_armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 50, RAD = 50, FIRE = 50, ACID = 50)
diff --git a/code/modules/antagonists/mind_flayer/powers/flayer_passives.dm b/code/modules/antagonists/mind_flayer/powers/flayer_passives.dm
index a40f554ccec..7d670740e41 100644
--- a/code/modules/antagonists/mind_flayer/powers/flayer_passives.dm
+++ b/code/modules/antagonists/mind_flayer/powers/flayer_passives.dm
@@ -127,7 +127,6 @@
gain_text = "Faraday cage operational."
power_type = FLAYER_PURCHASABLE_POWER
max_level = 2
- base_cost = 30
static_upgrade_increase = 30
/datum/mindflayer_passive/emp_resist/on_apply()
@@ -147,7 +146,6 @@
purchase_text = "Become immune to basic shocks."
gain_text = "The outer layer of our chassis gets slightly thicker."
power_type = FLAYER_PURCHASABLE_POWER
- max_level = 1
/datum/mindflayer_passive/shock_resist/on_apply()
..()
@@ -245,7 +243,6 @@
name = "Reinforced Joints"
purchase_text = "Prevents your limbs from falling off due to damage."
gain_text = "Artificial skeletal structure reinforced."
- max_level = 1
power_type = FLAYER_PURCHASABLE_POWER
base_cost = 50
@@ -260,7 +257,6 @@
name = "Telescopic Eyes"
purchase_text = "Allows you to expand your sight range, as if you were using a scope."
gain_text = "Precise optics control engaged."
- max_level = 1
power_type = FLAYER_PURCHASABLE_POWER
base_cost = 40
var/obj/item/organ/internal/eyes/optical_sensor/user_eyes
@@ -283,7 +279,6 @@
name = "Perfect Symbiosis"
purchase_text = "Become a living siphon that drains victim's energy incredibly quickly."
gain_text = "This vessel serves us well."
- max_level = 1
power_type = FLAYER_PURCHASABLE_POWER
base_cost = 400
stage = FLAYER_CAPSTONE_STAGE
diff --git a/code/modules/antagonists/mind_flayer/powers/flayer_stealth_powers.dm b/code/modules/antagonists/mind_flayer/powers/flayer_stealth_powers.dm
index 17729bd810e..61533ae64a5 100644
--- a/code/modules/antagonists/mind_flayer/powers/flayer_stealth_powers.dm
+++ b/code/modules/antagonists/mind_flayer/powers/flayer_stealth_powers.dm
@@ -9,7 +9,6 @@
action_icon_state = "camera_bug"
base_cost = 50
static_upgrade_increase = 15
- stage = 1
max_level = 4
upgrade_info = "Upgrades increase the amount of computers you can hack by 6."
/// An internal camera bug
@@ -66,7 +65,6 @@
desc = "Allows for the configuration of our vocal modulator to sound like a different person. We can amplify our voice slightly as well."
action_icon = 'icons/obj/clothing/masks.dmi'
action_icon_state = "voice_modulator"
- power_type = FLAYER_UNOBTAINABLE_POWER
category = FLAYER_CATEGORY_INTRUDER
base_cooldown = 1 SECONDS
base_cost = 40
diff --git a/code/modules/antagonists/mind_flayer/powers/flayer_weapon_powers.dm b/code/modules/antagonists/mind_flayer/powers/flayer_weapon_powers.dm
index d209c4d6b9a..0317684765d 100644
--- a/code/modules/antagonists/mind_flayer/powers/flayer_weapon_powers.dm
+++ b/code/modules/antagonists/mind_flayer/powers/flayer_weapon_powers.dm
@@ -1,7 +1,6 @@
/datum/spell/flayer/self/weapon
name = "Create weapon"
desc = "This really shouldn't be here"
- power_type = FLAYER_UNOBTAINABLE_POWER
action_icon = 'icons/mob/robot_items.dmi'
action_icon_state = "lollipop"
base_cooldown = 1 SECONDS // This just handles retracting and deploying the weapon, weapon charge will be fully separate
@@ -154,12 +153,10 @@
name = "Grapple Arm"
range = 10
damage = 15
- icon = 'icons/obj/clothing/modsuit/mod_modules.dmi'
icon_state = "flayer_claw"
chain_icon_state = "flayer_tether"
speed = 3
yank_speed = 2
- reflectability = REFLECTABILITY_PHYSICAL // This lowkey makes no sense but it's also kinda funny
/// The ammo this came from
var/obj/item/ammo_casing/magic/grapple_ammo/ammo
@@ -201,9 +198,7 @@
upgrade_info = ""
action_icon = 'icons/obj/device.dmi'
action_icon_state = "hacktool"
- base_cooldown = 1 SECONDS
category = FLAYER_CATEGORY_INTRUDER
- power_type = FLAYER_UNOBTAINABLE_POWER
weapon_type = /obj/item/door_remote/omni/access_tuner/flayer
/*
@@ -215,7 +210,6 @@
upgrade_info = "Upgrading it allows us to reload the cannon faster. At the third level, we gain an extra magazine slot."
action_icon = 'icons/obj/guns/projectile.dmi'
action_icon_state = "shell_cannon_weapon"
- base_cooldown = 1 SECONDS
category = FLAYER_CATEGORY_DESTROYER
power_type = FLAYER_PURCHASABLE_POWER
base_cost = 50
@@ -242,7 +236,6 @@
flags = NODROP | ABSTRACT
inhand_x_dimension = 32
inhand_y_dimension = 32
- force = 10
mag_type = /obj/item/ammo_box/magazine/internal/shot/flayer
unique_reskin = FALSE
can_sawoff = FALSE
diff --git a/code/modules/antagonists/revolutionary/datum_headrev.dm b/code/modules/antagonists/revolutionary/datum_headrev.dm
index 64e9311226e..8b08eafb7e0 100644
--- a/code/modules/antagonists/revolutionary/datum_headrev.dm
+++ b/code/modules/antagonists/revolutionary/datum_headrev.dm
@@ -2,7 +2,6 @@ RESTRICT_TYPE(/datum/antagonist/rev/head)
/datum/antagonist/rev/head
name = "Head Revolutionary"
- roundend_category = "revs"
antag_hud_name = "hudheadrevolutionary"
converted = FALSE
var/should_equip = TRUE
diff --git a/code/modules/antagonists/traitor/contractor/datums/rep_purchases/rep_purchases.dm b/code/modules/antagonists/traitor/contractor/datums/rep_purchases/rep_purchases.dm
index d53e3b1b822..ddc4ceae919 100644
--- a/code/modules/antagonists/traitor/contractor/datums/rep_purchases/rep_purchases.dm
+++ b/code/modules/antagonists/traitor/contractor/datums/rep_purchases/rep_purchases.dm
@@ -17,7 +17,6 @@
/obj/item/storage/box/syndie_kit/fulton_kit
name = "fulton extraction kit"
- icon_state = "doom_box"
/obj/item/storage/box/syndie_kit/fulton_kit/populate_contents()
new /obj/item/extraction_pack(src)
diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm
index ff789f6059e..99e8cfdb16b 100644
--- a/code/modules/antagonists/traitor/datum_traitor.dm
+++ b/code/modules/antagonists/traitor/datum_traitor.dm
@@ -6,7 +6,6 @@ RESTRICT_TYPE(/datum/antagonist/traitor)
roundend_category = "traitors"
job_rank = ROLE_TRAITOR
special_role = SPECIAL_ROLE_TRAITOR
- give_objectives = TRUE
antag_hud_name = "hudsyndicate"
antag_hud_type = ANTAG_HUD_TRAITOR
clown_gain_text = "Your syndicate training has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself."
diff --git a/code/modules/antagonists/vampire/vamp_datum.dm b/code/modules/antagonists/vampire/vamp_datum.dm
index 1e62f6e8474..4d4fd9f9f5a 100644
--- a/code/modules/antagonists/vampire/vamp_datum.dm
+++ b/code/modules/antagonists/vampire/vamp_datum.dm
@@ -30,7 +30,6 @@ RESTRICT_TYPE(/datum/antagonist/vampire)
/// list of the peoples UIDs that we have drained, and how much blood from each one
var/list/drained_humans = list()
blurb_text_color = COLOR_RED
- blurb_text_outline_width = 0
blurb_r = 255
blurb_g = 221
blurb_b = 138
diff --git a/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm b/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm
index 5207ccf7d97..337ebbd4e0e 100644
--- a/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm
+++ b/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm
@@ -191,7 +191,6 @@
/obj/effect/temp_visual/demonic_snare
icon = 'icons/effects/vampire_effects.dmi'
icon_state = "immobilized"
- duration = 1 SECONDS
/datum/spell/vampire/charge
name = "Charge (30)"
diff --git a/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm b/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm
index 386bdbe6c22..24a51d50fe7 100644
--- a/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm
+++ b/code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm
@@ -166,7 +166,6 @@
/obj/effect/temp_visual/blood_tendril
icon = 'icons/effects/vampire_effects.dmi'
icon_state = "blood_tendril"
- duration = 1 SECONDS
/obj/effect/temp_visual/blood_tendril/long
duration = 2 SECONDS
@@ -233,7 +232,6 @@
icon = 'icons/effects/vampire_effects.dmi'
density = TRUE
anchored = TRUE
- opacity = FALSE
/obj/structure/blood_barrier/Initialize(mapload)
. = ..()
@@ -364,7 +362,6 @@
name = "The Blood Bringers Rite"
desc = "When toggled, everyone around you begins to bleed profusely. You will drain their blood and rejuvenate yourself with it."
gain_desc = "You have gained the ability to rip the very life force out of people and absorb it, healing you."
- base_cooldown = 10 SECONDS
action_icon_state = "blood_bringers_rite"
required_blood = 10
diff --git a/code/modules/antagonists/vampire/vampire_powers/umbrae_powers.dm b/code/modules/antagonists/vampire/vampire_powers/umbrae_powers.dm
index 618ed7a0e88..959edde1e36 100644
--- a/code/modules/antagonists/vampire/vampire_powers/umbrae_powers.dm
+++ b/code/modules/antagonists/vampire/vampire_powers/umbrae_powers.dm
@@ -209,7 +209,6 @@
alpha = 120
color = "#545454"
density = TRUE
- opacity = FALSE
anchored = TRUE
resistance_flags = INDESTRUCTIBLE
@@ -285,7 +284,6 @@
name = "Eternal Darkness"
desc = "When toggled, you shroud the area around you in darkness and slowly lower the body temperature of people nearby. Energy projectiles will dim in its radius."
gain_desc = "You have gained the ability to shroud the area around you in darkness, only the strongest of lights can pierce your unholy powers."
- base_cooldown = 10 SECONDS
action_icon_state = "eternal_darkness"
required_blood = 5
var/shroud_power = -6
diff --git a/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm b/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm
index 21e6b97f5fa..ba7530a63e8 100644
--- a/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm
+++ b/code/modules/antagonists/vampire/vampire_powers/vampire_powers.dm
@@ -277,15 +277,12 @@
/datum/vampire_passive/vision/advanced
gain_desc = "Your vampiric vision now allows you to see everything in the dark!"
- lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
see_in_dark = 3
- vision_flags = SEE_MOBS
/datum/vampire_passive/vision/full
gain_desc = "Your vampiric vision has reached its full strength!"
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
see_in_dark = 6
- vision_flags = SEE_MOBS
/datum/vampire_passive/full
gain_desc = "You have reached your full potential. You are no longer weak to the effects of anything holy."
@@ -293,11 +290,7 @@
/datum/spell/vampire/raise_vampires
name = "Raise Vampires"
desc = "Summons deadly vampires from bluespace."
- base_cooldown = 100
- clothes_req = FALSE
- human_req = TRUE
invocation = "none"
- invocation_type = "none"
cooldown_min = 20
action_icon_state = "revive_thrall"
sound = 'sound/magic/wandodeath.ogg'
diff --git a/code/modules/antagonists/wizard/datum_wizard.dm b/code/modules/antagonists/wizard/datum_wizard.dm
index 252a6f75678..83f74eb4af2 100644
--- a/code/modules/antagonists/wizard/datum_wizard.dm
+++ b/code/modules/antagonists/wizard/datum_wizard.dm
@@ -4,7 +4,6 @@
roundend_category = "wizards"
job_rank = ROLE_WIZARD
special_role = SPECIAL_ROLE_WIZARD
- give_objectives = TRUE
antag_hud_name = "hudwizard"
antag_hud_type = ANTAG_HUD_WIZ
clown_gain_text = "Your new magical powers has allowed you to overcome your clownish nature, allowing you to wield weapons without harming yourself."
diff --git a/code/modules/arcade/arcade_prize.dm b/code/modules/arcade/arcade_prize.dm
index 930cbc424b8..3d85ea6b87f 100644
--- a/code/modules/arcade/arcade_prize.dm
+++ b/code/modules/arcade/arcade_prize.dm
@@ -78,8 +78,6 @@
singular_name = "prize ticket"
icon = 'icons/obj/arcade.dmi'
icon_state = "tickets_1"
- force = 0
- throwforce = 0
throw_speed = 1
throw_range = 1
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/arcade/claw_game.dm b/code/modules/arcade/claw_game.dm
index 8a6106da2cb..6a9d5b87df8 100644
--- a/code/modules/arcade/claw_game.dm
+++ b/code/modules/arcade/claw_game.dm
@@ -3,8 +3,6 @@ GLOBAL_VAR(claw_game_html)
/obj/machinery/economy/arcade/claw
name = "Claw Game"
desc = "One of the most infuriating ways to win a toy."
- icon = 'icons/obj/arcade.dmi'
- icon_state = "clawmachine_1_on"
token_price = 5
window_name = "Claw Game"
var/machine_image = "_1"
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index f3611bd5579..5c49b04af44 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -10,7 +10,6 @@
throw_speed = 3
throw_range = 10
origin_tech = "magnets=1;engineering=1"
- toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
drop_sound = 'sound/items/handling/component_drop.ogg'
pickup_sound = 'sound/items/handling/component_pickup.ogg'
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index 2d601bd5312..4c03b9c1a3d 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -3,8 +3,6 @@
icon = 'icons/obj/tank.dmi'
item_state = "assembly"
throwforce = 5
- w_class = WEIGHT_CLASS_NORMAL
- throw_speed = 2
throw_range = 4
flags = CONDUCT //Copied this from old code, so this may or may not be necessary
var/status = FALSE //FALSE - not readied //TRUE - bomb finished with welder
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index c1ecfb423ee..a9ab72544df 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -211,7 +211,6 @@
var/left = null
var/life_cycles = 0
var/life_cap = 20
- anchored = TRUE
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSFENCE
/obj/effect/beam/i_beam/Initialize(mapload)
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index e4dac71db9b..d396f8d9502 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -3,7 +3,6 @@
desc = "Used for scanning and alerting when someone enters a certain proximity."
icon_state = "prox"
materials = list(MAT_METAL = 800, MAT_GLASS = 200)
- origin_tech = "magnets=1;engineering=1"
secured = FALSE
diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm
index 8ecfa9d1d23..4e4114c66aa 100644
--- a/code/modules/assembly/shock_kit.dm
+++ b/code/modules/assembly/shock_kit.dm
@@ -7,7 +7,6 @@
var/obj/item/electropack/part2 = null
var/status = FALSE
w_class = WEIGHT_CLASS_HUGE
- flags = CONDUCT
/obj/item/assembly/shock_kit/Destroy()
QDEL_NULL(part1)
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index d8f874ac6ed..c4dc03c869a 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -8,7 +8,6 @@ GLOBAL_LIST_EMPTY(remote_signalers)
materials = list(MAT_METAL = 400, MAT_GLASS = 120)
origin_tech = "magnets=1;bluespace=1"
wires = ASSEMBLY_WIRE_RECEIVE | ASSEMBLY_WIRE_PULSE | ASSEMBLY_WIRE_RADIO_PULSE | ASSEMBLY_WIRE_RADIO_RECEIVE
- secured = TRUE
bomb_name = "remote-control bomb"
/// Are we set to receieve a signal?
var/receiving = FALSE
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index ae87e8534b0..98823d60cd3 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -3,7 +3,6 @@
desc = "Used to time things. Works well with contraptions which has to count down. Tick tock."
icon_state = "timer"
materials = list(MAT_METAL=500, MAT_GLASS=50)
- origin_tech = "magnets=1;engineering=1"
secured = FALSE
diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm
index 5db23c7c7e9..12917046f87 100644
--- a/code/modules/assembly/voice.dm
+++ b/code/modules/assembly/voice.dm
@@ -3,7 +3,6 @@
desc = "A small electronic device able to record a voice sample, and send a signal when that sample is repeated."
icon_state = "voice"
materials = list(MAT_METAL = 500, MAT_GLASS = 50)
- origin_tech = "magnets=1;engineering=1"
var/listening = FALSE
var/recorded = null //the activation message
var/recorded_type = 0 // 0 for say, 1 for emote
@@ -63,9 +62,7 @@
/obj/item/assembly/voice/noise
name = "noise sensor"
desc = "A simple noise sensor that triggers on vocalizations other than speech."
- icon_state = "voice"
materials = list(MAT_METAL = 210, MAT_GLASS = 50)
- origin_tech = "magnets=1;engineering=1"
bomb_name = "noise-activated bomb"
/obj/item/assembly/voice/noise/attack_self__legacy__attackchain(mob/user)
diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm
index 54461958b0e..79ab51a4aea 100644
--- a/code/modules/atmospherics/environmental/LINDA_fire.dm
+++ b/code/modules/atmospherics/environmental/LINDA_fire.dm
@@ -21,7 +21,6 @@
//This is the icon for fire on turfs.
/obj/effect/hotspot
- anchored = TRUE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
icon = 'icons/goonstation/effects/fire.dmi'
icon_state = "1"
diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
index 382324a01c2..2ac805842ae 100644
--- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
+++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
@@ -241,7 +241,6 @@
return list(milla_atmos_airtight, milla_superconductivity)
/obj/effect/wind
- anchored = TRUE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
icon = 'icons/effects/tile_effects.dmi'
icon_state = "wind"
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index fec39208378..3c1127ddbcf 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -1184,7 +1184,6 @@ Just an object used in constructing air alarms
w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_METAL = 100, MAT_GLASS = 100)
origin_tech = "engineering=2;programming=1"
- toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
#undef AALARM_PRESET_HUMAN
diff --git a/code/modules/atmospherics/machinery/atmospherics.dm b/code/modules/atmospherics/machinery/atmospherics.dm
index aa1c62b5a0b..44b7f6df360 100644
--- a/code/modules/atmospherics/machinery/atmospherics.dm
+++ b/code/modules/atmospherics/machinery/atmospherics.dm
@@ -11,8 +11,6 @@ Pipelines + Other Objects -> Pipe network
/obj/machinery/atmospherics
anchored = TRUE
resistance_flags = FIRE_PROOF
- max_integrity = 200
- plane = GAME_PLANE
power_state = NO_POWER_USE
power_channel = PW_CHANNEL_ENVIRONMENT
on_blueprints = TRUE
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/binary_atmos_base.dm b/code/modules/atmospherics/machinery/components/binary_devices/binary_atmos_base.dm
index 97dce15d00d..3a2572f5c2a 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/binary_atmos_base.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/binary_atmos_base.dm
@@ -1,5 +1,4 @@
/obj/machinery/atmospherics/binary
- dir = SOUTH
initialize_directions = SOUTH|NORTH
power_state = IDLE_POWER_USE
@@ -15,7 +14,6 @@
var/datum/pipeline/parent1
var/datum/pipeline/parent2
- new_attack_chain = TRUE
/obj/machinery/atmospherics/binary/New()
..()
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
index 51478704541..daf0c47de1f 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
@@ -3,7 +3,6 @@
desc = "A gas circulator pump and heat exchanger. Its input port is on the south side, and its output port is on the north side."
icon = 'icons/obj/atmospherics/circulator.dmi'
icon_state = "circ8-off"
- anchored = TRUE
density = TRUE
can_unwrench = TRUE
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/trinary_base.dm b/code/modules/atmospherics/machinery/components/trinary_devices/trinary_base.dm
index 42161a7751d..40cc65a6072 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/trinary_base.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/trinary_base.dm
@@ -1,5 +1,4 @@
/obj/machinery/atmospherics/trinary
- dir = SOUTH
initialize_directions = SOUTH|NORTH|WEST
power_state = IDLE_POWER_USE
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm b/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm
index dd278a1c80f..5406958439c 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/tvalve.dm
@@ -26,7 +26,6 @@
/obj/machinery/atmospherics/trinary/tvalve/flipped/bypass
icon_state = "map_tvalvem1"
- flipped = TRUE
state = TVALVE_STATE_SIDE
/obj/machinery/atmospherics/trinary/tvalve/update_icon(animation)
@@ -122,7 +121,6 @@
/obj/machinery/atmospherics/trinary/tvalve/digital/flipped/bypass
icon_state = "map_tvalvem1"
- flipped = TRUE
state = TVALVE_STATE_SIDE
/obj/machinery/atmospherics/trinary/tvalve/digital/power_change()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 7e42703cae3..f2ad17cfb28 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -8,9 +8,7 @@
icon = 'icons/obj/cryogenics.dmi'
icon_state = "pod0"
density = TRUE
- anchored = TRUE
layer = ABOVE_WINDOW_LAYER
- plane = GAME_PLANE
interact_offline = TRUE
max_integrity = 350
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, RAD = 100, FIRE = 30, ACID = 30)
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
index 9329f4a46a0..6c9e6a16be5 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
@@ -10,7 +10,6 @@ GLOBAL_LIST_EMPTY(air_injectors)
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF //really helpful in building gas chambers for xenomorphs
can_unwrench = TRUE
- can_unwrench_while_on = TRUE
name = "air injector"
desc = "Has a valve and pump attached to it."
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
index 7edb250a174..7207b6b464a 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
@@ -6,8 +6,6 @@
name = "oxygen generator"
desc = ""
- dir = SOUTH
- initialize_directions = SOUTH
var/oxygen_content = 10
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm
index 2193b03cd1a..f96a1fcb1a9 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm
@@ -22,7 +22,6 @@
/obj/machinery/atmospherics/unary/tank/air
name = "Pressure Tank (Air)"
- icon_state = "air_map"
/obj/machinery/atmospherics/unary/tank/air/Initialize(mapload)
. = ..()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
index 22cb1626853..44ee49cc28a 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
@@ -11,7 +11,6 @@
layer = OBJ_LAYER
idle_power_consumption = 500
- active_power_consumption = 0
var/icon_state_off = "freezer"
var/icon_state_on = "freezer_1"
@@ -218,11 +217,6 @@
investigate_log("was set to [target_temperature] K by [key_name(usr)]", INVESTIGATE_ATMOS)
/obj/machinery/atmospherics/unary/thermomachine/freezer
- icon_state = "freezer"
- icon_state_off = "freezer"
- icon_state_on = "freezer_1"
- icon_state_open = "freezer-o"
- cooling = TRUE
/obj/machinery/atmospherics/unary/thermomachine/freezer/on
on = TRUE
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/unary_base.dm b/code/modules/atmospherics/machinery/components/unary_devices/unary_base.dm
index 99202ade15a..53a6b6c7dd1 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/unary_base.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/unary_base.dm
@@ -1,5 +1,4 @@
/obj/machinery/atmospherics/unary
- dir = SOUTH
initialize_directions = SOUTH
layer = TURF_LAYER+0.1
/// The current air contents of this device
diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm
index c485f4afda2..d17d82032be 100644
--- a/code/modules/atmospherics/machinery/other/meter.dm
+++ b/code/modules/atmospherics/machinery/other/meter.dm
@@ -7,10 +7,8 @@ GLOBAL_LIST_EMPTY(gas_meters)
icon_state = "meterX"
layer = GAS_PIPE_VISIBLE_LAYER + GAS_PUMP_OFFSET
layer_offset = GAS_PUMP_OFFSET
- anchored = TRUE
max_integrity = 150
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, RAD = 100, FIRE = 40, ACID = 0)
- power_channel = PW_CHANNEL_ENVIRONMENT
power_state = IDLE_POWER_USE
idle_power_consumption = 2
active_power_consumption = 5
diff --git a/code/modules/atmospherics/machinery/other/refill_station.dm b/code/modules/atmospherics/machinery/other/refill_station.dm
index e9a942c316d..96615c3e925 100644
--- a/code/modules/atmospherics/machinery/other/refill_station.dm
+++ b/code/modules/atmospherics/machinery/other/refill_station.dm
@@ -5,12 +5,10 @@
name = "refill station"
icon = 'icons/obj/atmos.dmi'
icon_state = "filler_oxygen"
- anchored = TRUE
density = TRUE
resistance_flags = NONE
idle_power_consumption = 1
active_power_consumption = 5
- power_channel = PW_CHANNEL_ENVIRONMENT
/// The desired pressure the refill station should be outputting into a holding tank.
target_pressure = MAX_TARGET_PRESSURE
can_unwrench_while_on = FALSE
diff --git a/code/modules/atmospherics/machinery/pipes/cap.dm b/code/modules/atmospherics/machinery/pipes/cap.dm
index c296b37ddea..2441e257a72 100644
--- a/code/modules/atmospherics/machinery/pipes/cap.dm
+++ b/code/modules/atmospherics/machinery/pipes/cap.dm
@@ -3,11 +3,9 @@
desc = "An endcap for pipes."
icon = 'icons/atmos/pipes.dmi'
icon_state = "cap"
- level = 2
volume = 35
- dir = SOUTH
initialize_directions = SOUTH
var/obj/machinery/atmospherics/node
@@ -80,9 +78,6 @@
update_icon()
/obj/machinery/atmospherics/pipe/cap/visible
- level = 2
- icon_state = "cap"
- plane = GAME_PLANE
layer = GAS_PIPE_VISIBLE_LAYER
/obj/machinery/atmospherics/pipe/cap/visible/scrubbers
@@ -107,10 +102,8 @@
/obj/machinery/atmospherics/pipe/cap/hidden
level = 1
- icon_state = "cap"
alpha = 128
plane = FLOOR_PLANE
- layer = GAS_PIPE_HIDDEN_LAYER
/obj/machinery/atmospherics/pipe/cap/hidden/scrubbers
name = "scrubbers pipe endcap"
diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm
index 7141f44bc06..bebaadce574 100644
--- a/code/modules/atmospherics/machinery/pipes/manifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/manifold.dm
@@ -6,7 +6,6 @@
volume = 105
- dir = SOUTH
initialize_directions = EAST|NORTH|WEST
var/obj/machinery/atmospherics/node1
@@ -150,7 +149,6 @@
/obj/machinery/atmospherics/pipe/manifold/visible
icon_state = "map"
level = 2
- plane = GAME_PLANE
layer = GAS_PIPE_VISIBLE_LAYER
/obj/machinery/atmospherics/pipe/manifold/visible/scrubbers
@@ -203,10 +201,8 @@
/obj/machinery/atmospherics/pipe/manifold/hidden
icon_state = "map"
- level = 1
alpha = 128 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
plane = FLOOR_PLANE
- layer = GAS_PIPE_HIDDEN_LAYER
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers
name="Scrubbers pipe manifold"
diff --git a/code/modules/atmospherics/machinery/pipes/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/manifold4w.dm
index 9205ed2f7bf..a3548087fe3 100644
--- a/code/modules/atmospherics/machinery/pipes/manifold4w.dm
+++ b/code/modules/atmospherics/machinery/pipes/manifold4w.dm
@@ -6,7 +6,6 @@
volume = 140
- dir = SOUTH
initialize_directions = NORTH|SOUTH|EAST|WEST
var/obj/machinery/atmospherics/node1
@@ -160,7 +159,6 @@
/obj/machinery/atmospherics/pipe/manifold4w/visible
icon_state = "map_4way"
level = 2
- plane = GAME_PLANE
layer = GAS_PIPE_VISIBLE_LAYER
/obj/machinery/atmospherics/pipe/manifold4w/visible/scrubbers
@@ -207,10 +205,8 @@
/obj/machinery/atmospherics/pipe/manifold4w/hidden
icon_state = "map_4way"
- level = 1
alpha = 128 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
plane = FLOOR_PLANE
- layer = GAS_PIPE_HIDDEN_LAYER
/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers
name = "4-way scrubbers pipe manifold"
diff --git a/code/modules/atmospherics/machinery/pipes/pipe.dm b/code/modules/atmospherics/machinery/pipes/pipe.dm
index ef39962d7fc..f48345d8439 100644
--- a/code/modules/atmospherics/machinery/pipes/pipe.dm
+++ b/code/modules/atmospherics/machinery/pipes/pipe.dm
@@ -3,7 +3,6 @@
var/datum/pipeline/parent
var/volume = 0
force = 20
- power_state = NO_POWER_USE
can_unwrench = TRUE
damage_deflection = 12
can_be_undertile = TRUE
@@ -11,7 +10,6 @@
//Buckling
can_buckle = TRUE
buckle_requires_restraints = TRUE
- buckle_lying = -1
flags_2 = NO_MALF_EFFECT_2
diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm
index 315048464d4..3df02a323dc 100644
--- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm
+++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple.dm
@@ -7,7 +7,6 @@
volume = 70
- dir = SOUTH
initialize_directions = SOUTH|NORTH
var/obj/machinery/atmospherics/node1
diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_he.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_he.dm
index 510ec482c76..3bb23f77224 100644
--- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_he.dm
+++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_he.dm
@@ -3,7 +3,6 @@
icon_state = "intact"
pipe_icon = "hepipe"
level = 2
- plane = GAME_PLANE
layer = GAS_PIPE_VISIBLE_LAYER
var/initialize_directions_he
var/surface = 2
@@ -95,9 +94,7 @@
/////////////////////////////////
/obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction
icon = 'icons/atmos/junction.dmi'
- icon_state = "intact"
pipe_icon = "hejunction"
- level = 2
minimum_temperature_difference = 300
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm
index 0d2e35022ef..cf5c5752058 100644
--- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm
+++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_hidden.dm
@@ -1,10 +1,8 @@
/obj/machinery/atmospherics/pipe/simple/hidden
icon_state = "intact"
- level = 1
alpha = 128 //set for the benefit of mapping - this is reset to opaque when the pipe is spawned in game
// these are inherited, but it's nice to have them explicit here
plane = FLOOR_PLANE
- layer = GAS_PIPE_HIDDEN_LAYER
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers
name = "Scrubbers pipe"
diff --git a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm
index f7ea34d2489..80bd894c30b 100644
--- a/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm
+++ b/code/modules/atmospherics/machinery/pipes/simple/pipe_simple_visible.dm
@@ -2,7 +2,6 @@
icon_state = "intact"
level = 2
// these are inherited, but it's nice to have them explicit here
- plane = GAME_PLANE
layer = GAS_PIPE_VISIBLE_LAYER
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 00add12da8e..19c95eec056 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -58,7 +58,6 @@ GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new())
density = TRUE
flags = CONDUCT
armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 100, BOMB = 10, RAD = 100, FIRE = 80, ACID = 50)
- max_integrity = 250
integrity_failure = 100
cares_about_temperature = TRUE
@@ -76,7 +75,6 @@ GLOBAL_DATUM_INIT(canister_icon_container, /datum/canister_icons, new())
pressure_resistance = 7 * ONE_ATMOSPHERE
var/temperature_resistance = 1000 + T0C
volume = 1000
- power_state = NO_POWER_USE
interact_offline = TRUE
var/release_log = ""
var/current_pressure_appearance
diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
index 9843b487fad..b76ec8ab689 100644
--- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
+++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
@@ -2,7 +2,6 @@
name = "atmoalter"
anchored = FALSE
layer = BELOW_OBJ_LAYER
- power_state = NO_POWER_USE
max_integrity = 250
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 100, BOMB = 0, RAD = 100, FIRE = 60, ACID = 30)
var/datum/gas_mixture/air_contents = new
diff --git a/code/modules/awaymissions/mission_code/beach.dm b/code/modules/awaymissions/mission_code/beach.dm
index 88f16b4ea6f..7ee25549053 100644
--- a/code/modules/awaymissions/mission_code/beach.dm
+++ b/code/modules/awaymissions/mission_code/beach.dm
@@ -1,11 +1,7 @@
/obj/effect/waterfall
name = "waterfall effect"
- icon = 'icons/effects/effects.dmi'
icon_state = "extinguish"
- opacity = FALSE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
- density = FALSE
- anchored = TRUE
invisibility = 101
var/water_frequency = 15
@@ -29,7 +25,6 @@
/turf/simulated/floor/beach/away
name = "Beach"
- icon = 'icons/misc/beach.dmi'
var/water_overlay_image = null
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
atmos_mode = ATMOS_MODE_EXPOSED_TO_ENVIRONMENT
@@ -47,10 +42,6 @@
icon_state = "desert"
mouse_opacity = MOUSE_OPACITY_ICON
baseturf = /turf/simulated/floor/beach/away/sand
- footstep = FOOTSTEP_SAND
- barefootstep = FOOTSTEP_SAND
- clawfootstep = FOOTSTEP_SAND
- heavyfootstep = FOOTSTEP_GENERIC_HEAVY
/turf/simulated/floor/beach/away/sand/Initialize(mapload)
. = ..() //adds some aesthetic randomness to the beach sand
@@ -118,7 +109,6 @@
oxygen = LAVALAND_OXYGEN
nitrogen = LAVALAND_NITROGEN
temperature = LAVALAND_TEMPERATURE
- atmos_mode = ATMOS_MODE_EXPOSED_TO_ENVIRONMENT
atmos_environment = ENVIRONMENT_LAVALAND
/// for boundary "walls"
@@ -158,7 +148,6 @@
layer = MOB_LAYER + 0.1
smoothing_flags = SMOOTH_BITMASK
canSmoothWith = list(SMOOTH_GROUP_BEACH_WATER)
- anchored = TRUE
/turf/simulated/floor/beach/away/water/drop/dense
density = TRUE
diff --git a/code/modules/awaymissions/mission_code/challenge.dm b/code/modules/awaymissions/mission_code/challenge.dm
index e6d780582a3..c9d4591140d 100644
--- a/code/modules/awaymissions/mission_code/challenge.dm
+++ b/code/modules/awaymissions/mission_code/challenge.dm
@@ -2,12 +2,9 @@
/area/awaymission/challenge
name = "Challenge"
- icon_state = "away"
- report_alerts = FALSE
/area/awaymission/challenge/start
name = "Where Am I?"
- icon_state = "away"
/area/awaymission/challenge/main
name = "\improper Danger Room"
diff --git a/code/modules/awaymissions/mission_code/ghost_role_spawners/golems.dm b/code/modules/awaymissions/mission_code/ghost_role_spawners/golems.dm
index 565b092e285..47bdccd6f8e 100644
--- a/code/modules/awaymissions/mission_code/ghost_role_spawners/golems.dm
+++ b/code/modules/awaymissions/mission_code/ghost_role_spawners/golems.dm
@@ -203,7 +203,6 @@
/obj/effect/mob_spawn/human/alive/golem/adamantine
name = "dust-caked free golem shell"
- desc = "A humanoid shape, empty, lifeless, and full of potential."
assignedrole = "Free Golem"
can_transfer = FALSE
mob_species = /datum/species/golem/adamantine
diff --git a/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation_spawns.dm b/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation_spawns.dm
index 5ccf6295311..df40946e00c 100644
--- a/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation_spawns.dm
+++ b/code/modules/awaymissions/mission_code/ghost_role_spawners/oldstation_spawns.dm
@@ -3,8 +3,6 @@
/obj/effect/mob_spawn/human/alive/old
name = "old cryogenics pod"
desc = "A humming cryo pod. You can barely recognise a security uniform underneath the built up ice. The machine is attempting to wake up its occupant."
- icon = 'icons/obj/cryogenic2.dmi'
- icon_state = "sleeper"
description = "Work as a team with your fellow survivors aboard a ruined, ancient space station."
assignedrole = "Ancient Crew"
allow_gender_pick = TRUE
diff --git a/code/modules/awaymissions/mission_code/ruins/deepstorage.dm b/code/modules/awaymissions/mission_code/ruins/deepstorage.dm
index 0587c247428..72c2aea4f15 100644
--- a/code/modules/awaymissions/mission_code/ruins/deepstorage.dm
+++ b/code/modules/awaymissions/mission_code/ruins/deepstorage.dm
@@ -3,7 +3,6 @@
/mob/living/simple_animal/hostile/megafauna/fleshling
name = "Fleshling"
desc = "A sinister mass of flesh molded into a grotesque shape. Nothing about it looks like the result of natural evolution. It looks agitated and clearly doesn't want you to leave here alive."
- health = 1000
icon = 'icons/mob/fleshling.dmi'
icon_state = "fleshling"
icon_living = "fleshling"
@@ -16,12 +15,9 @@
pixel_x = -16
melee_damage_lower = 20
melee_damage_upper = 20
- wander = TRUE
move_force = MOVE_FORCE_VERY_STRONG
move_resist = MOVE_FORCE_VERY_STRONG
pull_force = MOVE_FORCE_VERY_STRONG
- sentience_type = SENTIENCE_BOSS
- a_intent = INTENT_HARM
deathmessage = "collapses into a pile of gibs. From the looks of it this is the deadest it can get... "
butcher_results = list(/obj/item/regen_mesh)
/// Is the boss charging right now?
@@ -246,7 +242,6 @@
/obj/machinery/deepstorage_teleporter
name = "package teleporter"
desc = "It's tuned to maintain one-way teleportation."
- icon = 'icons/obj/stationobjs.dmi'
icon_state = "controller"
density = TRUE
anchored = TRUE
diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm
index 4a91cb759e8..9cb3a09b3fc 100644
--- a/code/modules/awaymissions/mission_code/ruins/oldstation.dm
+++ b/code/modules/awaymissions/mission_code/ruins/oldstation.dm
@@ -13,7 +13,6 @@
/obj/item/card/id/away/old
name = "A perfectly retrograde identification card"
desc = "A perfectly retrograde identification card. Looks like it could use some flavor."
- icon = 'icons/obj/card.dmi'
icon_state = "retro"
access = list(ACCESS_THETA_STATION)
@@ -66,13 +65,9 @@
/obj/item/clothing/head/helmet/space/void/old
name = "Antique Engineering Void Helmet"
desc = "An old helmet meant for EVA engineering work. Any insignia it had has long since worn away. While old and dusty, it still gets the job done."
- icon_state = "void-red"
- item_state = "void"
/obj/item/clothing/suit/space/void/old
name = "Antique Engineering Void Suit"
- icon_state = "void-red"
- item_state = "void"
desc = "An old softsuit meant for engineering work. Any insignia it had has long since worn away. Age has degraded the suit making it difficult to move around in."
slowdown = 4
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/multitool)
@@ -85,28 +80,21 @@
/obj/item/clothing/suit/armor/vest/old
name = "degrading armor vest"
desc = "Older generation Type 1 armored vest. Due to degradation over time the vest is far less maneuverable to move in."
- icon_state = "armor"
- item_state = "armor"
slowdown = 1
/obj/item/gun/energy/laser/retro/old
name = "degrading L-1 laser gun"
- icon_state = "retro"
desc = "A first-generation lasergun developed by Maiman Photonics. It has a unique rechargable internal cell that cannot be removed. \
Due to degredation over time, the battery cannot hold as much charge as it used to. You really hope someone has developed a better laser gun while you were in cryo."
ammo_type = list(/obj/item/ammo_casing/energy/lasergun/old)
- ammo_x_offset = 3
/obj/item/ammo_casing/energy/lasergun/old
- projectile_type = /obj/item/projectile/beam/laser
e_cost = 200
- select_name = "kill"
/obj/item/gun/energy/e_gun/old
name = "\improper NT-EW-P:01 prototype energy gun"
desc = "A long-lost prototype energy gun developed by Nanotrasen's Theta R&D team. The fire selector has two settings: 'stun', and 'kill'."
icon_state = "protolaser"
- ammo_x_offset = 2
ammo_type = list(/obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/electrode/old)
/obj/item/gun/energy/e_gun/old/examine(mob/user)
@@ -434,7 +422,6 @@
// MARK: ENGINES
//////////////////////////////
/obj/structure/shuttle/engine/large
- name = "engine"
opacity = TRUE
icon = 'icons/obj/2x2.dmi'
icon_state = "large_engine"
@@ -444,7 +431,6 @@
appearance_flags = LONG_GLIDE
/obj/structure/shuttle/engine/huge
- name = "engine"
icon = 'icons/obj/3x3.dmi'
icon_state = "huge_engine"
desc = "An extremely large bluespace engine used to propel extremely large ships."
@@ -460,13 +446,11 @@
/area/ruin/ancientstation
name = "Charlie Station Main Corridor"
icon_state = "green"
- has_gravity = TRUE
/area/ruin/ancientstation/powered
name = "Powered Tile"
icon_state = "teleporter"
requires_power = FALSE
- dynamic_lighting = DYNAMIC_LIGHTING_FORCED
/area/ruin/ancientstation/atmo
name = "Beta Station Atmospherics"
@@ -501,7 +485,6 @@
/area/ruin/ancientstation/thetacorridor
name = "Theta Station Main Corridor"
- icon_state = "green"
/area/ruin/ancientstation/proto
name = "Theta Station Prototype Lab"
diff --git a/code/modules/awaymissions/mission_code/ruins/sieged_lab.dm b/code/modules/awaymissions/mission_code/ruins/sieged_lab.dm
index 07113a93327..289e095e831 100644
--- a/code/modules/awaymissions/mission_code/ruins/sieged_lab.dm
+++ b/code/modules/awaymissions/mission_code/ruins/sieged_lab.dm
@@ -51,7 +51,6 @@
health = 750
maxHealth = 750
rapid_melee = 3
- wander = FALSE
move_force = MOVE_FORCE_DEFAULT
loot = list(/obj/item/organ/internal/cyberimp/arm/razorwire/harbinger)
death_simplemob_representation = /obj/effect/temp_visual/dir_setting/syndicate_harbinger_death
@@ -165,7 +164,6 @@ GLOBAL_LIST_INIT(ruin_sieged_lab_research_loot, list(
/obj/effect/spawner/random/mine
name = "50pc landmine"
- icon = 'icons/effects/random_spawners.dmi'
icon_state = "mine"
loot = list(/obj/effect/mine/sieged_lab)
spawn_loot_chance = 50
diff --git a/code/modules/awaymissions/mission_code/ruins/telecomns.dm b/code/modules/awaymissions/mission_code/ruins/telecomns.dm
index aa608876071..651019383f0 100644
--- a/code/modules/awaymissions/mission_code/ruins/telecomns.dm
+++ b/code/modules/awaymissions/mission_code/ruins/telecomns.dm
@@ -302,7 +302,6 @@ GLOBAL_LIST_EMPTY(telecomms_trap_tank)
desc = "Looks like the cover to a turret. Not deploying, however?"
icon = 'icons/obj/turrets.dmi'
icon_state = "turret_cover"
- layer = /obj/machinery/shieldgen/telecomms::layer + 0.1
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
anchored = TRUE
/// Trap we create on activation
@@ -333,7 +332,6 @@ GLOBAL_LIST_EMPTY(telecomms_trap_tank)
health = 200
maxHealth = 200
faction = list("malf_drone")
- ranged = TRUE
rapid = 2
speed = 0.5
projectiletype = /obj/item/projectile/beam/disabler/weak
@@ -432,7 +430,6 @@ GLOBAL_LIST_EMPTY(telecomms_trap_tank)
/obj/effect/spawner/random/telecomms_core_table
name = "telecomms core table spawner"
- spawn_loot_count = 1
loot = list(
/obj/item/rcd/combat,
/obj/item/gun/medbeam,
@@ -478,7 +475,6 @@ GLOBAL_LIST_EMPTY(telecomms_trap_tank)
anchored = TRUE
layer = HOLOPAD_LAYER
plane = FLOOR_PLANE
- max_integrity = 300
/// Have we been activated? If we have, we do not activate again.
var/activated = FALSE
/// Tied effect to kill when we die.
diff --git a/code/modules/awaymissions/mission_code/shuttle_shadow.dm b/code/modules/awaymissions/mission_code/shuttle_shadow.dm
index 137ac4b611d..7202d8ba027 100644
--- a/code/modules/awaymissions/mission_code/shuttle_shadow.dm
+++ b/code/modules/awaymissions/mission_code/shuttle_shadow.dm
@@ -1,5 +1,4 @@
/obj/machinery/atmospherics/unary/passive_vent/high_volume/shadow
- on = FALSE
/obj/machinery/atmospherics/unary/passive_vent/high_volume/shadow/process_atmos()
if(!on)
@@ -15,7 +14,6 @@
name = "gas filter (Co2 Outlet)"
dir = 1
filter_type = 3
- on = FALSE
target_pressure = 99999
/obj/machinery/atmospherics/trinary/filter/shadow/on_changed_z_level(turf/old_turf, turf/new_turf)
diff --git a/code/modules/awaymissions/mob_spawn.dm b/code/modules/awaymissions/mob_spawn.dm
index 2c25fb0f3b4..1d11ea431da 100644
--- a/code/modules/awaymissions/mob_spawn.dm
+++ b/code/modules/awaymissions/mob_spawn.dm
@@ -9,7 +9,6 @@
/obj/effect/mob_spawn
name = "Unknown"
density = TRUE
- anchored = TRUE
icon = 'icons/effects/blood.dmi'
icon_state = "remains"
var/mob_type
@@ -670,13 +669,10 @@
outfit = /datum/outfit/job/mining/suit
/datum/outfit/job/mining/suit
- name = "Shaft Miner"
back = /obj/item/mod/control/pre_equipped/mining/asteroid
uniform = /obj/item/clothing/under/rank/cargo/miner
gloves = /obj/item/clothing/gloves/fingerless
shoes = /obj/item/clothing/shoes/workboots
- l_ear = /obj/item/radio/headset/headset_cargo/mining
- id = /obj/item/card/id/shaftminer
l_pocket = /obj/item/reagent_containers/patch/styptic
r_pocket = /obj/item/flashlight/seclite
diff --git a/code/modules/client/preference/loadout/loadout_donor.dm b/code/modules/client/preference/loadout/loadout_donor.dm
index b2d6184a167..7210485c8c6 100644
--- a/code/modules/client/preference/loadout/loadout_donor.dm
+++ b/code/modules/client/preference/loadout/loadout_donor.dm
@@ -80,14 +80,12 @@
display_name = "Blue flame decal welding helmet"
path = /obj/item/clothing/head/welding/flamedecal/blue
allowed_roles = list("Chief Engineer", "Station Engineer", "Life Support Specialist", "Roboticist")
- donator_tier = 2
cost = 2
/datum/gear/donor/welding_white
display_name = "White decal welding helmet"
path = /obj/item/clothing/head/welding/white
allowed_roles = list("Chief Engineer", "Station Engineer", "Life Support Specialist", "Roboticist")
- donator_tier = 2
cost = 2
/datum/gear/donor/fawkes
diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm
index 004b8eca3cf..ae4751ab3eb 100644
--- a/code/modules/client/preference/loadout/loadout_general.dm
+++ b/code/modules/client/preference/loadout/loadout_general.dm
@@ -214,7 +214,6 @@
/datum/gear/mug/department
main_typepath = /datum/gear/mug/department
- sort_category = "Mugs"
subtype_selection_cost = FALSE
/datum/gear/mug/department/eng
diff --git a/code/modules/client/preference/loadout/loadout_racial.dm b/code/modules/client/preference/loadout/loadout_racial.dm
index aaf337ece8c..d84f6978c1a 100644
--- a/code/modules/client/preference/loadout/loadout_racial.dm
+++ b/code/modules/client/preference/loadout/loadout_racial.dm
@@ -14,7 +14,6 @@
/datum/gear/racial
sort_category = "Racial"
main_typepath = /datum/gear/racial
- cost = 1
/datum/gear/racial/taj
display_name = "Tajaran veil"
diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm
index b97aa0e11ab..f4d1d3f7137 100644
--- a/code/modules/clothing/chameleon.dm
+++ b/code/modules/clothing/chameleon.dm
@@ -237,7 +237,6 @@
item_state = "bl_suit"
item_color = "black"
desc = "It's a plain jumpsuit. It has a small dial on the wrist."
- sensor_mode = SENSOR_OFF //Hey who's this guy on the Syndicate Shuttle??
random_sensor = FALSE
resistance_flags = NONE
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
@@ -330,7 +329,6 @@
desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting condition."
icon_state = "meson"
item_state = "meson"
- resistance_flags = NONE
prescription_upgradable = TRUE
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
@@ -367,12 +365,10 @@
vision_flags = SEE_MOBS
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
flash_protect = FLASH_PROTECTION_SENSITIVE
- prescription_upgradable = TRUE
/obj/item/clothing/glasses/chameleon/night
origin_tech = "magnets=3;syndicate=1"
see_in_dark = 8
- prescription_upgradable = TRUE
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
/obj/item/clothing/glasses/hud/security/chameleon
@@ -462,7 +458,6 @@
icon_override = 'icons/mob/clothing/head/softcap.dmi'
icon_state = "greysoft"
item_color = "grey"
- dyeable = FALSE
resistance_flags = NONE
armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50)
@@ -505,7 +500,6 @@
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH
- dyeable = FALSE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
@@ -540,8 +534,6 @@
chameleon_action.emp_randomise(INFINITY)
/obj/item/clothing/mask/chameleon/voice_change
- name = "gas mask"
- desc = "A face-covering mask that can be connected to an air supply. While good for concealing your identity, it isn't good for blocking gas flow."
icon_state = "swat"
item_state = "swat"
@@ -585,10 +577,6 @@
chameleon_action.emp_randomise()
/obj/item/clothing/shoes/chameleon/noslip
- name = "black shoes"
- icon_state = "black"
- item_color = "black"
- desc = "A pair of black shoes."
no_slip = TRUE
/obj/item/clothing/shoes/chameleon/noslip/broken/Initialize(mapload)
@@ -596,7 +584,6 @@
chameleon_action.emp_randomise(INFINITY)
/obj/item/storage/backpack/chameleon
- name = "backpack"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/back.dmi'
@@ -649,7 +636,6 @@
chameleon_action.emp_randomise(INFINITY)
/obj/item/radio/headset/chameleon
- name = "radio headset"
var/datum/action/item_action/chameleon_change/chameleon_action
/obj/item/radio/headset/chameleon/Initialize(mapload)
@@ -717,7 +703,6 @@
/obj/item/clothing/neck/chameleon
name = "black tie"
desc = "A neosilk clip-on tie."
- icon = 'icons/obj/clothing/neck.dmi'
icon_state = "blacktie"
resistance_flags = NONE
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index b698eee9954..c7926e986aa 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -1,6 +1,5 @@
/obj/item/clothing
name = "clothing"
- max_integrity = 200
integrity_failure = 80
resistance_flags = FLAMMABLE
/// Only these species can wear this kit.
@@ -176,7 +175,6 @@
w_class = WEIGHT_CLASS_HUGE
icon = 'icons/mob/screen_gen.dmi'
icon_state = "block"
- slot_flags = ITEM_SLOT_BOTH_EARS
/obj/item/clothing/ears/offear/New(obj/O)
. = ..()
@@ -192,7 +190,6 @@
/obj/item/clothing/glasses
name = "glasses"
icon = 'icons/obj/clothing/glasses.dmi'
- w_class = WEIGHT_CLASS_SMALL
flags_cover = GLASSESCOVERSEYES
slot_flags = ITEM_SLOT_EYES
materials = list(MAT_GLASS = 250)
@@ -245,7 +242,6 @@
name = "gloves"
///Carn: for grammarically correct text-parsing
gender = PLURAL
- w_class = WEIGHT_CLASS_SMALL
icon = 'icons/obj/clothing/gloves.dmi'
siemens_coefficient = 0.50
body_parts_covered = HANDS
@@ -541,9 +537,7 @@
icon = 'icons/obj/clothing/masks.dmi'
body_parts_covered = HEAD
slot_flags = ITEM_SLOT_MASK
- strip_delay = 4 SECONDS
put_on_delay = 4 SECONDS
- dyeable = FALSE
var/adjusted_flags = null
@@ -627,7 +621,6 @@
dyeing_key = DYE_REGISTRY_SHOES
permeability_coefficient = 0.50
- slowdown = SHOES_SLOWDOWN
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/shoes.dmi',
@@ -755,7 +748,6 @@
drop_sound = 'sound/items/handling/cloth_drop.ogg'
pickup_sound = 'sound/items/handling/cloth_pickup.ogg'
slot_flags = ITEM_SLOT_OUTER_SUIT
- dyeable = FALSE
var/fire_resist = T0C + 100
var/blood_overlay_type = "suit"
@@ -959,16 +951,13 @@
name = "space helmet"
icon_state = "space"
desc = "A special helmet designed for work in a hazardous, low-pressure environment."
- w_class = WEIGHT_CLASS_NORMAL
flags = BLOCKHAIR | STOPSPRESSUREDMAGE | THICKMATERIAL
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
item_state = "s_helmet"
permeability_coefficient = 0.01
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 50, FIRE = 200, ACID = 115)
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
- cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
- heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
flash_protect = FLASH_PROTECTION_WELDER
strip_delay = 50
diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm
index 0c8d6a0cd23..8f11a642f12 100644
--- a/code/modules/clothing/glasses/glasses.dm
+++ b/code/modules/clothing/glasses/glasses.dm
@@ -180,7 +180,6 @@
name = "night vision science goggles"
desc = "Now you can science in darkness."
icon_state = "nvpurple"
- item_state = "glasses"
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE //don't render darkness while wearing these
@@ -292,7 +291,6 @@
)
/obj/item/clothing/glasses/regular/hipster
- name = "prescription glasses"
desc = "Made by Uncool. Co."
icon_state = "hipster_glasses"
item_state = "hipster_glasses"
@@ -361,9 +359,6 @@
desc = "Cheap, plastic sunglasses. They don't even have UV protection."
icon_state = "sun"
item_state = "sunglasses"
- see_in_dark = 0
- flash_protect = FLASH_PROTECTION_NONE
- tint = FLASH_PROTECTION_NONE
prescription_upgradable = TRUE
sprite_sheets = list(
@@ -471,7 +466,6 @@
desc = "Welding goggles made from more expensive materials, strangely smells like potatoes."
icon_state = "rwelding-g"
item_state = "rwelding-g"
- flash_protect = FLASH_PROTECTION_WELDER
tint = FLASH_PROTECTION_NONE
/obj/item/clothing/glasses/sunglasses/blindfold
diff --git a/code/modules/clothing/glasses/hudglasses.dm b/code/modules/clothing/glasses/hudglasses.dm
index f365eb12cb1..b0def2f3f61 100644
--- a/code/modules/clothing/glasses/hudglasses.dm
+++ b/code/modules/clothing/glasses/hudglasses.dm
@@ -41,7 +41,6 @@
name = "health scanner HUD"
desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."
icon_state = "healthhud"
- origin_tech = "magnets=3;biotech=2"
hud_types = DATA_HUD_MEDICAL_ADVANCED
sprite_sheets = list(
@@ -140,7 +139,6 @@
see_in_dark = 1
flash_protect = FLASH_PROTECTION_FLASH
tint = FLASH_PROTECTION_FLASH
- prescription_upgradable = TRUE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/eyes.dmi',
@@ -195,7 +193,6 @@
see_in_dark = 1 // None of these three can be converted to booleans. Do not try it.
flash_protect = FLASH_PROTECTION_FLASH
tint = FLASH_PROTECTION_FLASH
- prescription_upgradable = TRUE
sprite_sheets = list(
"Drask" = 'icons/mob/clothing/species/drask/eyes.dmi',
"Grey" = 'icons/mob/clothing/species/grey/eyes.dmi',
diff --git a/code/modules/clothing/gloves/colored_gloves.dm b/code/modules/clothing/gloves/colored_gloves.dm
index a6ba0f91f8c..e45e6919f65 100644
--- a/code/modules/clothing/gloves/colored_gloves.dm
+++ b/code/modules/clothing/gloves/colored_gloves.dm
@@ -10,7 +10,6 @@
permeability_coefficient = 0.05
item_color = "yellow"
resistance_flags = NONE
- dyeable = TRUE
/obj/item/clothing/gloves/color/yellow/fake
siemens_coefficient = 1
@@ -214,4 +213,3 @@
icon_state = "furglovesico"
item_state = "furgloves"
transfer_prints = TRUE
- dyeable = FALSE
diff --git a/code/modules/clothing/head/beanie.dm b/code/modules/clothing/head/beanie.dm
index fb47355dffa..2f9e4cfc1dc 100644
--- a/code/modules/clothing/head/beanie.dm
+++ b/code/modules/clothing/head/beanie.dm
@@ -17,42 +17,34 @@
/obj/item/clothing/head/beanie/black
name = "black beanie"
- icon_state = "beanie"
color = "#4A4A4B" //Grey but it looks black
/obj/item/clothing/head/beanie/red
name = "red beanie"
- icon_state = "beanie"
color = "#D91414" //Red
/obj/item/clothing/head/beanie/green
name = "green beanie"
- icon_state = "beanie"
color = "#5C9E54" //Green
/obj/item/clothing/head/beanie/darkblue
name = "dark blue beanie"
- icon_state = "beanie"
color = "#1E85BC" //Blue
/obj/item/clothing/head/beanie/purple
name = "purple beanie"
- icon_state = "beanie"
color = "#9557C5" //purple
/obj/item/clothing/head/beanie/yellow
name = "yellow beanie"
- icon_state = "beanie"
color = "#E0C14F" //Yellow
/obj/item/clothing/head/beanie/orange
name = "orange beanie"
- icon_state = "beanie"
color = "#C67A4B" //orange
/obj/item/clothing/head/beanie/cyan
name = "cyan beanie"
- icon_state = "beanie"
color = "#54A3CE" //Cyan (Or close to it)
//Striped Beanies have unique sprites
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index f248139f29e..80daa2e2920 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -14,7 +14,6 @@
max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
strip_delay = 60
dog_fashion = /datum/dog_fashion/head/helmet
- dyeable = FALSE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/helmet.dmi',
"Drask" = 'icons/mob/clothing/species/drask/helmet.dmi',
@@ -69,7 +68,6 @@
/obj/item/clothing/head/helmet/material
name = "material visor helmet"
desc = "A helmet with a built-in material scanning visor."
- icon_state = "helmetmaterials"
vision_flags = SEE_OBJS
/obj/item/clothing/head/helmet/night
@@ -135,10 +133,7 @@
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 50, RAD = 10, FIRE = 50, ACID = 50)
flags = BLOCKHAIR
- flags_inv = HIDEEARS|HIDEEYES
- cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
- heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
strip_delay = 80
dog_fashion = null
@@ -157,9 +152,7 @@
item_state = "thunderdome"
armor = list(MELEE = 200, BULLET = 200, LASER = 50, ENERGY = 50, BOMB = INFINITY, RAD = INFINITY, FIRE = 450, ACID = 450)
flags_2 = RAD_PROTECT_CONTENTS_2
- cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
- heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
strip_delay = 80
dog_fashion = null
@@ -212,7 +205,6 @@
item_state = "redtaghelm"
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 0, ACID = 50)
// Offer about the same protection as a hardhat.
- flags_inv = HIDEEARS|HIDEEYES
dog_fashion = null
/obj/item/clothing/head/helmet/bluetaghelm
@@ -223,7 +215,6 @@
item_state = "bluetaghelm"
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 0, ACID = 50)
// Offer about the same protection as a hardhat.
- flags_inv = HIDEEARS|HIDEEYES
dog_fashion = null
/obj/item/clothing/head/blob
@@ -261,7 +252,6 @@
name = "skull helmet"
desc = "An intimidating tribal helmet, it looks sick as hell."
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
- flags_cover = HEADCOVERSEYES
armor = list(MELEE = 25, BULLET = 15, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 50)
icon_state = "skull"
item_state = "skull"
@@ -275,9 +265,7 @@
desc = "A helmet made from durathread and leather."
icon_state = "durathread"
item_state = "durathread"
- resistance_flags = FLAMMABLE
armor = list(MELEE = 10, BULLET = 5, LASER = 20, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 35, ACID = 50)
- strip_delay = 60
/obj/item/clothing/head/helmet/street_judge
name = "judge's helmet"
@@ -354,10 +342,7 @@
)
flags = BLOCKHAIR | STOPSPRESSUREDMAGE
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
- flags_cover = HEADCOVERSEYES
- cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
- heat_protection = HEAD
max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
@@ -368,8 +353,6 @@
/obj/item/clothing/head/helmet/federation/marine/export
name = "\improper Federation marine combat helmet (E)"
desc = "An export-grade combat helmet commonly given or sold to allies of the Trans-Solar Federation. The OCULUS system has been removed, and its protection is generally inferior to its in-service counterpart."
- icon_state = "fedhelmet_marine"
- item_state = "fedhelmet_marine"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi',
"Drask" = 'icons/mob/clothing/species/drask/head.dmi',
@@ -380,17 +363,10 @@
"Unathi" = 'icons/mob/clothing/species/unathi/head.dmi'
)
flags = BLOCKHAIR
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
- flags_cover = HEADCOVERSEYES
- cold_protection = HEAD
- min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
- heat_protection = HEAD
- max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
see_in_dark = 0
lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE
flash_protect = FLASH_PROTECTION_NONE
armor = list(MELEE = 30, BULLET = 35, LASER = 35, ENERGY = 30, BOMB = 50, RAD = 0, FIRE = 100, ACID = 50)
- strip_delay = 130
/obj/item/clothing/head/helmet/federation/marine/officer
name = "\improper Federation marine officer's combat helmet"
@@ -406,16 +382,5 @@
"Vulpkanin" = 'icons/mob/clothing/species/vulpkanin/head.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/head.dmi'
)
- flags = BLOCKHAIR | STOPSPRESSUREDMAGE
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
- flags_cover = HEADCOVERSEYES
- cold_protection = HEAD
- min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
- heat_protection = HEAD
- max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
- see_in_dark = 8
vision_flags = SEE_MOBS
- lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- flash_protect = FLASH_PROTECTION_WELDER
armor = list(MELEE = 40, BULLET = 45, LASER = 45, ENERGY = 40, BOMB = 100, RAD = 25, FIRE = INFINITY, ACID = 100)
- strip_delay = 130
diff --git a/code/modules/clothing/head/job_hats.dm b/code/modules/clothing/head/job_hats.dm
index 48ad7efef77..82c8a1d37cd 100644
--- a/code/modules/clothing/head/job_hats.dm
+++ b/code/modules/clothing/head/job_hats.dm
@@ -206,9 +206,7 @@
dog_fashion = /datum/dog_fashion/head/surgery
/obj/item/clothing/head/surgery/blue
- name = "blue surgical cap"
desc = "A cap surgeons wear during operations. Keeps their hair from tickling your internal organs. This one is baby blue."
- icon_state = "surgcap_blue"
dog_fashion = /datum/dog_fashion/head/surgery
/obj/item/clothing/head/surgery/green
diff --git a/code/modules/clothing/head/misc_hats.dm b/code/modules/clothing/head/misc_hats.dm
index 6545d49cba3..852236c3091 100644
--- a/code/modules/clothing/head/misc_hats.dm
+++ b/code/modules/clothing/head/misc_hats.dm
@@ -450,9 +450,7 @@
item_state = "cone"
force = 1.0
throwforce = 3.0
- throw_speed = 2
throw_range = 5
- w_class = WEIGHT_CLASS_SMALL
attack_verb = list("warned", "cautioned", "smashed")
resistance_flags = NONE
dog_fashion = /datum/dog_fashion/head/cone
@@ -521,11 +519,8 @@
)
/obj/item/clothing/head/papersack/smiley
- name = "paper sack hat"
desc = "A paper sack with crude holes cut out for eyes and a sketchy smile drawn on the front. Not creepy at all."
icon_state = "papersack_smile"
- flags = BLOCKHAIR
- flags_inv = HIDEFACE|HIDEEARS
sprite_sheets = list(
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm
index 75fcaefd90f..cc63e73be96 100644
--- a/code/modules/clothing/head/misc_special.dm
+++ b/code/modules/clothing/head/misc_special.dm
@@ -169,7 +169,6 @@
icon_state = "hardhat0_reindeer"
item_state = "hardhat0_reindeer"
item_color = "reindeer"
- flags_inv = 0
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
brightness_on = 1 //luminosity when on
dog_fashion = /datum/dog_fashion/head/reindeer
diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm
index e0af66549a4..e8a8fd25eba 100644
--- a/code/modules/clothing/head/soft_caps.dm
+++ b/code/modules/clothing/head/soft_caps.dm
@@ -40,28 +40,24 @@
desc = "It's a baseball hat in a tasteless red colour."
icon_state = "redsoft"
item_color = "red"
- dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/blue
name = "blue cap"
desc = "It's a baseball hat in a tasteless blue colour."
icon_state = "bluesoft"
item_color = "blue"
- dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/green
name = "green cap"
desc = "It's a baseball hat in a tasteless green colour."
icon_state = "greensoft"
item_color = "green"
- dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/yellow
name = "yellow cap"
desc = "It's a baseball hat in a tasteless yellow colour."
icon_state = "yellowsoft"
item_color = "yellow"
- dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/orange
name = "orange cap"
@@ -74,28 +70,24 @@
desc = "It's a baseball hat in a tasteless white colour."
icon_state = "whitesoft"
item_color = "white"
- dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/purple
name = "purple cap"
desc = "It's a baseball hat in a tasteless purple colour."
icon_state = "purplesoft"
item_color = "purple"
- dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/black
name = "black cap"
desc = "It's a baseball hat in a tasteless black colour."
icon_state = "blacksoft"
item_color = "black"
- dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/rainbow
name = "rainbow cap"
desc = "It's a baseball hat in a bright rainbow of colors."
icon_state = "rainbowsoft"
item_color = "rainbow"
- dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/cargo
name = "cargo cap"
@@ -130,14 +122,12 @@
desc = "It's a grey baseball hat with a purple custodial shield."
icon_state = "janitorgreysoft"
item_color = "janitorgrey"
- dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/janitorpurple
name = "purple janitor's cap"
desc = "It's a purple baseball hat with a mint service shield."
icon_state = "janitorpurplesoft"
item_color = "janitorpurple"
- dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/paramedic
name = "\improper EMT cap"
@@ -153,7 +143,6 @@
item_color = "sec"
armor = list(MELEE = 25, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 0, RAD = 0, FIRE = 10, ACID = 50)
strip_delay = 60
- dog_fashion = /datum/dog_fashion/head/softcap
/obj/item/clothing/head/soft/sec/corp
name = "corporate security cap"
diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm
index 14c5b20e33c..8f04d4e791c 100644
--- a/code/modules/clothing/masks/boxing.dm
+++ b/code/modules/clothing/masks/boxing.dm
@@ -5,7 +5,6 @@
item_state = "balaclava"
flags = BLOCKHAIR
flags_inv = HIDEFACE
- w_class = WEIGHT_CLASS_SMALL
can_toggle = TRUE
actions_types = list(/datum/action/item_action/adjust)
adjusted_flags = ITEM_SLOT_HEAD
@@ -29,7 +28,6 @@
item_state = "luchag"
flags = BLOCKHAIR
flags_inv = HIDEFACE
- w_class = WEIGHT_CLASS_SMALL
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/mask.dmi',
diff --git a/code/modules/clothing/masks/breath.dm b/code/modules/clothing/masks/breath.dm
index 1c0f6a910eb..a721d0db9e4 100644
--- a/code/modules/clothing/masks/breath.dm
+++ b/code/modules/clothing/masks/breath.dm
@@ -6,7 +6,6 @@
flags = AIRTIGHT
flags_cover = MASKCOVERSMOUTH
can_toggle = TRUE
- w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.10
permeability_coefficient = 0.50
actions_types = list(/datum/action/item_action/adjust)
diff --git a/code/modules/clothing/masks/misc_masks.dm b/code/modules/clothing/masks/misc_masks.dm
index dfc4024e7ea..bc5accf82f0 100644
--- a/code/modules/clothing/masks/misc_masks.dm
+++ b/code/modules/clothing/masks/misc_masks.dm
@@ -4,7 +4,6 @@
icon_state = "muzzle"
item_state = "muzzle"
flags_cover = MASKCOVERSMOUTH
- w_class = WEIGHT_CLASS_SMALL
gas_transfer_coefficient = 0.90
put_on_delay = 2 SECONDS
/// How long you need to gnaw to get rid of the gag, 0 to make it impossible to remove
@@ -91,10 +90,8 @@
desc = "A muzzle designed to prevent biting."
icon_state = "muzzle_secure"
item_state = "muzzle_secure"
- resist_time = 0 SECONDS
mute = MUZZLE_MUTE_NONE
security_lock = TRUE
- locked = FALSE
materials = list(MAT_METAL=500, MAT_GLASS=50)
sprite_sheets = list(
@@ -235,7 +232,6 @@
item_state = "pig"
flags = BLOCKHAIR
flags_inv = HIDEFACE
- w_class = WEIGHT_CLASS_SMALL
/obj/item/clothing/mask/horsehead
@@ -245,7 +241,6 @@
item_state = "horsehead"
flags = BLOCKHAIR
flags_inv = HIDEFACE
- w_class = WEIGHT_CLASS_SMALL
var/voicechange = FALSE
var/temporaryname = " the Horse"
var/originalname = ""
@@ -343,7 +338,6 @@
icon_state = "fawkes"
item_state = "fawkes"
flags_inv = HIDEFACE
- w_class = WEIGHT_CLASS_SMALL
/obj/item/clothing/mask/gas/clown_hat/pennywise
name = "\improper Pennywise mask"
@@ -351,7 +345,6 @@
icon_state = "pennywise_mask"
item_state = "pennywise_mask"
- flags = BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | BLOCKHAIR
// Bandanas
/obj/item/clothing/mask/bandana
@@ -360,7 +353,6 @@
flags_inv = HIDEFACE
flags_cover = MASKCOVERSMOUTH
w_class = WEIGHT_CLASS_TINY
- slot_flags = ITEM_SLOT_MASK
adjusted_flags = ITEM_SLOT_HEAD
icon_state = "bandbotany"
dyeable = TRUE
@@ -483,7 +475,6 @@
/obj/item/clothing/mask/bandana/botany
name = "botany bandana"
desc = "It's a green bandana with some fine nanotech lining."
- icon_state = "bandbotany"
/obj/item/clothing/mask/bandana/skull
name = "skull bandana"
diff --git a/code/modules/clothing/neck/cloaks.dm b/code/modules/clothing/neck/cloaks.dm
index 780c61326b2..e0aaa9d8dd6 100644
--- a/code/modules/clothing/neck/cloaks.dm
+++ b/code/modules/clothing/neck/cloaks.dm
@@ -4,7 +4,6 @@
name = "grey cloak"
desc = "It's a cloak that can be worn around your neck in a pretty dull color."
icon_state = "cloak"
- w_class = WEIGHT_CLASS_SMALL
body_parts_covered = UPPER_TORSO | ARMS
/obj/item/clothing/neck/cloak/head_of_security
diff --git a/code/modules/clothing/neck/neck.dm b/code/modules/clothing/neck/neck.dm
index bf9b754ed32..e8876d9ccba 100644
--- a/code/modules/clothing/neck/neck.dm
+++ b/code/modules/clothing/neck/neck.dm
@@ -1,7 +1,6 @@
/obj/item/clothing/neck/tie
name = "tie"
desc = "A neosilk clip-on tie."
- w_class = WEIGHT_CLASS_SMALL
var/under_suit = FALSE
/obj/item/clothing/neck/tie/blue
diff --git a/code/modules/clothing/neck/necklace.dm b/code/modules/clothing/neck/necklace.dm
index 9a46d7cfadf..f8895f98ca0 100644
--- a/code/modules/clothing/neck/necklace.dm
+++ b/code/modules/clothing/neck/necklace.dm
@@ -1,10 +1,8 @@
/obj/item/clothing/neck/necklace
- name = "necklace"
desc = "A simple necklace."
icon_state = "necklace"
item_state = "necklace"
item_color = "necklace"
- w_class = WEIGHT_CLASS_SMALL
/obj/item/clothing/neck/necklace/long
name = "large necklace"
diff --git a/code/modules/clothing/neck/scarfs.dm b/code/modules/clothing/neck/scarfs.dm
index ffa1a4b0dd8..c92ac52fba8 100644
--- a/code/modules/clothing/neck/scarfs.dm
+++ b/code/modules/clothing/neck/scarfs.dm
@@ -1,7 +1,6 @@
/obj/item/clothing/neck/scarf
name = "scarf"
desc = "A stylish scarf. The perfect winter accessory for those with a keen fashion sense, and those who just can't handle a cold breeze on their necks."
- w_class = WEIGHT_CLASS_SMALL
dog_fashion = /datum/dog_fashion/head
/obj/item/clothing/neck/scarf/red
diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
index 30641f6403d..1fb8b2a9778 100644
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -8,7 +8,6 @@
min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
heat_protection = FEET
max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
- dyeable = TRUE
/obj/item/clothing/shoes/black/greytide
flags = NODROP
diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm
index c965866f611..022c60d7f2a 100644
--- a/code/modules/clothing/shoes/magboots.dm
+++ b/code/modules/clothing/shoes/magboots.dm
@@ -8,7 +8,6 @@
strip_delay = 7 SECONDS
put_on_delay = 7 SECONDS
resistance_flags = FIRE_PROOF
- no_slip = FALSE
var/magboot_state = "magboots"
var/magpulse = FALSE
var/slowdown_active = 2
diff --git a/code/modules/clothing/shoes/misc_shoes.dm b/code/modules/clothing/shoes/misc_shoes.dm
index ca109007689..69ebc57a24e 100644
--- a/code/modules/clothing/shoes/misc_shoes.dm
+++ b/code/modules/clothing/shoes/misc_shoes.dm
@@ -2,7 +2,6 @@
name = "mime shoes"
icon_state = "mime"
item_color = "mime"
- dyeable = TRUE
/// basic syndicate combat boots for nuke ops and mob corpses
/obj/item/clothing/shoes/combat
@@ -40,13 +39,11 @@
desc = "A pair of magic, black shoes."
icon_state = "black"
resistance_flags = FIRE_PROOF | ACID_PROOF
- dyeable = FALSE
/obj/item/clothing/shoes/sandal/magic
name = "magical sandals"
desc = "A pair of sandals imbued with magic."
resistance_flags = FIRE_PROOF | ACID_PROOF
- dyeable = FALSE
/obj/item/clothing/shoes/galoshes
name = "galoshes"
@@ -93,7 +90,6 @@
// "Dyeable" in this case is a bit of an understatement, washing these
// with a crayon will give them the appearance and name of normal
// shoes, but the functionality of clown shoes.
- dyeable = TRUE
var/enabled_waddle = TRUE
@@ -208,12 +204,10 @@
can_cut_open = 0
icon_state = "jacksandal"
item_color = "jacksandal"
- dyeable = FALSE
/obj/item/clothing/shoes/jackboots/noisy
name = "heavy jackboots"
desc = "Outdated heavier versions of the standard Nanotrasen-issue Security combat boots. Pick up that can."
- dyeable = FALSE
/obj/item/clothing/shoes/jackboots/noisy/Initialize(mapload)
. = ..()
@@ -236,7 +230,6 @@
heat_protection = FEET|LEGS
max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
knife_slot = TRUE
- dyeable = FALSE
/obj/item/clothing/shoes/workboots/smithing
name = "smithing boots"
@@ -247,7 +240,6 @@
min_cold_protection_temperature = SHOES_MIN_TEMP_PROTECT
heat_protection = FEET|LEGS
max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT
- dyeable = FALSE
/obj/item/clothing/shoes/winterboots
name = "winter boots"
@@ -448,8 +440,6 @@
desc = "A roll of treated canvas used for wrapping claws or paws."
icon_state = "clothwrap"
item_state = "clothwrap"
- force = 0
- w_class = WEIGHT_CLASS_SMALL
dyeable = FALSE
/obj/item/clothing/shoes/bhop
@@ -461,7 +451,6 @@
resistance_flags = FIRE_PROOF
actions_types = list(/datum/action/item_action/bhop)
permeability_coefficient = 0.05
- can_cut_open = FALSE
knife_slot = TRUE
dyeable = FALSE
diff --git a/code/modules/clothing/spacesuits/alien_suits.dm b/code/modules/clothing/spacesuits/alien_suits.dm
index e8f7eda45e7..f1d0da0448b 100644
--- a/code/modules/clothing/spacesuits/alien_suits.dm
+++ b/code/modules/clothing/spacesuits/alien_suits.dm
@@ -79,9 +79,6 @@
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword/saber,/obj/item/restraints/handcuffs, /obj/item/tank/internals)
armor = list(MELEE = 35, BULLET = 35, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 20, FIRE = 200, ACID = 285)
- heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
- max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
- dyeable = FALSE
icon = 'icons/obj/clothing/species/vox/suits.dmi'
icon_state = null
species_restricted = list("Vox")
@@ -195,8 +192,6 @@
desc = "These bizarre gauntlets seem to be fitted for... bird claws?"
icon_state = "gloves-vox"
item_state = "gloves-vox"
- siemens_coefficient = 0
- permeability_coefficient = 0.05
item_color = "gloves-vox"
icon = 'icons/obj/clothing/species/vox/gloves.dmi'
species_restricted = list("Vox")
diff --git a/code/modules/clothing/spacesuits/chronosuit.dm b/code/modules/clothing/spacesuits/chronosuit.dm
index 4eade0ff155..49aecf8b1de 100644
--- a/code/modules/clothing/spacesuits/chronosuit.dm
+++ b/code/modules/clothing/spacesuits/chronosuit.dm
@@ -26,7 +26,6 @@
actions_types = list(/datum/action/item_action/toggle)
armor = list(MELEE = 75, BULLET = 75, LASER = 75, ENERGY = 75, BOMB = 30, RAD = 90, FIRE = INFINITY, ACID = INFINITY)
resistance_flags = FIRE_PROOF | ACID_PROOF
- dyeable = FALSE
var/obj/item/clothing/head/helmet/space/chronos/helmet = null
var/obj/effect/chronos_cam/camera = null
@@ -181,10 +180,7 @@
/obj/effect/chronos_cam
name = "chronosuit view"
- density = FALSE
- anchored = TRUE
invisibility = 101
- opacity = FALSE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/mob/holder = null
diff --git a/code/modules/clothing/spacesuits/ert_hardsuits.dm b/code/modules/clothing/spacesuits/ert_hardsuits.dm
index 158cdde6774..0c2152cfd18 100644
--- a/code/modules/clothing/spacesuits/ert_hardsuits.dm
+++ b/code/modules/clothing/spacesuits/ert_hardsuits.dm
@@ -78,15 +78,10 @@
/obj/item/clothing/head/helmet/space/hardsuit/ert/commander
name = "emergency response team commander helmet"
desc = "An environmentally sealed combat helmet with a wide plexiglass visor for maximum visibility. This one has blue Command stripes."
- icon_state = "hardsuit0-ert_commander"
- item_state = "helm-command"
- item_color = "ert_commander"
/obj/item/clothing/suit/space/hardsuit/ert/commander
name = "emergency response team commander suit"
desc = "A powered combat hardsuit produced by Citadel Armories. Decently armored, environmentally sealed, and fire-resistant. This one is covered in blue Command livery."
- icon_state = "ert_commander"
- item_state = "suit-command"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/commander
//Security
@@ -141,7 +136,6 @@
armor = list(MELEE = 40, BULLET = 15, LASER = 20, ENERGY = 5, BOMB = 15, RAD = INFINITY, FIRE = 200, ACID = 200)
flags_2 = RAD_PROTECT_CONTENTS_2
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer/gamma
- slowdown = 0
//Medical
/obj/item/clothing/head/helmet/space/hardsuit/ert/medical
@@ -181,7 +175,6 @@
icon_state = "hardsuit0-ert_paranormal"
item_color = "ert_paranormal"
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- resistance_flags = FIRE_PROOF
sprite_sheets = list(
"Grey" = 'icons/mob/clothing/species/grey/helmet.dmi',
"Tajaran" = 'icons/mob/clothing/species/tajaran/helmet.dmi',
@@ -196,7 +189,6 @@
icon_state = "hardsuit-paranormal"
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal
- resistance_flags = FIRE_PROOF
sprite_sheets = list(
"Tajaran" = 'icons/mob/clothing/species/tajaran/suit.dmi',
"Unathi" = 'icons/mob/clothing/species/unathi/suit.dmi',
@@ -227,7 +219,6 @@
icon_state = "ert_solgov_marine"
item_state = "ert_solgov_marine"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/ert/solgov
- slowdown = 0
armor = list(MELEE = 25, BULLET = 75, LASER = 10, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
/obj/item/clothing/head/helmet/space/hardsuit/ert/solgov/command
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index a1d178fb788..ca809740016 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -1,7 +1,6 @@
//Baseline hardsuits
/obj/item/clothing/head/helmet/space/hardsuit
name = "hardsuit helmet"
- desc = "A special helmet designed for work in a hazardous, low-pressure environment."
icon_state = null
item_state = "eng_helm"
max_integrity = 300
@@ -145,7 +144,6 @@
allowed = list(/obj/item/flashlight,/obj/item/tank/internals,/obj/item/t_scanner, /obj/item/rcd, /obj/item/rpd)
siemens_coefficient = 0
actions_types = list(/datum/action/item_action/toggle_helmet)
- dyeable = FALSE
hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran")
sprite_sheets = list(
@@ -354,7 +352,6 @@
icon_state = "hardsuit0-syndielite"
item_color = "syndielite"
armor = list(MELEE = 75, BULLET = 75, LASER = 50, ENERGY = 15, BOMB = 60, RAD = 115, FIRE = INFINITY, ACID = INFINITY)
- heat_protection = HEAD
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -365,7 +362,6 @@
item_color = "syndielite"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
armor = list(MELEE = 75, BULLET = 75, LASER = 50, ENERGY = 15, BOMB = 60, RAD = 115, FIRE = INFINITY, ACID = INFINITY)
- heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
diff --git a/code/modules/clothing/spacesuits/misc_spacesuits.dm b/code/modules/clothing/spacesuits/misc_spacesuits.dm
index 9ceef7c1493..e32bbfb6a98 100644
--- a/code/modules/clothing/spacesuits/misc_spacesuits.dm
+++ b/code/modules/clothing/spacesuits/misc_spacesuits.dm
@@ -5,7 +5,6 @@
item_state = "capspacehelmet"
desc = "A special helmet designed for only the most fashionable of military figureheads."
flags_inv = HIDEFACE
- permeability_coefficient = 0.01
armor = list(MELEE = 35, BULLET = 50, LASER = 50, ENERGY = 15, BOMB = 50, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
sprite_sheets = list(
@@ -27,7 +26,6 @@
desc = "A bulky, heavy-duty piece of exclusive Nanotrasen armor. YOU are in charge!"
icon_state = "caparmor"
item_state = "capspacesuit"
- w_class = WEIGHT_CLASS_BULKY
allowed = list(/obj/item/tank/internals, /obj/item/flashlight,/obj/item/gun/energy, /obj/item/gun/projectile, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton,/obj/item/restraints/handcuffs)
armor = list(MELEE = 35, BULLET = 50, LASER = 50, ENERGY = 15, BOMB = 50, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
@@ -64,7 +62,6 @@
flags_2 = RAD_PROTECT_CONTENTS_2
strip_delay = 130
dog_fashion = /datum/dog_fashion/back/deathsquad
- dyeable = FALSE
/obj/item/clothing/suit/space/deathsquad/Initialize(mapload)
. = ..()
@@ -99,8 +96,6 @@
flags_inv = 0
slowdown = 0
armor = list(MELEE = 200, BULLET = 200, LASER = 50, ENERGY = 50, BOMB = INFINITY, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY)
- resistance_flags = FIRE_PROOF | ACID_PROOF
- flags_2 = RAD_PROTECT_CONTENTS_2
w_class = WEIGHT_CLASS_NORMAL
/obj/item/clothing/suit/space/deathsquad/officer/solgov
@@ -210,7 +205,6 @@
/obj/item/clothing/suit/space/eva
name = "EVA suit"
icon_state = "spacenew"
- item_state = "s_suit"
desc = "A lightweight space suit with the basic ability to protect the wearer from the vacuum of space during emergencies."
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 10, FIRE = 50, ACID = 95)
@@ -230,7 +224,6 @@
/obj/item/clothing/head/helmet/space/eva
name = "EVA helmet"
icon_state = "spacenew"
- item_state = "s_helmet"
desc = "A lightweight space helmet with the basic ability to protect the wearer from the vacuum of space during emergencies."
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 10, FIRE = 50, ACID = 95)
diff --git a/code/modules/clothing/spacesuits/plasmamen.dm b/code/modules/clothing/spacesuits/plasmamen.dm
index cd71bcfd818..62920f0dbb7 100644
--- a/code/modules/clothing/spacesuits/plasmamen.dm
+++ b/code/modules/clothing/spacesuits/plasmamen.dm
@@ -6,7 +6,6 @@
item_state = "plasmaman-helm"
base_icon_state = "plasmaman-helm"
strip_delay = 80
- flash_protect = FLASH_PROTECTION_WELDER
tint = FLASH_PROTECTION_WELDER
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = INFINITY, ACID = 150)
resistance_flags = FIRE_PROOF
@@ -21,8 +20,6 @@
dyeing_key = DYE_REGISTRY_PLASMAMEN_HELMET
actions_types = list(/datum/action/item_action/toggle_helmet_light, /datum/action/item_action/toggle_welding_screen/plasmaman)
visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT
- flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
- flags_cover = HEADCOVERSMOUTH|HEADCOVERSEYES
visor_flags_inv = HIDEEYES|HIDEFACE
icon = 'icons/obj/clothing/species/plasmaman/hats.dmi'
species_restricted = list("Plasmaman")
@@ -106,7 +103,6 @@
armor = list(MELEE = 35, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = INFINITY, ACID = 150)
/obj/item/clothing/head/helmet/space/plasmaman/security/hos
- name = "security plasma envirosuit helmet"
desc = "A plasmaman containment helmet designed for the head of security."
icon_state = "hos_envirohelm"
item_state = "hos_envirohelm"
@@ -281,7 +277,6 @@
icon_state = "wizard_envirohelm"
item_state = "wizard_envirohelm"
gas_transfer_coefficient = 0.01
- permeability_coefficient = 0.01
armor = list(MELEE = 20, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, RAD = 10, FIRE = INFINITY, ACID = INFINITY)
resistance_flags = FIRE_PROOF | ACID_PROOF
magical = TRUE
diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm
index d0e4f9d0d4b..8fb4d3db45c 100644
--- a/code/modules/clothing/spacesuits/syndi.dm
+++ b/code/modules/clothing/spacesuits/syndi.dm
@@ -109,7 +109,6 @@
//Black-green syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/green
- name = "black space helmet"
icon_state = "syndicate-helm-black-green"
item_state = "syndicate-helm-black-green"
@@ -121,7 +120,6 @@
//Black-blue syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/blue
- name = "black space helmet"
icon_state = "syndicate-helm-black-blue"
item_state = "syndicate-helm-black-blue"
@@ -133,31 +131,24 @@
//Black medical syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/med
- name = "black space helmet"
icon_state = "syndicate-helm-black-med"
- item_state = "syndicate-helm-black"
/obj/item/clothing/suit/space/syndicate/black/med
name = "green space suit"
icon_state = "syndicate-black-med"
- item_state = "syndicate-black"
//Black-orange syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/orange
- name = "black space helmet"
icon_state = "syndicate-helm-black-orange"
- item_state = "syndicate-helm-black"
/obj/item/clothing/suit/space/syndicate/black/orange
name = "black and orange space suit"
icon_state = "syndicate-black-orange"
- item_state = "syndicate-black"
//Black-red syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/red
- name = "black space helmet"
icon_state = "syndicate-helm-black-red"
item_state = "syndicate-helm-black-red"
@@ -185,14 +176,11 @@
//Black with yellow/red engineering syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/engie
- name = "black space helmet"
icon_state = "syndicate-helm-black-engie"
- item_state = "syndicate-helm-black"
/obj/item/clothing/suit/space/syndicate/black/engie
name = "black engineering space suit"
icon_state = "syndicate-black-engie"
- item_state = "syndicate-black"
/obj/item/clothing/head/helmet/space/syndicate/contractor
name = "contractor helmet"
@@ -204,7 +192,6 @@
/obj/item/clothing/suit/space/syndicate/contractor
name = "contractor space suit"
desc = "A specialised black and gold space suit that's easier to move around in than its standard Syndicate counterpart. It is made of an exotic military-grade fabric for added protection, and can be ultra-compressed into even the tightest of spaces."
- slowdown = 1
w_class = WEIGHT_CLASS_SMALL
icon_state = "syndicate-contractor"
item_state = "syndicate-contractor"
diff --git a/code/modules/clothing/suits/armor_suits.dm b/code/modules/clothing/suits/armor_suits.dm
index f083364da47..f538a833aec 100644
--- a/code/modules/clothing/suits/armor_suits.dm
+++ b/code/modules/clothing/suits/armor_suits.dm
@@ -39,7 +39,6 @@
desc = "A soft armor vest suitable for stopping minor impacts."
icon_state = "armor-combat"
item_state = "bulletproof"
- blood_overlay_type = "armor"
/obj/item/clothing/suit/armor/vest/security
name = "security armor"
@@ -48,8 +47,6 @@
"Grey" = 'icons/mob/clothing/species/grey/suit.dmi',
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
- icon_state = "armor"
- item_state = "armor"
var/obj/item/clothing/accessory/holobadge/attached_badge
/obj/item/clothing/suit/armor/vest/security/attackby__legacy__attackchain(obj/item/I, mob/user, params)
@@ -114,7 +111,6 @@
name = "press vest"
desc = "A sturdy vest that should keep you protected from the dangers of the station."
icon_state = "press_vest"
- item_state = "armor"
/obj/item/clothing/suit/armor/secjacket
name = "security jacket"
@@ -192,7 +188,6 @@
name = "warden's armored jacket"
desc = "A comfortable armored jacket fitted with Level II plate inserts for moderate protection. This one has silver livery on the shoulders to denote rank."
icon_state = "warden_jacket"
- item_state = "armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|HANDS
heat_protection = UPPER_TORSO|LOWER_TORSO|HANDS
@@ -215,8 +210,6 @@
name = "captain's carapace"
desc = "A fancy blue & gold dragonscale armor vest fitted with Level III and IV armor panelling. Offers excellent protection against melee attacks, kinetic impacts, and laser discharges. "
icon_state = "captain_carapace"
- item_state = "armor"
- body_parts_covered = UPPER_TORSO|LOWER_TORSO
armor = list(MELEE = 50, BULLET = 35, LASER = 50, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = INFINITY, ACID = 450)
dog_fashion = null
resistance_flags = FIRE_PROOF
@@ -282,7 +275,6 @@
name = "security riot suit"
desc = "A full-body suit of riot gear that provides excellent protection against blunt force trauma, fire, and corrosive substances, but little protection otherwise. This suit is covered in red Security stripes."
icon_state = "riot-sec"
- item_state = "swat_suit"
/obj/item/clothing/suit/armor/riot/knight
name = "plate armour"
@@ -318,7 +310,6 @@
desc = "A comfortable and low-profile vest made of durathread, reinforced with panels of tanned leather. Offers decent protection against laser discharges, but won't be stopping a bullet any time soon."
icon_state = "durathread"
item_state = "durathread"
- strip_delay = 60
max_integrity = 200
resistance_flags = FLAMMABLE
armor = list(MELEE = 10, BULLET = 5, LASER = 20, ENERGY = 5, BOMB = 10, RAD = 0, FIRE = 35, ACID = 50)
@@ -345,8 +336,6 @@
name = "security bulletproof armor"
desc = "A full-body suit of armor fitted with Level IV ballistic inserts and panelling. Will stop most low-caliber kinetic rounds and resist the concussive force of explosions somewhat, but it does little against melee and energy attacks. This suit is covered in red Security stripes."
icon_state = "bulletproof-sec"
- item_state = "armor"
- blood_overlay_type = "armor"
/obj/item/clothing/suit/armor/swat
name = "SWAT armor"
@@ -393,8 +382,6 @@
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
)
icon_state = "detective-armor"
- item_state = "armor"
- blood_overlay_type = "armor"
allowed = list(/obj/item/tank/internals/emergency_oxygen,/obj/item/reagent_containers/spray/pepper,/obj/item/flashlight,/obj/item/gun,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/restraints/handcuffs,/obj/item/storage/fancy/cigarettes,/obj/item/lighter,/obj/item/detective_scanner,/obj/item/taperecorder)
resistance_flags = FLAMMABLE
dog_fashion = null
@@ -770,15 +757,12 @@
w_class = WEIGHT_CLASS_BULKY
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
- min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
- max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/t_scanner, /obj/item/rcd, /obj/item/crowbar, \
/obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/multitool, \
/obj/item/radio, /obj/item/analyzer, /obj/item/gun, /obj/item/melee/baton, /obj/item/reagent_containers/spray/pepper, \
/obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/restraints/handcuffs)
flags = THICKMATERIAL | STOPSPRESSUREDMAGE
- slowdown = 0
strip_delay = 12 SECONDS
/obj/item/clothing/suit/armor/federation/marine/officer
@@ -796,8 +780,6 @@
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
)
- icon_state = "fedarmor_marine"
- item_state = "fedarmor_marine"
armor = list(MELEE = 30, BULLET = 35, LASER = 35, ENERGY = 30, BOMB = 50, RAD = 0, FIRE = 100, ACID = 50)
@@ -806,7 +788,6 @@
name = "emergency response team armor"
desc = "A mid-quality protective vest produced by Citadel Armories. Additional polymer paneling over the chest and shoulders offers moderately improved energy protection compared to standard kevlar vests."
icon_state = "ertarmor_cmd"
- item_state = "armor"
armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 20, BOMB = 10, RAD = 0, FIRE = 50, ACID = 50)
//Commander
@@ -903,7 +884,6 @@
armor = list(MELEE = 25, BULLET = 5, LASER = 15, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 75, ACID = 75)
flags = BLOCKHAIR
flags_cover = HEADCOVERSEYES
- body_parts_covered = HEAD
heat_protection = HEAD
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
diff --git a/code/modules/clothing/suits/hood.dm b/code/modules/clothing/suits/hood.dm
index df3ceb9cb93..39a053c6aaf 100644
--- a/code/modules/clothing/suits/hood.dm
+++ b/code/modules/clothing/suits/hood.dm
@@ -102,7 +102,6 @@
name = "screened niqab"
desc = "A niqab with an eye mesh for additional concealment. The wearer can see you, but you can't see them."
icon_state = "abaya_hood"
- body_parts_covered = HEAD
cold_protection = HEAD
flags = BLOCKHAIR
flags_inv = HIDEEARS | HIDEMASK | HIDEFACE | HIDEEYES
diff --git a/code/modules/clothing/suits/job_suits.dm b/code/modules/clothing/suits/job_suits.dm
index 3ae599e1a3c..a921c57224f 100644
--- a/code/modules/clothing/suits/job_suits.dm
+++ b/code/modules/clothing/suits/job_suits.dm
@@ -136,7 +136,6 @@
/obj/item/clothing/suit/storage/det_suit/forensics
name = "jacket"
desc = "A forensics technician jacket."
- item_state = "det_suit"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -372,7 +371,6 @@
icon_state = "trainercoat"
blood_overlay_type = "coat"
body_parts_covered = UPPER_TORSO|ARMS
- ignore_suitadjust = TRUE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm
index 6b1bcf95cf3..c219819f00c 100644
--- a/code/modules/clothing/suits/misc_suits.dm
+++ b/code/modules/clothing/suits/misc_suits.dm
@@ -291,7 +291,6 @@
name = "carp hood"
desc = "A hood attached to a carp costume."
icon_state = "carp_casual"
- body_parts_covered = HEAD
cold_protection = HEAD
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
flags = BLOCKHAIR
@@ -349,7 +348,6 @@
name = "salmon hood"
desc = "A hood attached to a salmon suit."
icon_state = "salmon"
- body_parts_covered = HEAD
flags = BLOCKHAIR
flags_inv = HIDEEARS
@@ -369,7 +367,6 @@
name = "bee hood"
desc = "A hood attached to a bee costume."
icon_state = "bee"
- body_parts_covered = HEAD
flags = THICKMATERIAL|BLOCKHAIR
flags_inv = HIDEEARS
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/head.dmi')
@@ -414,7 +411,6 @@
name = "winter hood"
desc = "A hood attached to a heavy winter jacket."
icon_state = "winterhood"
- body_parts_covered = HEAD
cold_protection = HEAD
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
flags = BLOCKHAIR
@@ -701,7 +697,6 @@
name = "black hood"
desc = "A hood attached to a hoodie."
icon_state = "blackhood"
- body_parts_covered = HEAD
cold_protection = HEAD
flags = BLOCKHAIR
flags_inv = HIDEEARS
@@ -725,7 +720,6 @@
name = "Martian Institute of Technology hoodie"
desc = "A hoodie proudly worn by students and graduates alike, has the letters 'MIT' on the back."
icon_state = "mit_hoodie"
- hoodtype = /obj/item/clothing/head/hooded/hood
/obj/item/clothing/suit/hooded/hoodie/cut
name = "Canaan University of Technology hoodie"
@@ -749,7 +743,6 @@
name = "Tharsis Polytech hoodie"
desc = "A dark hoodie with the Tharsis Polytech logo on the back."
icon_state = "tp_hoodie"
- hoodtype = /obj/item/clothing/head/hooded/hood
/obj/item/clothing/suit/straight_jacket
name = "straight jacket"
@@ -915,7 +908,6 @@
icon_state = "secgreatcoat"
item_state = "secgreatcoat"
w_class = WEIGHT_CLASS_NORMAL
- ignore_suitadjust = TRUE
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
heat_protection = UPPER_TORSO|LOWER_TORSO|ARMS
@@ -1005,10 +997,8 @@
desc = "A vintage classic, loved by rockers, rebels, and punks alike."
icon_state = "motojacket_open"
item_state = "motojacket_open"
- ignore_suitadjust = FALSE
suit_adjusted = TRUE
actions_types = list(/datum/action/item_action/zipper)
- adjust_flavour = "unzip"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
@@ -1034,13 +1024,8 @@
icon_state = "bomber"
item_state = "bomber"
icon_override = 'icons/mob/clothing/suits/coat.dmi'
- ignore_suitadjust = FALSE
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
- body_parts_covered = UPPER_TORSO | LOWER_TORSO | ARMS
- cold_protection = UPPER_TORSO | LOWER_TORSO | ARMS
- min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
actions_types = list(/datum/action/item_action/zipper)
- adjust_flavour = "unzip"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suits/coat.dmi',
@@ -1382,7 +1367,6 @@
desc = "The hands float by themselves, so it's extra spooky."
icon_state = "ghost_sheet"
item_state = "ghost_sheet"
- throwforce = 0
throw_speed = 1
throw_range = 2
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm
index 2e028575771..e912e152373 100644
--- a/code/modules/clothing/suits/utility.dm
+++ b/code/modules/clothing/suits/utility.dm
@@ -98,7 +98,6 @@
strip_delay = 70
put_on_delay = 70
resistance_flags = NONE
- dyeable = FALSE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm
index c34addf3d7c..cca29baf0e7 100644
--- a/code/modules/clothing/suits/wiz_robe.dm
+++ b/code/modules/clothing/suits/wiz_robe.dm
@@ -44,7 +44,6 @@
)
/obj/item/clothing/head/wizard/fake
- name = "wizard hat"
desc = "It has WIZZARD written across it in sequins. Comes with a cool beard."
icon_state = "wizard-fake"
gas_transfer_coefficient = 1
@@ -52,7 +51,6 @@
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
magical = FALSE
resistance_flags = FLAMMABLE
- dog_fashion = /datum/dog_fashion/head/blue_wizard
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/head.dmi'
)
@@ -151,10 +149,8 @@
item_state = "psyamp"
/obj/item/clothing/suit/wizrobe/fake
- name = "wizard robe"
desc = "A rather dull, blue robe meant to mimick real wizard robes."
icon_state = "wizard-fake"
- item_state = "wizrobe"
gas_transfer_coefficient = 1
permeability_coefficient = 1
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
@@ -162,9 +158,6 @@
magical = FALSE
/obj/item/clothing/head/wizard/marisa/fake
- name = "witch hat"
- desc = "Strange-looking hat-wear, makes you want to cast fireballs."
- icon_state = "marisa"
gas_transfer_coefficient = 1
permeability_coefficient = 1
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
@@ -172,10 +165,6 @@
magical = FALSE
/obj/item/clothing/suit/wizrobe/marisa/fake
- name = "witch robe"
- desc = "Magic is all about the spell power, ZE!"
- icon_state = "marisa"
- item_state = "marisarobe"
gas_transfer_coefficient = 1
permeability_coefficient = 1
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
@@ -189,8 +178,6 @@
desc = "Not all wizards are afraid of getting up close and personal."
icon_state = "hardsuit-wiz"
item_state = "wiz_hardsuit"
- min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
- max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/wizard
armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 25, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
slowdown = 0
@@ -213,8 +200,6 @@
/obj/item/clothing/suit/space/hardsuit/wizard/arch
desc = "For the arch wizard in need of additional protection."
- min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
- max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/wizard/arch
/obj/item/clothing/suit/space/hardsuit/wizard/arch/setup_shielding()
@@ -226,8 +211,6 @@
icon_state = "hardsuit0-wiz"
item_state = "wiz_helm"
item_color = "wiz"
- min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
- max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
armor = list(MELEE = 35, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 25, RAD = 50, FIRE = INFINITY, ACID = INFINITY)
actions_types = list() //No inbuilt light
resistance_flags = FIRE_PROOF | ACID_PROOF
@@ -238,5 +221,3 @@
/obj/item/clothing/head/helmet/space/hardsuit/wizard/arch
desc = "A truly protective helmet."
- min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
- max_heat_protection_temperature = SPACE_HELM_MAX_TEMP_PROTECT
diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm
index 95c384d877e..25e80060303 100644
--- a/code/modules/clothing/under/accessories/accessory.dm
+++ b/code/modules/clothing/under/accessories/accessory.dm
@@ -6,7 +6,6 @@
item_state = ""
item_color = ""
slot_flags = ITEM_SLOT_ACCESSORY
- w_class = WEIGHT_CLASS_SMALL
var/slot = ACCESSORY_SLOT_DECOR
/// the suit the accessory may be attached to
var/obj/item/clothing/under/has_suit = null
diff --git a/code/modules/clothing/under/accessories/holster.dm b/code/modules/clothing/under/accessories/holster.dm
index 2307688228b..1693a3ecd5d 100644
--- a/code/modules/clothing/under/accessories/holster.dm
+++ b/code/modules/clothing/under/accessories/holster.dm
@@ -110,14 +110,9 @@
unholster(user)
/obj/item/clothing/accessory/holster/armpit
- name = "shoulder holster"
desc = "A worn-out handgun holster. Perfect for concealed carry"
- icon_state = "holster"
- item_color = "holster"
holster_allow = list(/obj/item/gun/projectile, /obj/item/gun/energy/detective)
/obj/item/clothing/accessory/holster/waist
- name = "shoulder holster"
desc = "A handgun holster. Made of expensive leather."
- icon_state = "holster"
item_color = "holster_low"
diff --git a/code/modules/clothing/under/accessories/storage_accessories.dm b/code/modules/clothing/under/accessories/storage_accessories.dm
index aa8e75f392e..28142b8d0bb 100644
--- a/code/modules/clothing/under/accessories/storage_accessories.dm
+++ b/code/modules/clothing/under/accessories/storage_accessories.dm
@@ -76,8 +76,6 @@
/obj/item/clothing/accessory/storage/webbing
name = "webbing"
desc = "Sturdy mess of synthcotton belts and buckles, ready to share your burden."
- icon_state = "webbing"
- item_color = "webbing"
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi'
diff --git a/code/modules/clothing/under/centcom.dm b/code/modules/clothing/under/centcom.dm
index a84ad49065e..02235e6f33a 100644
--- a/code/modules/clothing/under/centcom.dm
+++ b/code/modules/clothing/under/centcom.dm
@@ -24,7 +24,6 @@
icon_state = "deathsquad"
item_state = "deathsquad"
item_color = "deathsquad"
- sensor_mode = SENSOR_OFF // You think the Deathsquad wants to be seen?
random_sensor = FALSE
/obj/item/clothing/under/rank/centcom/ert/chaplain
@@ -108,6 +107,5 @@
name = "\improper Nanotrasen diplomatic uniform"
desc = "A very gaudy and official looking uniform of the Nanotrasen Diplomatic Corps."
icon_state = "presidente"
- item_state = "g_suit"
item_color = "presidente"
displays_id = FALSE
diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm
index e21b8d523c8..478f18040d7 100644
--- a/code/modules/clothing/under/color.dm
+++ b/code/modules/clothing/under/color.dm
@@ -93,7 +93,6 @@
name = "ancient jumpsuit"
desc = "A terribly ragged and frayed grey jumpsuit. It looks like it hasn't been washed in over a decade."
icon_state = "ancient"
- item_state = "gy_suit"
item_color = "ancient"
/obj/item/clothing/under/color/orange
@@ -111,7 +110,6 @@
item_color = "orangeskirt"
/obj/item/clothing/under/color/orange/prison
- name = "orange jumpsuit"
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
icon_state = "prisoner"
item_state = "prisoner"
@@ -120,7 +118,6 @@
sensor_mode = SENSOR_COORDS
/obj/item/clothing/under/color/jumpskirt/orange/prison
- name = "orange jumpskirt"
desc = "It's standardised Nanotrasen prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position."
icon_state = "prisonerjumpskirt"
item_state = "prisoner"
@@ -322,12 +319,10 @@
name = "red team jersey"
desc = "The jersey of the Nanotrasen Phi-ghters!"
icon_state = "redjersey"
- item_state = "r_suit"
item_color = "redjersey"
/obj/item/clothing/under/color/blue/jersey
name = "blue team jersey"
desc = "The jersey of the Nanotrasen Pi-rates!"
icon_state = "bluejersey"
- item_state = "b_suit"
item_color = "bluejersey"
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 3554df6a050..1dbe0d2feb4 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -94,7 +94,6 @@
/obj/item/clothing/under/rank/civilian/clown/skirt
name = "clown skirt"
- desc = "'HONK!'"
icon_state = "clown_skirt"
item_state = "clown_skirt"
item_color = "clown_skirt"
@@ -118,7 +117,6 @@
/obj/item/clothing/under/rank/civilian/mime/skirt
name = "mime's skirt"
- desc = "It's not very colourful."
icon_state = "mime_skirt"
item_state = "mime_skirt"
item_color = "mime_skirt"
diff --git a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm
index 10dbd3b5ab8..2c4272ed277 100644
--- a/code/modules/clothing/under/jobs/engineering_jumpsuits.dm
+++ b/code/modules/clothing/under/jobs/engineering_jumpsuits.dm
@@ -36,7 +36,6 @@
resistance_flags = NONE
/obj/item/clothing/under/rank/engineering/atmospheric_technician/contortionist
- name = "atmospheric technician's jumpsuit"
desc = "A light jumpsuit useful for squeezing through narrow vents."
resistance_flags = FIRE_PROOF
diff --git a/code/modules/clothing/under/jobs/medical_jumpsuits.dm b/code/modules/clothing/under/jobs/medical_jumpsuits.dm
index ebb1d2caa5c..e9f5cad37ec 100644
--- a/code/modules/clothing/under/jobs/medical_jumpsuits.dm
+++ b/code/modules/clothing/under/jobs/medical_jumpsuits.dm
@@ -138,7 +138,6 @@
/obj/item/clothing/under/rank/medical/paramedic/skirt
name = "paramedic's jumpskirt"
- desc = "It's made of a special fiber that provides minor protection against biohazards and radiation. It has a cross on the back denoting that the wearer is trained medical personnel."
icon_state = "paramedic_skirt"
item_state = "paramedic_skirt"
item_color = "paramedic_skirt"
diff --git a/code/modules/clothing/under/jobs/plasmamen/engineering_plasmasuits.dm b/code/modules/clothing/under/jobs/plasmamen/engineering_plasmasuits.dm
index 66f4d2c15a4..32926e57713 100644
--- a/code/modules/clothing/under/jobs/plasmamen/engineering_plasmasuits.dm
+++ b/code/modules/clothing/under/jobs/plasmamen/engineering_plasmasuits.dm
@@ -21,7 +21,6 @@
item_color = "atmos_envirosuit"
/obj/item/clothing/under/plasmaman/atmospherics/contortionist
- name = "atmospherics plasma envirosuit"
desc = "An airtight suit designed to be used by plasmemen for squeezing through narrow vents."
resistance_flags = FIRE_PROOF
diff --git a/code/modules/clothing/under/jobs/security_jumpsuits.dm b/code/modules/clothing/under/jobs/security_jumpsuits.dm
index d92bf4123b6..67f73bf0f2a 100644
--- a/code/modules/clothing/under/jobs/security_jumpsuits.dm
+++ b/code/modules/clothing/under/jobs/security_jumpsuits.dm
@@ -21,7 +21,6 @@
name = "warden's jumpskirt"
desc = "Standard feminine fashion for a Warden. It is made of sturdier material than standard jumpskirts. It has the word \"Warden\" written on the shoulders."
icon_state = "warden_skirt"
- item_state = "r_suit"
item_color = "warden_skirt"
/obj/item/clothing/under/rank/security/warden/skirt/corporate
@@ -44,7 +43,6 @@
name = "security officer's jumpskirt"
desc = "Standard feminine fashion for Security Officers. It's made of sturdier material than the standard jumpskirts."
icon_state = "security_skirt"
- item_state = "r_suit"
item_color = "security_skirt"
/obj/item/clothing/under/rank/security/officer/skirt/corporate
@@ -78,7 +76,6 @@
name = "security officer's uniform"
desc = "It's made of a slightly sturdier material, to allow for robust protection."
icon_state = "redshirt" //pants, actually
- item_state = "r_suit"
item_color = "redshirt"
/obj/item/clothing/under/rank/security/officer/corporate
@@ -137,7 +134,6 @@
name = "head of security's jumpskirt"
desc = "It's a fashionable jumpskirt worn by those few with the dedication to achieve the position of \"Head of Security\". It has additional armor to protect the wearer."
icon_state = "hos_skirt"
- item_state = "r_suit"
item_color = "hos_skirt"
dyeable = TRUE
dyeing_key = DYE_REGISTRY_JUMPSKIRT
@@ -163,13 +159,11 @@
name = "warden's suit"
desc = "A formal security suit for the warden with blue desginations and '/Warden/' stiched into the shoulders."
icon_state = "warden_formal"
- item_state = "gy_suit"
item_color = "warden_formal"
/obj/item/clothing/under/rank/security/formal/head_of_security
name = "head of security's suit"
desc = "A security suit decorated for those few with the dedication to achieve the position of Head of Security."
icon_state = "hos_formal"
- item_state = "gy_suit"
item_color = "hos_formal"
diff --git a/code/modules/clothing/under/misc_jumpsuits.dm b/code/modules/clothing/under/misc_jumpsuits.dm
index 5d49a6258f6..e04b2b212ae 100644
--- a/code/modules/clothing/under/misc_jumpsuits.dm
+++ b/code/modules/clothing/under/misc_jumpsuits.dm
@@ -1,7 +1,6 @@
/obj/item/clothing/under/misc
desc = "A standard issue colored jumpsuit. Variety is the spice of life!"
dyeable = TRUE
- icon = 'icons/obj/clothing/under/misc.dmi'
sprite_sheets = list(
"Human" = 'icons/mob/clothing/under/misc.dmi',
diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm
index 6d85efc99e7..3b1aef37377 100644
--- a/code/modules/clothing/under/pants.dm
+++ b/code/modules/clothing/under/pants.dm
@@ -106,9 +106,7 @@
/obj/item/clothing/under/pants/shorts
name = "athletic shorts"
desc = "95% Polyester, 5% Spandex!"
- gender = PLURAL
body_parts_covered = LOWER_TORSO
- displays_id = FALSE
/obj/item/clothing/under/pants/shorts/red
icon_state = "redshorts"
diff --git a/code/modules/clothing/under/syndicate_jumpsuits.dm b/code/modules/clothing/under/syndicate_jumpsuits.dm
index 659bd623328..890eb8e99ff 100644
--- a/code/modules/clothing/under/syndicate_jumpsuits.dm
+++ b/code/modules/clothing/under/syndicate_jumpsuits.dm
@@ -33,7 +33,6 @@
name = "tacticool turtleneck"
desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
icon_state = "tactifool"
- item_state = "bl_suit"
item_color = "tactifool"
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 35)
@@ -41,11 +40,9 @@
name = "tactical suit"
desc = "A double seamed tactical turtleneck disguised as a civilian grade silk suit. Intended for the most formal operator. The collar is really sharp."
icon_state = "tactical_suit"
- item_state = "bl_suit"
item_color = "tactical_suit"
/obj/item/clothing/under/syndicate/silicon_cham
- name = "tactical turtleneck"
desc = "A non-descript and slightly suspicious looking turtleneck with digital camouflage cargo pants. This one has extra cybernetic modifications."
blockTracking = TRUE
diff --git a/code/modules/cooking/autochef/autochef_guide.dm b/code/modules/cooking/autochef/autochef_guide.dm
index 307b83e7537..a9f7090b09c 100644
--- a/code/modules/cooking/autochef/autochef_guide.dm
+++ b/code/modules/cooking/autochef/autochef_guide.dm
@@ -1,6 +1,5 @@
/obj/item/paper/autochef_quickstart
name = "Quickstart Guide: Autochef"
- icon_state = "paper"
info = {"You and Your Autochef: Quickstart
To use your autochef, it must be linked to all the tools and items you want it to use.
diff --git a/code/modules/cooking/cooking_container.dm b/code/modules/cooking/cooking_container.dm
index 33d07d986c4..8ace9dc6004 100644
--- a/code/modules/cooking/cooking_container.dm
+++ b/code/modules/cooking/cooking_container.dm
@@ -6,7 +6,6 @@
/// Abstract reagent container used for transferring from non-containers e.g. sinks
/obj/item/reagent_containers/temp
container_type = OPENCONTAINER
- amount_per_transfer_from_this = 5
list_reagents = list("water" = 5)
/**
@@ -327,7 +326,6 @@
throwforce = 5
throw_speed = 3
throw_range = 3
- w_class = WEIGHT_CLASS_SMALL
attack_verb = list("rolled", "cracked", "battered", "thrashed")
/obj/item/reagent_containers/cooking/oven
diff --git a/code/modules/cooking/machines/cooking_machine.dm b/code/modules/cooking/machines/cooking_machine.dm
index 436e8af5e6a..6d886364ec7 100644
--- a/code/modules/cooking/machines/cooking_machine.dm
+++ b/code/modules/cooking/machines/cooking_machine.dm
@@ -6,7 +6,6 @@ RESTRICT_TYPE(/obj/machinery/cooking)
icon = 'icons/obj/cooking/machines.dmi'
density = TRUE
anchored = TRUE
- layer = BELOW_OBJ_LAYER
idle_power_consumption = 5
active_power_consumption = 100
diff --git a/code/modules/cooking/machines/deep_fryer.dm b/code/modules/cooking/machines/deep_fryer.dm
index 31194bdfd93..4bc306d219e 100644
--- a/code/modules/cooking/machines/deep_fryer.dm
+++ b/code/modules/cooking/machines/deep_fryer.dm
@@ -8,10 +8,6 @@
name = "deep fryer"
desc = "A deep fryer that can hold two baskets."
icon_state = "deep_fryer"
- density = TRUE
- anchored = TRUE
- layer = BELOW_OBJ_LAYER
- cooking = FALSE
allowed_containers = list(
/obj/item/reagent_containers/cooking/deep_basket,
)
diff --git a/code/modules/cooking/machines/grill.dm b/code/modules/cooking/machines/grill.dm
index 6ff9de814a3..49705a631b7 100644
--- a/code/modules/cooking/machines/grill.dm
+++ b/code/modules/cooking/machines/grill.dm
@@ -18,7 +18,6 @@
icon_state = "blank"
vis_flags = VIS_INHERIT_ID
mouse_opacity = 0
- invisibility = 0
// TODO: add back special attack for grill for v2
// Yes, that's a v2 thing, I'm not doing it right now
@@ -27,8 +26,6 @@
desc = "A deep pit of charcoal for cooking food. A slot on the side of the machine takes wood and converts it into charcoal."
icon_state = "grill"
density = FALSE
- anchored = TRUE
- layer = BELOW_OBJ_LAYER
pass_flags = PASSTABLE
interact_offline = TRUE
active_power_consumption = 50 // uses more wood than power
diff --git a/code/modules/cooking/machines/oven.dm b/code/modules/cooking/machines/oven.dm
index 38cc330aa35..70c39e74d7c 100644
--- a/code/modules/cooking/machines/oven.dm
+++ b/code/modules/cooking/machines/oven.dm
@@ -16,10 +16,6 @@
name = "oven"
desc = "A cozy oven for baking food."
icon_state = "oven"
- density = TRUE
- anchored = TRUE
- layer = BELOW_OBJ_LAYER
- cooking = FALSE
var/opened = FALSE
var/on_fire = FALSE //if the oven has caught fire or not.
diff --git a/code/modules/cooking/machines/stovetop.dm b/code/modules/cooking/machines/stovetop.dm
index 0a2e5bd0637..3fec01ee147 100644
--- a/code/modules/cooking/machines/stovetop.dm
+++ b/code/modules/cooking/machines/stovetop.dm
@@ -7,9 +7,6 @@
desc = "An electric stovetop with four burners."
icon_state = "stove"
density = FALSE
- anchored = TRUE
- layer = BELOW_OBJ_LAYER
- cooking = FALSE
pass_flags = PASSTABLE
allowed_containers = list(
/obj/item/reagent_containers/cooking/pot,
diff --git a/code/modules/countdown/countdown.dm b/code/modules/countdown/countdown.dm
index 1d11da9dc5d..2531bcfd333 100644
--- a/code/modules/countdown/countdown.dm
+++ b/code/modules/countdown/countdown.dm
@@ -6,7 +6,6 @@
To earth, who can tell?"
invisibility = INVISIBILITY_OBSERVER
- anchored = TRUE
layer = MASSIVE_OBJ_LAYER
color = "#ff0000" // text color
var/text_size = 3 // larger values clip when the displayed text is larger than 2 digits.
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index 1cdcec593f9..891905a2cee 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -698,7 +698,6 @@
/obj/item/grenade/chem_grenade = 2
)
parts = list(/obj/item/stock_parts/matter_bin = 1, /obj/item/grenade/chem_grenade = 2)
- time = 30
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
alert_admins_on_craft = TRUE
@@ -731,7 +730,6 @@
/datum/crafting_recipe/bonearmor
name = "Bone Armor"
result = list(/obj/item/clothing/suit/armor/bone)
- time = 30
reqs = list(/obj/item/stack/sheet/bone = 6)
category = CAT_PRIMAL
@@ -762,7 +760,6 @@
/datum/crafting_recipe/skullhelm
name = "Skull Helmet"
result = list(/obj/item/clothing/head/helmet/skull)
- time = 30
reqs = list(/obj/item/stack/sheet/bone = 4)
category = CAT_PRIMAL
@@ -809,7 +806,6 @@
/datum/crafting_recipe/bonespear
name = "Bone Spear"
result = list(/obj/item/spear/bonespear)
- time = 30
reqs = list(/obj/item/stack/sheet/bone = 4,
/obj/item/stack/sheet/sinew = 1)
category = CAT_PRIMAL
@@ -849,14 +845,12 @@
/// Category resorting incoming
/datum/crafting_recipe/rake
name = "Rake"
- time = 30
reqs = list(/obj/item/stack/sheet/wood = 5)
result = list(/obj/item/cultivator/rake)
category = CAT_PRIMAL
/datum/crafting_recipe/woodbucket
name = "Wooden Bucket"
- time = 30
reqs = list(/obj/item/stack/sheet/wood = 3)
result = list(/obj/item/reagent_containers/glass/bucket/wooden)
category = CAT_PRIMAL
@@ -874,7 +868,6 @@
/datum/crafting_recipe/ghettojetpack
name = "Improvised Jetpack"
result = list(/obj/item/tank/jetpack/improvised)
- time = 30
reqs = list(/obj/item/tank/internals/oxygen = 2, /obj/item/extinguisher = 1, /obj/item/pipe = 3, /obj/item/stack/cable_coil = MAXCOIL)
category = CAT_MISC
tools = list(TOOL_WRENCH, TOOL_WELDER, TOOL_WIRECUTTER)
@@ -949,24 +942,18 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/singleeye)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen, /obj/item/toy/crayon/blue)
- category = CAT_DECORATIONS
- subcategory = CAT_DECORATION
/datum/crafting_recipe/paper_craft/googlyeyes
name = "Paper Googly Eye"
result = list(/obj/item/decorations/sticky_decorations/flammable/googlyeyes)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen)
- category = CAT_DECORATIONS
- subcategory = CAT_DECORATION
/datum/crafting_recipe/paper_craft/clock
name = "Paper Clock"
result = list(/obj/item/decorations/sticky_decorations/flammable/paperclock)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen)
- category = CAT_DECORATIONS
- subcategory = CAT_DECORATION
/datum/crafting_recipe/paper_craft/jack_o_lantern
name = "Paper Jack o'Lantern"
@@ -975,7 +962,6 @@
pathtools = list(/obj/item/pen,
/obj/item/toy/crayon/orange,
/obj/item/toy/crayon/green)//pen ink is black
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/ghost
@@ -983,7 +969,6 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/ghost)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen)//it's white paper why need a white crayon?
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/spider
@@ -992,7 +977,6 @@
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen,
/obj/item/toy/crayon/red)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/spiderweb
@@ -1000,7 +984,6 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/spiderweb)
tools = list(TOOL_WIRECUTTER)
pathtools = list()
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/skull
@@ -1008,7 +991,6 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/skull)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/skeleton
@@ -1016,7 +998,6 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/skeleton)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/cauldron
@@ -1024,7 +1005,6 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/cauldron)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/snowman
@@ -1033,7 +1013,6 @@
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen,
/obj/item/toy/crayon/orange)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/christmas_stocking
@@ -1041,7 +1020,6 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/christmas_stocking)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/red)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/christmas_tree
@@ -1052,7 +1030,6 @@
/obj/item/toy/crayon/yellow,
/obj/item/toy/crayon/blue,
/obj/item/toy/crayon/green)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/snowflake
@@ -1060,7 +1037,6 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/snowflake)
tools = list(TOOL_WIRECUTTER)
pathtools = list()
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/candy_cane
@@ -1068,7 +1044,6 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/candy_cane)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/red)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/mistletoe
@@ -1077,7 +1052,6 @@
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/red,
/obj/item/toy/crayon/green)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/holly
@@ -1086,107 +1060,88 @@
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/red,
/obj/item/toy/crayon/green)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/tinsel_white
name = "Paper Tinsel White"
- time = 10
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
pathtools = list()
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/tinsel_red
name = "Red Paper Tinsel"
- time = 10
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/red)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/red)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/tinsel_blue
name = "Blue Paper Tinsel"
- time = 10
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/blue)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/blue)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/tinsel_yellow
name = "Yellow Paper Tinsel"
- time = 10
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/yellow)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/yellow)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/tinsel_purple
name = "Purple Paper Tinsel"
- time = 10
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/purple)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/purple)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/tinsel_green
name = "Green Paper Tinsel"
- time = 10
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/green)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/green)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/tinsel_orange
name = "Orange Paper Tinsel"
- time = 10
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/orange)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/orange)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/tinsel_black
name = "Black Paper Tinsel"
- time = 10
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/black)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/tinsel_halloween
name = "Halloween style Paper Tinsel"
- time = 10
result = list(/obj/item/decorations/sticky_decorations/flammable/tinsel/halloween)
reqs = list(/obj/item/paper = 1,
/obj/item/stack/tape_roll = 2)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen,
/obj/item/toy/crayon/orange)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/arrowed_heart
@@ -1194,7 +1149,6 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/arrowed_heart)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/red)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/heart_chain
@@ -1205,7 +1159,6 @@
/obj/item/stack/cable_coil = 2)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/red)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/four_leaf_clover
@@ -1213,7 +1166,6 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/four_leaf_clover)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/green)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/pot_of_gold
@@ -1227,18 +1179,15 @@
/obj/item/toy/crayon/green,
/obj/item/toy/crayon/blue,
/obj/item/toy/crayon/purple)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/leprechaun_hat
name = "Paper Leprechaun Hat"
- time = 10
result = list(/obj/item/decorations/sticky_decorations/flammable/leprechaun_hat)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/pen,
/obj/item/toy/crayon/yellow,
/obj/item/toy/crayon/green)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/easter_bunny
@@ -1248,7 +1197,6 @@
pathtools = list(/obj/item/pen,
/obj/item/toy/crayon/blue,
/obj/item/toy/crayon/purple)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/easter_egg_blue
@@ -1256,7 +1204,6 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/easter_egg)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/blue)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/easter_egg_yellow
@@ -1264,7 +1211,6 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/easter_egg/yellow)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/yellow)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/easter_egg_red
@@ -1272,7 +1218,6 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/easter_egg/red)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/red)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/easter_egg_purple
@@ -1280,7 +1225,6 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/easter_egg/purple)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/purple)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/paper_craft/easter_egg_orange
@@ -1288,7 +1232,6 @@
result = list(/obj/item/decorations/sticky_decorations/flammable/easter_egg/orange)
tools = list(TOOL_WIRECUTTER)
pathtools = list(/obj/item/toy/crayon/orange)
- category = CAT_DECORATIONS
subcategory = CAT_HOLIDAY
/datum/crafting_recipe/metal_angel_statue
@@ -1382,7 +1325,6 @@
/datum/crafting_recipe/gauze
name = "Treated gauze"
- time = 3 SECONDS
result = list(/obj/item/stack/medical/bruise_pack)
reqs = list(/obj/item/stack/medical/bruise_pack/improvised = 6,
/datum/reagent/medicine/heal_on_apply/styptic_powder = 30,
@@ -1391,7 +1333,6 @@
/datum/crafting_recipe/ointment
name = "Ointment"
- time = 3 SECONDS
result = list(/obj/item/stack/medical/ointment)
reqs = list(/obj/item/stack/sheet/plastic = 2,
/datum/reagent/water = 10,
diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 3813ce60123..ac5dd0dc135 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -17,7 +17,6 @@
var/used = FALSE
/obj/item/clothing/suit/hooded/hoodie/fluff
- w_class = WEIGHT_CLASS_SMALL
/obj/item/clothing/suit/hooded/fluff
w_class = WEIGHT_CLASS_SMALL
@@ -28,15 +27,12 @@
desc = "A cheap plastic tattoo application pen."
icon = 'icons/obj/custom_items.dmi'
icon_state = "tatgun"
- force = 0
- throwforce = 0
w_class = WEIGHT_CLASS_TINY
var/tattoo_name = "tiger stripe tattoo" // Tat name for visible messages
var/tattoo_icon = "Tiger-stripe Tattoo" // body_accessory.dmi, new icons defined in sprite_accessories.dm
var/tattoo_r = 1 // RGB values for the body markings
var/tattoo_g = 1
var/tattoo_b = 1
- toolspeed = 1
usesound = 'sound/items/welder2.ogg'
/obj/item/fluff/tattoo_gun/attack__legacy__attackchain(mob/living/carbon/M as mob, mob/user as mob)
@@ -160,7 +156,6 @@
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
force = 5
- sharp = FALSE
flags = CONDUCT
slot_flags = ITEM_SLOT_BELT
throwforce = 5
@@ -177,7 +172,6 @@
desc = "A pink crowbar that has an engraving that reads, 'To Zelda. Love always, Dawn'"
icon = 'icons/obj/custom_items.dmi'
icon_state = "zeldacrowbar"
- item_state = "crowbar"
/// Trubus: Wolf O'Shaw
/obj/item/clothing/glasses/monocle/fluff/trubus
@@ -307,8 +301,6 @@
icon_state = "wingler_comb"
attack_verb = list("combed")
hitsound = 'sound/weapons/tap.ogg'
- force = 0
- throwforce = 0
w_class = WEIGHT_CLASS_SMALL
/obj/item/fluff/wingler_comb/attack_self__legacy__attackchain(mob/user)
@@ -415,8 +407,6 @@
desc = "Some spraypaint and a stencil, perfect for painting flames onto a welding helmet!"
icon_state = "modkit"
w_class = WEIGHT_CLASS_SMALL
- force = 0
- throwforce = 0
/obj/item/fluff/cardgage_helmet_kit/afterattack__legacy__attackchain(atom/target, mob/user, proximity)
if(!proximity || !ishuman(user) || user.incapacitated())
@@ -438,8 +428,6 @@
desc = "A modkit that can make most helmets look like a Shellguard Helmet."
icon_state = "modkit"
w_class = WEIGHT_CLASS_SMALL
- force = 0
- throwforce = 0
/obj/item/fluff/merchant_sallet_modkit/afterattack__legacy__attackchain(atom/target, mob/user, proximity)
if(!proximity || !ishuman(user) || user.incapacitated())
@@ -482,8 +470,6 @@
desc = "A modkit that can be used to turn certain vests and labcoats into lightweight webbing."
icon_state = "modkit"
w_class = 2
- force = 0
- throwforce = 0
/obj/item/fluff/k3_webbing_modkit/afterattack__legacy__attackchain(atom/target, mob/user, proximity)
if(!proximity || !ishuman(user) || user.incapacitated())
@@ -673,8 +659,6 @@
/obj/item/clothing/head/pirate/fluff/stumpy
name = "The Sobriety Skullcap"
desc = "A hat suited for the king of the pirates."
- icon_state = "pirate"
- item_state = "pirate"
/obj/item/clothing/head/pirate/fluff/stumpy/Initialize(mapload)
. = ..()
@@ -764,7 +748,6 @@
/obj/item/clothing/suit/fluff
icon = 'icons/obj/custom_items.dmi'
actions_types = list()
- ignore_suitadjust = 1
adjust_flavour = null
sprite_sheets = null
@@ -837,7 +820,6 @@
/obj/item/clothing/suit/fluff/cheeky_sov_coat
name = "Srusu's Greatcoat"
desc = "A heavy wool Soviet-style greatcoat. A name is written in fancy handwriting on the inside tag: Srusu Rskuzu"
- icon = 'icons/obj/custom_items.dmi'
item_state = "cheeky_sov_coat"
icon_state = "cheeky_sov_coat"
@@ -890,7 +872,6 @@
/obj/item/clothing/suit/fluff/kluys
name = "Nano Fibre Jacket"
desc = "A Black Suit made out of nanofibre. The newest of cyberpunk fashion using hightech liquid to solid materials."
- icon = 'icons/obj/custom_items.dmi'
icon_state = "Kluysfluff1"
item_state = "Kluysfluff1"
blood_overlay_type = "coat"
@@ -938,7 +919,6 @@
/obj/item/clothing/suit/fluff/stobarico_greatcoat
name = "\improper F.U.R.R.Y's Nanotrasen Greatcoat"
desc = "A greatcoat with Nanotrasen colors."
- icon = 'icons/obj/custom_items.dmi'
icon_state = "stobarico_jacket"
@@ -996,7 +976,6 @@
sprite_sheets = list("Vox" = 'icons/mob/clothing/species/vox/suit.dmi')
ignore_suitadjust = 0
actions_types = list(/datum/action/item_action/toggle)
- suit_adjusted = 0
/obj/item/clothing/suit/storage/fluff/k3_webbing/adjustsuit(mob/user)
if(!user.incapacitated())
@@ -1023,7 +1002,6 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "xantholne_wintercoat"
hoodtype = /obj/item/clothing/head/hooded/hood/fluff/xantholne
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter)
@@ -1033,9 +1011,6 @@
desc = "A black hood attached to a stripped winter coat."
icon = 'icons/obj/custom_items.dmi'
icon_state = "xantholne_winterhood"
- body_parts_covered = HEAD
- flags = BLOCKHAIR
- flags_inv = HIDEEARS
/// Xydonus: Rsik Ugsharki Atan | Based off of the bomber jacket, but with a hood slapped on (for allowed suit storage)
/obj/item/clothing/suit/hooded/hoodie/fluff/xydonus
@@ -1045,7 +1020,6 @@
icon_state = "xydonus_jacket"
ignore_suitadjust = 0
hoodtype = /obj/item/clothing/head/hooded/hood/fluff/xydonus
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
allowed = list(/obj/item/flashlight,/obj/item/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter)
@@ -1054,9 +1028,6 @@
desc = "A hood with some horns glued to them, or something like that. Custom fit for a Unathi's head shape."
icon = 'icons/obj/custom_items.dmi'
icon_state = "xydonus_bomberhood"
- body_parts_covered = HEAD
- flags = BLOCKHAIR
- flags_inv = HIDEEARS
/// Pineapple Salad: Dan Jello
/obj/item/clothing/suit/fluff/pineapple
@@ -1072,8 +1043,6 @@
icon_state = "ps_hairgel"
attack_verb = list("smacked")
hitsound = 'sound/weapons/tap.ogg'
- force = 0
- throwforce = 0
w_class = WEIGHT_CLASS_SMALL
/obj/item/fluff/pinapplehairgel/attack_self__legacy__attackchain(mob/user)
@@ -1101,9 +1070,6 @@
desc = "A custom made winter coat hood. Looks comfy."
icon = 'icons/obj/custom_items.dmi'
icon_state = "shesicoat_hood2"
- body_parts_covered = HEAD
- flags = BLOCKHAIR
- flags_inv = HIDEEARS
/// AffectedArc07: DTX
/obj/item/clothing/suit/jacket/dtx
@@ -1112,12 +1078,8 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "dtxbomber"
item_state = "dtxbomber"
- ignore_suitadjust = 0
allowed = list(/obj/item/flashlight,/obj/item/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter)
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
- cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS
actions_types = list(/datum/action/item_action/zipper)
- adjust_flavour = "unzip"
sprite_sheets = null
//////////// Uniforms ////////////
@@ -1359,7 +1321,6 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "superior_mask"
item_state = "superior_mask"
- body_parts_covered = HEAD
flags = BLOCKHAIR
flags_inv = HIDEFACE
@@ -1458,7 +1419,6 @@
icon = 'icons/obj/custom_items.dmi'
icon_state = "elliot_windbreaker_open"
item_state = "elliot_windbreaker_open"
- adjust_flavour = "unzip"
suit_adjusted = 1
sprite_sheets = null
@@ -1536,8 +1496,6 @@
icon_state = "hand_mirror"
attack_verb = list("smacked")
hitsound = 'sound/weapons/tap.ogg'
- force = 0
- throwforce = 0
w_class = WEIGHT_CLASS_SMALL
/obj/item/fluff/zekemirror/attack_self__legacy__attackchain(mob/user)
@@ -1663,7 +1621,6 @@
/obj/item/clothing/suit/fluff/vetcoat
name = "Veteran Coat"
desc = "An old, yet well-kept Nanotrasen uniform. Very few of its kind are still produced."
- icon = 'icons/obj/custom_items.dmi'
lefthand_file = 'icons/mob/inhands/fluff_lefthand.dmi'
righthand_file = 'icons/mob/inhands/fluff_righthand.dmi'
icon_state = "alchemistcoatblack"
@@ -1688,7 +1645,6 @@
icon_state = "panzermedal"
item_state = "panzermedal"
item_color = "panzermedal"
- slot_flags = ITEM_SLOT_ACCESSORY
/// Sagrotter: Xann Zxiax
/obj/item/clothing/accessory/medal/fluff/xann_zxiax
@@ -1698,7 +1654,6 @@
icon_state = "Xann_necklace"
item_state = "Xann_necklace"
item_color = "Xann_necklace"
- slot_flags = ITEM_SLOT_ACCESSORY
/// Rb303: Isthel Eisenwald
/obj/item/clothing/accessory/rbscarf
@@ -1844,9 +1799,6 @@
/obj/item/clothing/accessory/pin/reward/coding
name = "Coding Contribution Pin"
desc = "A commemorative pin to reward contributions of coding."
- icon_state = "pin_coding"
- item_state = "pin_coding"
- item_color = "pin_coding"
/obj/item/clothing/accessory/pin/reward/mapping
name = "Mapping Contribution Pin"
diff --git a/code/modules/detective_work/footprints_and_rag.dm b/code/modules/detective_work/footprints_and_rag.dm
index 0e3c97665c7..cd69d549e0c 100644
--- a/code/modules/detective_work/footprints_and_rag.dm
+++ b/code/modules/detective_work/footprints_and_rag.dm
@@ -1,14 +1,12 @@
/obj/item/reagent_containers/glass/rag
name = "damp rag"
desc = "For cleaning up messes, you suppose."
- w_class = WEIGHT_CLASS_TINY
icon = 'icons/obj/toy.dmi'
icon_state = "rag"
amount_per_transfer_from_this = 5
possible_transfer_amounts = null
volume = 5
flags = NOBLUDGEON
- container_type = OPENCONTAINER
has_lid = FALSE
blocks_emissive = EMISSIVE_BLOCK_GENERIC
var/wipespeed = 30
diff --git a/code/modules/detective_work/scanner.dm b/code/modules/detective_work/scanner.dm
index 97279a55a4d..9cebdda6e8d 100644
--- a/code/modules/detective_work/scanner.dm
+++ b/code/modules/detective_work/scanner.dm
@@ -7,7 +7,6 @@
desc = "Used to remotely scan objects and biomass for DNA and fingerprints. Can print a report of the findings."
icon = 'icons/obj/device.dmi'
icon_state = "detective_scanner"
- w_class = WEIGHT_CLASS_NORMAL
item_state = "electronic"
flags = CONDUCT | NOBLUDGEON
slot_flags = ITEM_SLOT_BELT
diff --git a/code/modules/economy/economy_machinery/atm.dm b/code/modules/economy/economy_machinery/atm.dm
index 511c1b79191..2afb0eac480 100644
--- a/code/modules/economy/economy_machinery/atm.dm
+++ b/code/modules/economy/economy_machinery/atm.dm
@@ -11,7 +11,6 @@
desc = "For all your monetary needs! Just insert your ID card to make a withdrawal or deposit!"
icon = 'icons/obj/terminals.dmi'
icon_state = "atm"
- anchored = TRUE
idle_power_consumption = 10
density = FALSE
restricted_bypass = TRUE
diff --git a/code/modules/economy/economy_machinery/economy_machinery.dm b/code/modules/economy/economy_machinery/economy_machinery.dm
index 2a4516d37d2..ac7b999a8ed 100644
--- a/code/modules/economy/economy_machinery/economy_machinery.dm
+++ b/code/modules/economy/economy_machinery/economy_machinery.dm
@@ -7,7 +7,6 @@
desc = "A base economy machine."
anchored = TRUE
density = TRUE
- new_attack_chain = TRUE
///Can this machine access restricted money accounts?
var/restricted_bypass = FALSE
diff --git a/code/modules/economy/economy_machinery/eftpos.dm b/code/modules/economy/economy_machinery/eftpos.dm
index fa7e240740f..9b4e07f9fdf 100644
--- a/code/modules/economy/economy_machinery/eftpos.dm
+++ b/code/modules/economy/economy_machinery/eftpos.dm
@@ -250,7 +250,6 @@
force = 10
throwforce = 10
throw_speed = 1.5
- throw_range = 7
anchored = TRUE
w_class = WEIGHT_CLASS_BULKY
materials = list()
diff --git a/code/modules/events/anomaly_flux.dm b/code/modules/events/anomaly_flux.dm
index 41155a8c086..2ed3182998b 100644
--- a/code/modules/events/anomaly_flux.dm
+++ b/code/modules/events/anomaly_flux.dm
@@ -2,6 +2,3 @@
name = "Anomaly event"
startWhen = 10
announceWhen = 3
- anomaly_path = /obj/effect/anomaly/flux
- prefix_message = "Localized hyper-energetic flux wave detected on long range scanners."
- announce_sound = 'sound/AI/anomaly_flux.ogg'
diff --git a/code/modules/events/blob/blob_mobs.dm b/code/modules/events/blob/blob_mobs.dm
index 1f60e974f0c..0b29a557d36 100644
--- a/code/modules/events/blob/blob_mobs.dm
+++ b/code/modules/events/blob/blob_mobs.dm
@@ -15,7 +15,6 @@
maxbodytemp = 360
universal_speak = TRUE //So mobs can understand them when a blob uses Blob Broadcast
sentience_type = SENTIENCE_OTHER
- gold_core_spawnable = NO_SPAWN
can_be_on_fire = TRUE
fire_damage = 3
var/mob/camera/blob/overmind = null
@@ -64,7 +63,6 @@
melee_damage_lower = 2
melee_damage_upper = 4
obj_damage = 20
- environment_smash = ENVIRONMENT_SMASH_STRUCTURES
attacktext = "hits"
attack_sound = 'sound/weapons/genhit1.ogg'
initial_traits = list(TRAIT_FLYING)
@@ -189,11 +187,8 @@
attacktext = "hits"
attack_sound = 'sound/effects/blobattack.ogg'
speak_emote = list("gurgles")
- minbodytemp = 0
- maxbodytemp = 360
force_threshold = 10
mob_size = MOB_SIZE_LARGE
- environment_smash = ENVIRONMENT_SMASH_STRUCTURES
pressure_resistance = 50
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
diff --git a/code/modules/events/blob/blob_structures/blob_core.dm b/code/modules/events/blob/blob_structures/blob_core.dm
index 7383609950e..242b6fea1f3 100644
--- a/code/modules/events/blob/blob_structures/blob_core.dm
+++ b/code/modules/events/blob/blob_structures/blob_core.dm
@@ -1,6 +1,5 @@
/obj/structure/blob/core
name = "blob core"
- icon = 'icons/mob/blob.dmi'
icon_state = "blank_blob"
max_integrity = 400
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 75, ACID = 90)
diff --git a/code/modules/events/blob/blob_structures/captured_nuke.dm b/code/modules/events/blob/blob_structures/captured_nuke.dm
index 030b37d2408..a28efbcb766 100644
--- a/code/modules/events/blob/blob_structures/captured_nuke.dm
+++ b/code/modules/events/blob/blob_structures/captured_nuke.dm
@@ -5,7 +5,6 @@
desc = "A Nuclear Warhead tangled in blob tendrils pulsating with a horrific green glow."
max_integrity = 100
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 65, ACID = 90)
- point_return = 0
/obj/structure/blob/captured_nuke/Initialize(mapload, obj/machinery/nuclearbomb/N)
. = ..()
diff --git a/code/modules/events/blob/blob_structures/factory.dm b/code/modules/events/blob/blob_structures/factory.dm
index 13d7e44a9ec..047476ac579 100644
--- a/code/modules/events/blob/blob_structures/factory.dm
+++ b/code/modules/events/blob/blob_structures/factory.dm
@@ -2,7 +2,6 @@ GLOBAL_VAR_INIT(spores_active, 0)
#define MAX_GLOBAL_SPORES 25
/obj/structure/blob/factory
name = "factory blob"
- icon = 'icons/mob/blob.dmi'
icon_state = "blob_factory"
max_integrity = 200
point_return = 18
diff --git a/code/modules/events/blob/blob_structures/node.dm b/code/modules/events/blob/blob_structures/node.dm
index a02eac1f747..ce75e5ed44e 100644
--- a/code/modules/events/blob/blob_structures/node.dm
+++ b/code/modules/events/blob/blob_structures/node.dm
@@ -1,6 +1,5 @@
/obj/structure/blob/node
name = "blob node"
- icon = 'icons/mob/blob.dmi'
icon_state = "blank_blob"
max_integrity = 200
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 65, ACID = 90)
diff --git a/code/modules/events/blob/blob_structures/resource.dm b/code/modules/events/blob/blob_structures/resource.dm
index 4ef14ed4963..95a3f04c138 100644
--- a/code/modules/events/blob/blob_structures/resource.dm
+++ b/code/modules/events/blob/blob_structures/resource.dm
@@ -1,6 +1,5 @@
/obj/structure/blob/resource
name = "resource blob"
- icon = 'icons/mob/blob.dmi'
icon_state = "blob_resource"
max_integrity = 60
point_return = 12
diff --git a/code/modules/events/blob/blob_structures/storage_blob.dm b/code/modules/events/blob/blob_structures/storage_blob.dm
index ced60709575..2bcd2971935 100644
--- a/code/modules/events/blob/blob_structures/storage_blob.dm
+++ b/code/modules/events/blob/blob_structures/storage_blob.dm
@@ -1,8 +1,6 @@
/obj/structure/blob/storage
name = "storage blob"
- icon = 'icons/mob/blob.dmi'
icon_state = "blob_resource"
- max_integrity = 30
fire_resist = 2
point_return = 12
diff --git a/code/modules/events/blob/blob_structures/strong_blob.dm b/code/modules/events/blob/blob_structures/strong_blob.dm
index 51a9eb19ddb..c850ffd9917 100644
--- a/code/modules/events/blob/blob_structures/strong_blob.dm
+++ b/code/modules/events/blob/blob_structures/strong_blob.dm
@@ -1,8 +1,6 @@
/obj/structure/blob/shield
name = "strong blob"
- icon = 'icons/mob/blob.dmi'
icon_state = "blob_shield"
- desc = "Some blob creature thingy."
max_integrity = 150
brute_resist = 0.25
explosion_block = 3
@@ -10,7 +8,6 @@
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 90, ACID = 90)
/obj/structure/blob/shield/core
- point_return = 0
/obj/structure/blob/shield/check_integrity()
var/old_compromised_integrity = compromised_integrity
diff --git a/code/modules/events/blob/overmind.dm b/code/modules/events/blob/overmind.dm
index 40bf12b60c3..cf6013899e6 100644
--- a/code/modules/events/blob/overmind.dm
+++ b/code/modules/events/blob/overmind.dm
@@ -4,7 +4,6 @@
icon = 'icons/mob/blob.dmi'
icon_state = "marker"
- see_in_dark = 8
invisibility = INVISIBILITY_OBSERVER
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
mouse_opacity = MOUSE_OPACITY_OPAQUE
diff --git a/code/modules/events/blob/theblob.dm b/code/modules/events/blob/theblob.dm
index c5610ef97ce..dd789342f12 100644
--- a/code/modules/events/blob/theblob.dm
+++ b/code/modules/events/blob/theblob.dm
@@ -9,8 +9,6 @@ GLOBAL_LIST_EMPTY(blob_minions)
icon = 'icons/mob/blob.dmi'
light_range = 3
desc = "Some blob creature thingy."
- density = FALSE
- opacity = FALSE
anchored = TRUE
max_integrity = 30
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 80, ACID = 70)
diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm
index 58c3f61be91..311dbb17f49 100644
--- a/code/modules/events/dust.dm
+++ b/code/modules/events/dust.dm
@@ -14,7 +14,6 @@
icon = 'icons/obj/meteor.dmi'
icon_state = "dust"
density = TRUE
- anchored = TRUE
var/strength = 2 //ex_act severity number
var/life = 2 //how many things we hit before qdel(src)
var/atom/goal = null
diff --git a/code/modules/events/false_alarm.dm b/code/modules/events/false_alarm.dm
index 6f58a8b94b7..d451215a5bf 100644
--- a/code/modules/events/false_alarm.dm
+++ b/code/modules/events/false_alarm.dm
@@ -1,5 +1,4 @@
/datum/event/falsealarm
- announceWhen = 0
endWhen = 1
var/static/list/possible_event_types = list(
/datum/event/alien_infestation,
diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm
index a3dee1d6532..675a232eb02 100644
--- a/code/modules/events/immovable_rod.dm
+++ b/code/modules/events/immovable_rod.dm
@@ -26,7 +26,6 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
icon_state = "immrod"
throwforce = 100
density = TRUE
- anchored = TRUE
var/z_original = 0
var/notify = TRUE
var/move_delay = 0.5
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index ee3bba011b3..4801fd332b2 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -393,7 +393,6 @@
icon = 'icons/effects/spacevines.dmi'
icon_state = "Light1"
anchored = TRUE
- density = FALSE
layer = SPACEVINE_LAYER
mouse_opacity = MOUSE_OPACITY_OPAQUE //Clicking anywhere on the turf is good enough
pass_flags = PASSTABLE | PASSGRILLE
diff --git a/code/modules/events/vent_clog.dm b/code/modules/events/vent_clog.dm
index dba624a68bf..29b759a2dfa 100644
--- a/code/modules/events/vent_clog.dm
+++ b/code/modules/events/vent_clog.dm
@@ -1,5 +1,4 @@
/datum/event/vent_clog
- announceWhen = 0
startWhen = 5
endWhen = 35
var/interval = 2
diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm
index 42b43f179fb..0d045518dba 100644
--- a/code/modules/events/wormholes.dm
+++ b/code/modules/events/wormholes.dm
@@ -39,7 +39,6 @@
desc = "It looks highly unstable; It could close at any moment."
icon = 'icons/effects/effects.dmi'
icon_state = "anom"
- failchance = 0
/obj/effect/portal/wormhole/can_teleport(atom/movable/M)
. = ..()
diff --git a/code/modules/fish/fish_items.dm b/code/modules/fish/fish_items.dm
index 1f142522d47..8d4a4255c19 100644
--- a/code/modules/fish/fish_items.dm
+++ b/code/modules/fish/fish_items.dm
@@ -9,10 +9,8 @@
icon = 'icons/obj/fish_items.dmi'
icon_state = "egg_scoop"
slot_flags = ITEM_SLOT_BELT
- throwforce = 0
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
- throw_range = 7
/obj/item/fish_net
name = "fish net"
@@ -20,10 +18,8 @@
icon = 'icons/obj/fish_items.dmi'
icon_state = "net"
slot_flags = ITEM_SLOT_BELT
- throwforce = 0
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
- throw_range = 7
/obj/item/fish_net/suicide_act(mob/user) //"A tiny net is a death sentence: it's a net and it's tiny!" https://www.youtube.com/watch?v=FCI9Y4VGCVw
visible_message("[user] places [src] on top of [user.p_their()] head, [user.p_their()] fingers tangled in the netting! It looks like [user.p_theyre()] trying to commit suicide!")
@@ -37,7 +33,6 @@
throwforce = 1
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
- throw_range = 7
/obj/item/tank_brush
name = "aquarium brush"
@@ -45,10 +40,8 @@
icon = 'icons/obj/fish_items.dmi'
icon_state = "brush"
slot_flags = ITEM_SLOT_BELT
- throwforce = 0
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
- throw_range = 7
attack_verb = list("scrubbed", "brushed", "scraped")
/obj/item/tank_brush/suicide_act(mob/user)
@@ -107,7 +100,6 @@
throwforce = 1
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
- throw_range = 7
force = 1
attack_verb = list("slapped", "humiliated", "hit", "rubbed")
hitsound = 'sound/effects/snap.ogg'
@@ -146,7 +138,6 @@
name = "toothless shark"
desc = "Looks like someone ripped it's teeth out!"
icon_state = "shark"
- hitsound = 'sound/effects/snap.ogg'
/obj/item/shard/shark_teeth
name = "shark teeth"
diff --git a/code/modules/fish/fishtank.dm b/code/modules/fish/fishtank.dm
index 65efe5270b0..d4b35cbd919 100644
--- a/code/modules/fish/fishtank.dm
+++ b/code/modules/fish/fishtank.dm
@@ -9,9 +9,6 @@
desc = "So generic, it might as well have no description at all."
icon = 'icons/obj/fish_items.dmi'
icon_state = "tank1"
- density = FALSE
- anchored = FALSE
- pass_flags = 0
var/tank_type = "" // Type of aquarium, used for icon updating
var/water_capacity = 0 // Number of units the tank holds (varies with tank type)
@@ -33,22 +30,16 @@
name = "fish bowl"
desc = "A small bowl capable of housing a single fish, commonly found on desks. This one has a tiny treasure chest in it!"
icon_state = "bowl1"
- density = FALSE // Small enough to not block stuff
- anchored = FALSE // Small enough to move even when filled
pass_flags = PASSTABLE // Just like at the county fair, you can't seem to throw the ball in to win the goldfish, and it's small enough to pull onto a table
tank_type = "bowl"
water_capacity = 50 // Not very big, therefore it can't hold much
max_fish = 1 // What a lonely fish
- has_lid = FALSE
max_integrity = 15 // Not very sturdy
- shard_count = 0 // No salvageable shards
/obj/machinery/fishtank/tank
name = "fish tank"
desc = "A large glass tank designed to house aquatic creatures. Contains an integrated water circulation system."
- icon = 'icons/obj/fish_items.dmi'
- icon_state = "tank1"
density = TRUE
anchored = TRUE
pass_flags = null
@@ -68,7 +59,6 @@
icon_state = "wall1"
density = TRUE
anchored = TRUE
- pass_flags = 0 // This thing is the size of a wall, you can't throw past it.
tank_type = "wall"
water_capacity = 500 // This thing fills an entire tile, it holds a lot.
diff --git a/code/modules/food_and_drinks/drinks/drinks/cans.dm b/code/modules/food_and_drinks/drinks/drinks/cans.dm
index e84fecd9a31..fad8ee4aed2 100644
--- a/code/modules/food_and_drinks/drinks/drinks/cans.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/cans.dm
@@ -270,7 +270,6 @@
/obj/item/reagent_containers/drinks/cans/bottler/glass_bottle
name = "glass bottle"
desc = "A glass bottle suitable for beverages."
- icon_state = "glass_bottle"
is_glass = TRUE
/obj/item/reagent_containers/drinks/cans/bottler/plastic_bottle
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 009f0a5bd05..7502eaf3cca 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -6,7 +6,6 @@
icon_state = "glass_empty"
item_state = "drinking_glass"
amount_per_transfer_from_this = 10
- volume = 50
lefthand_file = 'icons/goonstation/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/goonstation/mob/inhands/items_righthand.dmi'
materials = list(MAT_GLASS = 100)
diff --git a/code/modules/food_and_drinks/drinks/drinks_base.dm b/code/modules/food_and_drinks/drinks/drinks_base.dm
index 40e22f83f97..17adae58a18 100644
--- a/code/modules/food_and_drinks/drinks/drinks_base.dm
+++ b/code/modules/food_and_drinks/drinks/drinks_base.dm
@@ -8,9 +8,7 @@
icon_state = null
container_type = OPENCONTAINER
possible_transfer_amounts = list(5,10,15,20,25,30,50)
- visible_transfer_rate = TRUE
volume = 50
- resistance_flags = NONE
var/consume_sound = 'sound/items/drink.ogg'
var/chugging = FALSE
@@ -106,15 +104,12 @@
name = "pewter cup"
desc = "Everyone gets a trophy."
icon_state = "pewter_cup"
- w_class = WEIGHT_CLASS_TINY
force = 1
throwforce = 1
- amount_per_transfer_from_this = 5
materials = list(MAT_METAL=100)
possible_transfer_amounts = null
volume = 5
flags = CONDUCT
- container_type = OPENCONTAINER
resistance_flags = FIRE_PROOF
/obj/item/reagent_containers/drinks/trophy/gold_cup
@@ -316,7 +311,6 @@
volume = 60
/obj/item/reagent_containers/drinks/flask/barflask
- name = "flask"
desc = "For those who can't be bothered to hang out at the bar to drink."
icon_state = "barflask"
@@ -374,7 +368,6 @@
/obj/item/reagent_containers/drinks/bag/goonbag
name = "goon from a Blue Toolbox special edition"
desc = "Wine from the land down under, where the dingos roam and the roos do wander."
- icon_state = "goonbag"
list_reagents = list("wine" = 70)
/obj/item/reagent_containers/drinks/oilcan
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index 2b29a8a7f90..6e0be4e7a0c 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -12,7 +12,6 @@
icon_state = "emptycondiment"
container_type = OPENCONTAINER
possible_transfer_amounts = list(1, 5, 10, 15, 20, 25, 30, 50)
- visible_transfer_rate = TRUE
volume = 50
//Possible_states has the reagent id as key and a list of, in order, the icon_state, the name and the desc as values. Used in the on_reagent_change() to change names, descs and sprites.
var/list/possible_states = list(
diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm
index 5f4199d3330..89285c0bb01 100644
--- a/code/modules/food_and_drinks/food/customizables.dm
+++ b/code/modules/food_and_drinks/food/customizables.dm
@@ -81,10 +81,6 @@ do {\
add_overlay(top_image)
/obj/item/food/customizable/sandwich
- name = "sandwich"
- desc = "A sandwich! A timeless classic."
- icon_state = "sandwichcustom"
- baseicon = "sandwichcustom"
basename = "sandwich"
/obj/item/food/customizable/pizza
diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm
index 412a691d620..b0c71d77fe7 100644
--- a/code/modules/food_and_drinks/food/foods/baked_goods.dm
+++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm
@@ -885,15 +885,11 @@
/obj/item/food/donut/jelly/slimejelly
name = "slime jelly donut"
- desc = "You jelly?"
- icon_state = "jdonut1"
extra_reagent = "slimejelly"
goal_difficulty = FOOD_GOAL_HARD
/obj/item/food/donut/jelly/cherryjelly
name = "cherry jelly donut"
- desc = "You jelly?"
- icon_state = "jdonut1"
extra_reagent = "cherryjelly"
/obj/item/food/donut/apple
@@ -907,20 +903,13 @@
/obj/item/food/donut/apple/jelly
name = "jelly apple donut"
- desc = "Goes great with a shot of cinnamon schnapps."
icon_state = "jelly_green"
extra_reagent = "berryjuice"
/obj/item/food/donut/apple/jelly/cherry
- name = "jelly apple donut"
- desc = "Goes great with a shot of cinnamon schnapps."
- icon_state = "jelly_green"
extra_reagent = "cherryjelly"
/obj/item/food/donut/apple/jelly/slime
- name = "jelly apple donut"
- desc = "Goes great with a shot of cinnamon schnapps."
- icon_state = "jelly_green"
extra_reagent = "slimejelly"
/obj/item/food/donut/pink
@@ -928,26 +917,17 @@
desc = "Goes great with a soy latte."
icon_state = "donut_pink"
list_reagents = list("nutriment" = 3, "sugar" = 2, "berryjuice" = 3)
- filling_color = "#D2691E"
tastes = list("donut" = 1, "berries" = 1)
randomized_sprinkles = FALSE
/obj/item/food/donut/pink/jelly
- name = "jelly pink donut"
- desc = "Goes great with a soy latte."
icon_state = "jelly_pink"
extra_reagent = "berryjuice"
/obj/item/food/donut/pink/jelly/cherry
- name = "jelly pink donut"
- desc = "Goes great with a soy latte."
- icon_state = "jelly_pink"
extra_reagent = "cherryjelly"
/obj/item/food/donut/pink/jelly/slime
- name = "jelly pink donut"
- desc = "Goes great with a soy latte."
- icon_state = "jelly_pink"
extra_reagent = "slimejelly"
/obj/item/food/donut/blumpkin
@@ -955,26 +935,18 @@
desc = "Goes great with a mug of soothing drunken blumpkin."
icon_state = "donut_blue"
list_reagents = list("nutriment" = 3, "sugar" = 2, "blumpkinjuice" = 2)
- filling_color = "#D2691E"
tastes = list("donut" = 1, "blumpkin" = 1)
randomized_sprinkles = FALSE
/obj/item/food/donut/blumpkin/jelly
name = "jelly blumpkin donut"
- desc = "Goes great with a mug of soothing drunken blumpkin."
icon_state = "jelly_blue"
extra_reagent = "berryjuice"
/obj/item/food/donut/blumpkin/jelly/cherry
- name = "jelly blumpkin donut"
- desc = "Goes great with a mug of soothing drunken blumpkin."
- icon_state = "jelly_blue"
extra_reagent = "cherryjelly"
/obj/item/food/donut/blumpkin/jelly/slime
- name = "jelly blumpkin donut"
- desc = "Goes great with a mug of soothing drunken blumpkin."
- icon_state = "jelly_blue"
extra_reagent = "slimejelly"
/obj/item/food/donut/caramel
@@ -982,26 +954,18 @@
desc = "Goes great with a mug of hot cocoa."
icon_state = "donut_beige"
list_reagents = list("nutriment" = 3, "sugar" = 2)
- filling_color = "#D2691E"
tastes = list("donut" = 1, "buttery sweetness" = 1)
randomized_sprinkles = FALSE
/obj/item/food/donut/caramel/jelly
name = "jelly caramel donut"
- desc = "Goes great with a mug of hot cocoa."
icon_state = "jelly_beige"
extra_reagent = "berryjuice"
/obj/item/food/donut/caramel/jelly/cherry
- name = "jelly caramel donut"
- desc = "Goes great with a mug of hot cocoa."
- icon_state = "jelly_beige"
extra_reagent = "cherryjelly"
/obj/item/food/donut/caramel/jelly/slime
- name = "jelly caramel donut"
- desc = "Goes great with a mug of hot cocoa."
- icon_state = "jelly_beige"
extra_reagent = "slimejelly"
/obj/item/food/donut/chocolate
@@ -1009,26 +973,18 @@
desc = "Goes great with a glass of warm milk."
icon_state = "donut_choc"
list_reagents = list("nutriment" = 3, "sugar" = 2, "hot_coco" = 3)
- filling_color = "#D2691E"
tastes = list("donut" = 1, "bitterness" = 1)
randomized_sprinkles = FALSE
/obj/item/food/donut/chocolate/jelly
name = "jelly chocolate donut"
- desc = "Goes great with a glass of warm milk."
icon_state = "jelly_choc"
extra_reagent = "berryjuice"
/obj/item/food/donut/chocolate/jelly/cherry
- name = "jelly chocolate donut"
- desc = "Goes great with a glass of warm milk."
- icon_state = "jelly_choc"
extra_reagent = "cherryjelly"
/obj/item/food/donut/chocolate/jelly/slime
- name = "jelly chocolate donut"
- desc = "Goes great with a glass of warm milk."
- icon_state = "jelly_choc"
extra_reagent = "slimejelly"
/obj/item/food/donut/matcha
@@ -1036,26 +992,18 @@
desc = "Goes great with a cup of tea."
icon_state = "donut_olive"
list_reagents = list("nutriment" = 3, "sugar" = 2, "teapowder" = 2)
- filling_color = "#D2691E"
tastes = list("donut" = 1, "matcha" = 1)
randomized_sprinkles = FALSE
/obj/item/food/donut/matcha/jelly
name = "jelly matcha donut"
- desc = "Goes great with a cup of tea."
icon_state = "jelly_olive"
extra_reagent = "berryjuice"
/obj/item/food/donut/matcha/jelly/cherry
- name = "jelly matcha donut"
- desc = "Goes great with a cup of tea."
- icon_state = "jelly_olive"
extra_reagent = "cherryjelly"
/obj/item/food/donut/matcha/jelly/slime
- name = "jelly matcha donut"
- desc = "Goes great with a cup of tea."
- icon_state = "jelly_olive"
extra_reagent = "slimejelly"
/obj/item/food/donut/bungo
@@ -1063,26 +1011,18 @@
desc = "Goes great with a mason jar of hippie's delight."
icon_state = "donut_yellow"
list_reagents = list("nutriment" = 3, "sugar" = 2, "bungojuice" = 3)
- filling_color = "#D2691E"
tastes = list("donut" = 1, "tropical sweetness" = 1, "an acidic, poisonous tang" = 1)
randomized_sprinkles = FALSE
/obj/item/food/donut/bungo/jelly
name = "jelly bungo donut"
- desc = "Goes great with a mason jar of hippie's delight."
icon_state = "jelly_yellow"
extra_reagent = "berryjuice"
/obj/item/food/donut/bungo/jelly/cherry
- name = "jelly bungo donut"
- desc = "Goes great with a mason jar of hippie's delight."
- icon_state = "jelly_yellow"
extra_reagent = "cherryjelly"
/obj/item/food/donut/bungo/jelly/slime
- name = "jelly bungo donut"
- desc = "Goes great with a mason jar of hippie's delight."
- icon_state = "jelly_yellow"
extra_reagent = "slimejelly"
/obj/item/food/donut/spaceman
@@ -1090,26 +1030,18 @@
desc = "Goes great with a cold beaker of malk."
icon_state = "donut_purple"
list_reagents = list("nutriment" = 3, "sugar" = 2)
- filling_color = "#D2691E"
tastes = list("donut" = 1, "violets" = 1)
randomized_sprinkles = FALSE
/obj/item/food/donut/spaceman/jelly
name = "jelly spaceman's donut"
- desc = "Goes great with a cold beaker of malk."
icon_state = "jelly_purple"
extra_reagent = "berryjuice"
/obj/item/food/donut/spaceman/jelly/cherry
- name = "jelly spaceman's donut"
- desc = "Goes great with a cold beaker of malk."
- icon_state = "jelly_purple"
extra_reagent = "cherryjelly"
/obj/item/food/donut/spaceman/jelly/slime
- name = "jelly spaceman's donut"
- desc = "Goes great with a cold beaker of malk."
- icon_state = "jelly_purple"
extra_reagent = "slimejelly"
/obj/item/food/donut/meat
@@ -1117,7 +1049,6 @@
desc = "Tastes as gross as it looks."
icon_state = "donut_meat"
list_reagents = list("nutriment" = 3, "protein" = 3, "ketchup" = 3)
- filling_color = "#D2691E"
tastes = list("meat" = 1, "ketchup" = 1)
randomized_sprinkles = FALSE
@@ -1132,7 +1063,6 @@
icon = 'icons/obj/food/breakfast.dmi'
icon_state = "pancake"
filling_color = "#E7D8AB"
- bitesize = 2
list_reagents = list("nutriment" = 3, "sugar" = 3)
tastes = list("sweet cake" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -1158,7 +1088,6 @@
icon_state = "berry_pancake"
list_reagents = list("nutriment" = 3, "sugar" = 3, "berryjuice" = 3)
tastes = list("sweet cake" = 2, "berries" = 2)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/pancake/choc_chip_pancake
name = "choc-chip pancake"
@@ -1166,7 +1095,6 @@
icon_state = "choc_chip_pancake"
list_reagents = list("nutriment" = 3, "sugar" = 3, "cocoa" = 3)
tastes = list("sweet cake" = 2, "chocolate" = 3)
- goal_difficulty = FOOD_GOAL_NORMAL
//////////////////////
// Misc //
@@ -1304,7 +1232,6 @@
icon_state = "bluecherry_cupcake"
filling_color = "#0d1694"
tastes = list("cake" = 3, "bluecherry" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/honey_bun
name = "honey bun"
diff --git a/code/modules/food_and_drinks/food/foods/bread.dm b/code/modules/food_and_drinks/food/foods/bread.dm
index c18ab05c686..c86c745f410 100644
--- a/code/modules/food_and_drinks/food/foods/bread.dm
+++ b/code/modules/food_and_drinks/food/foods/bread.dm
@@ -207,8 +207,6 @@
desc = "Bon appetit!"
icon = 'icons/obj/food/bakedgoods.dmi'
icon_state = "baguette"
- lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/items_righthand.dmi'
filling_color = "#E3D796"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
diff --git a/code/modules/food_and_drinks/food/foods/candy.dm b/code/modules/food_and_drinks/food/foods/candy.dm
index 004cba5b4f5..fe81247a632 100644
--- a/code/modules/food_and_drinks/food/foods/candy.dm
+++ b/code/modules/food_and_drinks/food/foods/candy.dm
@@ -13,7 +13,6 @@
icon = 'icons/obj/food/candy.dmi'
icon_state = "candy"
tastes = list("candy" = 1)
- goal_difficulty = FOOD_GOAL_SKIP
// ***********************************************************
// Candy Ingredients / Flavorings / Byproduct
@@ -69,30 +68,22 @@
name = "peanut fudge"
desc = "Chocolate fudge, with bits of peanuts mixed in. People with nut allergies shouldn't eat this."
icon_state = "fudge_peanut"
- filling_color = "#7D5F46"
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/candy/fudge/cherry
name = "chocolate cherry fudge"
desc = "Chocolate fudge surrounding sweet cherries. Good for tricking kids into eating some fruit."
icon_state = "fudge_cherry"
- filling_color = "#7D5F46"
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/candy/fudge/cookies_n_cream
name = "cookies 'n' cream fudge"
desc = "An extra creamy fudge with bits of real chocolate cookie mixed in. Crunchy!"
icon_state = "fudge_cookies_n_cream"
- filling_color = "#7D5F46"
list_reagents = list("cream" = 6, "chocolate" = 6)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/candy/fudge/turtle
name = "turtle fudge"
desc = "Chocolate fudge with caramel and nuts. It doesn't contain real turtles, thankfully."
icon_state = "fudge_turtle"
- filling_color = "#7D5F46"
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/candy/chocolate_orange
name = "chocolate orange"
@@ -167,7 +158,6 @@
desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_plain"
trash = /obj/item/c_tube
- filling_color = "#FFFFFF"
bitesize = 4
list_reagents = list("sugar" = 15)
goal_difficulty = FOOD_GOAL_DUPLICATE
@@ -175,7 +165,6 @@
/obj/item/food/candy/candybar
name = "candy"
desc = "A chocolate candybar, wrapped in a bit of foil."
- icon_state = "candy"
trash = /obj/item/trash/candy
filling_color = "#7D5F46"
bitesize = 3
@@ -198,7 +187,6 @@
name = "gummy bear"
desc = "A small edible bear. It's squishy and chewy!"
icon_state = "gbear"
- filling_color = "#FFFFFF"
bitesize = 3
list_reagents = list("sugar" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
@@ -207,7 +195,6 @@
name = "gummy worm"
desc = "An edible worm, made from gelatin."
icon_state = "gworm"
- filling_color = "#FFFFFF"
bitesize = 3
list_reagents = list("sugar" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
@@ -216,7 +203,6 @@
name = "jelly bean"
desc = "A candy bean, guaranteed to not give you gas."
icon_state = "jbean"
- filling_color = "#FFFFFF"
bitesize = 3
list_reagents = list("sugar" = 10)
goal_difficulty = FOOD_GOAL_DUPLICATE
@@ -265,7 +251,6 @@
name = "sucker"
desc = "For being such a good sport!"
icon_state = "sucker"
- filling_color = "#FFFFFF"
list_reagents = list("sugar" = 10)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -516,89 +501,69 @@
/obj/item/food/candy/cotton/red
name = "red cotton candy"
- desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_red"
- trash = /obj/item/c_tube
filling_color = "#801E28"
list_reagents = list("sugar" = 15, "cherryjelly" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/candy/cotton/blue
name = "blue cotton candy"
- desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_blue"
- trash = /obj/item/c_tube
filling_color = "#863333"
list_reagents = list("sugar" = 15, "berryjuice" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/candy/cotton/poison
name = "blue cotton candy"
- desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_blue"
- trash = /obj/item/c_tube
filling_color = "#863353"
list_reagents = list("poisonberryjuice" = 20)
/obj/item/food/candy/cotton/green
name = "green cotton candy"
- desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_green"
- trash = /obj/item/c_tube
filling_color = "#365E30"
list_reagents = list("sugar" = 15, "limejuice" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/candy/cotton/yellow
name = "yellow cotton candy"
- desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_yellow"
- trash = /obj/item/c_tube
filling_color = "#863333"
list_reagents = list("sugar" = 15, "lemonjuice" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/candy/cotton/orange
name = "orange cotton candy"
- desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_orange"
- trash = /obj/item/c_tube
filling_color = "#E78108"
list_reagents = list("sugar" = 15, "orangejuice" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/candy/cotton/purple
name = "purple cotton candy"
- desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_purple"
- trash = /obj/item/c_tube
filling_color = "#993399"
list_reagents = list("sugar" = 15, "grapejuice" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/candy/cotton/pink
name = "pink cotton candy"
- desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_pink"
- trash = /obj/item/c_tube
filling_color = "#863333"
list_reagents = list("sugar" = 15, "watermelonjuice" = 5)
goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/candy/cotton/rainbow
name = "rainbow cotton candy"
- desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_rainbow"
- trash = /obj/item/c_tube
filling_color = "#eb0dc6"
list_reagents = list("omnizine" = 20)
goal_difficulty = FOOD_GOAL_HARD
/obj/item/food/candy/cotton/bad_rainbow
name = "rainbow cotton candy"
- desc = "Light and fluffy, it's like eating a cloud made from sugar!"
icon_state = "cottoncandy_rainbow"
- trash = /obj/item/c_tube
filling_color = "#32127A"
list_reagents = list("sulfonal" = 20)
diff --git a/code/modules/food_and_drinks/food/foods/frozen.dm b/code/modules/food_and_drinks/food/foods/frozen.dm
index f616b9c3dbc..d2c68e20d24 100644
--- a/code/modules/food_and_drinks/food/foods/frozen.dm
+++ b/code/modules/food_and_drinks/food/foods/frozen.dm
@@ -60,26 +60,16 @@
/obj/item/food/frozen/icecream/icecreamcone
name = "ice cream cone"
- desc = "Delicious ice cream."
- icon_state = "icecream_cone"
- volume = 50
- bitesize = 3
list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2)
/obj/item/food/frozen/icecream/wafflecone
name = "ice cream in a waffle cone"
- desc = "Delicious ice cream."
icon_state = "icecream_cone_waffle"
- volume = 50
- bitesize = 3
list_reagents = list("nutriment" = 3, "sugar" = 7, "ice" = 2)
/obj/item/food/frozen/icecream/icecreamcup
name = "chocolate ice cream cone"
- desc = "Delicious ice cream."
icon_state = "icecream_cone_chocolate"
- volume = 50
- bitesize = 3
list_reagents = list("nutriment" = 5, "chocolate" = 8, "ice" = 2)
/obj/item/food/wafflecone
@@ -153,7 +143,6 @@
/obj/item/food/frozen/snowcone
name = "flavorless snowcone"
desc = "It's just shaved ice. Still fun to chew on."
- icon_state = "flavorless_sc"
trash = /obj/item/reagent_containers/drinks/sillycup
list_reagents = list("water" = 10, "ice" = 5)
tastes = list("cold water" = 1)
@@ -298,7 +287,6 @@
icon_state = "topsicle_banana"
list_reagents = list("vitamin" = 4, "sugar" = 6, "banana" = 4)
tastes = list("bananas" = 1, "tofu" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/frozen/popsicle/berrytop
name = "berry topsicle"
@@ -306,7 +294,6 @@
icon_state = "topsicle_berry"
list_reagents = list("vitamin" = 4, "sugar" = 6, "berryjuice" = 4)
tastes = list("berries" = 1, "tofu" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/frozen/popsicle/pineappletop
name = "pineapple topsicle"
@@ -314,7 +301,6 @@
icon_state = "topsicle_pineapple"
list_reagents = list("vitamin" = 4, "sugar" = 6, "pineapplejuice" = 4)
tastes = list("pineapples" = 1, "tofu" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/frozen/popsicle/licoricecream
name = "licorice creamsicle"
@@ -322,7 +308,6 @@
icon_state = "licorice_creamsicle"
list_reagents = list("nutriment" = 4, "cream" = 2, "vanilla" = 1, "sugar" = 4, "salt" = 1)
tastes = list("salty licorice" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/frozen/popsicle/orangecream
name = "orange creamsicle"
@@ -330,7 +315,6 @@
icon_state = "creamsicle_o"
list_reagents = list("orangejuice" = 4, "cream" = 2, "vanilla" = 2, "sugar" = 4)
tastes = list("ice cream" = 1, "oranges" = 1, "vanilla" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/frozen/popsicle/berrycream
name = "berry creamsicle"
@@ -338,7 +322,6 @@
icon_state = "creamsicle_m"
list_reagents = list("berryjuice" = 4, "cream" = 2, "vanilla" = 2, "sugar" = 4)
tastes = list("ice cream" = 1, "berries" = 1, "vanilla" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/frozen/popsicle/frozenpineapple
name = "frozen pineapple pop"
@@ -346,7 +329,6 @@
icon_state = "pineapple_pop"
list_reagents = list("pineapplejuice" = 4, "sugar" = 4, "nutriment" = 2, "vitamin" = 2)
tastes = list("cold pineapple" = 1, "chocolate" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/frozen/popsicle/sea_salt
name = "sea salt ice-cream bar"
@@ -354,12 +336,10 @@
icon_state = "sea_salt_pop"
list_reagents = list("salt" = 1, "nutriment" = 2, "cream" = 2, "vanilla" = 2, "sugar"= 4,)
tastes = list("salt" = 1, "sweet" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/frozen/popsicle/ant
name = "ant popsicle"
desc = "A colony of ants suspended in hardened sugar. Those things are dead, right?"
icon_state = "ant_pop"
- trash = /obj/item/trash/popsicle_stick
list_reagents = list("nutriment" = 1, "vitamin" = 1, "sugar" = 5, "ants" = 3)
tastes = list("candy" = 1, "ants" = 2)
diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm
index 3521bb7ddb9..af302b5f5cc 100644
--- a/code/modules/food_and_drinks/food/foods/ingredients.dm
+++ b/code/modules/food_and_drinks/food/foods/ingredients.dm
@@ -100,7 +100,6 @@
name = "blue cheese wedge"
desc = "A wedge of pungent blue cheese. The flavor is... intense."
icon_state = "cheesewedge-blue"
- bitesize = 2
list_reagents = list("nutriment" = 1, "vitamin" = 1, "cheese" = 3)
tastes = list("strong cheese" = 2, "salt" = 1, "bitter mold" = 1)
@@ -117,7 +116,6 @@
name = "camembert cheese slice"
desc = "A piece of camembert. It's soft and gooey."
icon_state = "cheesewedge-camembert"
- bitesize = 2
list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 4)
tastes = list("mild cheese" = 3, "gooeyness" = 1)
@@ -285,9 +283,7 @@
return ..()
/obj/item/food/rawcookies/chocochips
- name = "raw cookies"
desc = "Ready for oven! They have little pieces of chocolate all over them"
- icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "unbaked_cookies_choco"
list_reagents = list("nutriment" = 5, "sugar" = 5, "chocolate" = 5)
tastes = list("dough" = 1, "sugar" = 1, "chocolate" = 1)
diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm
index 845051c82f2..ff88f8dc3a9 100644
--- a/code/modules/food_and_drinks/food/foods/meat.dm
+++ b/code/modules/food_and_drinks/food/foods/meat.dm
@@ -132,7 +132,6 @@
/obj/item/food/monstermeat/bearmeat
name = "bear meat"
desc = "A very manly slab of meat."
- icon_state = "bearmeat"
filling_color = "#DB0000"
bitesize = 3
list_reagents = list("protein" = 12, "methamphetamine" = 5, "vitamin" = 2)
@@ -258,7 +257,6 @@
desc = "A juicy cooked patty, ready to be slapped between two buns."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "patty"
- bitesize = 3
list_reagents = list("protein" = 3)
/obj/item/food/meat/patty_raw
@@ -266,7 +264,6 @@
desc = "A raw patty ready to be grilled into a juicy and delicious burger."
icon = 'icons/obj/food/food_ingredients.dmi'
icon_state = "patty_raw"
- bitesize = 3
list_reagents = list("protein" = 2)
/obj/item/food/meat/patty_raw/examine(mob/user)
@@ -314,7 +311,6 @@
/obj/item/food/meat/raw_meatball
name = "raw meatball"
desc = "Some ground meat shaped into a ball."
- icon = 'icons/obj/food/meat.dmi'
icon_state = "meatball_raw"
filling_color = "#DB4444"
list_reagents = list("protein" = 4, "vitamin" = 1)
@@ -582,7 +578,6 @@
desc = "A hard boiled egg."
icon = 'icons/obj/food/breakfast.dmi'
icon_state = "egg"
- filling_color = "#FFFFFF"
list_reagents = list("nutriment" = 2, "egg" = 5, "vitamin" = 1)
goal_difficulty = FOOD_GOAL_NORMAL
diff --git a/code/modules/food_and_drinks/food/foods/misc_food.dm b/code/modules/food_and_drinks/food/foods/misc_food.dm
index 186ba733669..4a2c7ffbf6f 100644
--- a/code/modules/food_and_drinks/food/foods/misc_food.dm
+++ b/code/modules/food_and_drinks/food/foods/misc_food.dm
@@ -86,7 +86,6 @@
icon_state = "aesirsalad"
list_reagents = list("nutriment" = 8, "omnizine" = 8, "vitamin" = 6)
tastes = list("divinity" = 1, "lettuce" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/salad/antipasto
name = "antipasto salad"
@@ -94,7 +93,6 @@
icon_state = "antipasto_salad"
list_reagents = list("nutriment" = 12, "protein" = 6, "vitamin" = 6)
tastes = list("lettuce" = 2, "salami" = 2, "mozzarella cheese" = 2, "tomatoes" = 2, "dressing" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/salad/caesar
name = "Caesar salad"
@@ -102,7 +100,6 @@
icon_state = "caesar_salad"
list_reagents = list("nutriment" = 12, "vitamin" = 6)
tastes = list("healthy greens" = 2, "olive dressing" = 2, "feta cheese" = 2, "pita bread" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/salad/fruit
name = "fruit salad"
@@ -110,7 +107,6 @@
icon_state = "fruitsalad"
list_reagents = list("nutriment" = 9, "vitamin" = 4)
tastes = list("fruit" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/salad/greek
name = "Greek salad"
@@ -118,7 +114,6 @@
icon_state = "greek_salad"
list_reagents = list("nutriment" = 13, "vitamin" = 14)
tastes = list("healthy greens" = 2, "olive dressing" = 1, "feta cheese" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/salad/citrusdelight
name = "citrus delight"
@@ -126,7 +121,6 @@
icon_state = "citrusdelight"
list_reagents = list("nutriment" = 11, "vitamin" = 7)
tastes = list("sourness" = 1, "leaves" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/salad/jungle
name = "jungle salad"
@@ -134,7 +128,6 @@
icon_state = "junglesalad"
list_reagents = list("banana" = 5, "nutriment" = 11, "vitamin" = 7)
tastes = list("fruit" = 1, "the jungle" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/salad/kale
name = "kale salad"
@@ -142,7 +135,6 @@
icon_state = "kale_salad"
list_reagents = list("nutriment" = 12, "vitamin" = 12)
tastes = list("healthy greens" = 2, "olive dressing" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/salad/potato
name = "potato salad"
@@ -150,7 +142,6 @@
icon_state = "potato_salad"
list_reagents = list("nutriment" = 10, "protein" = 4)
tastes = list("potato" = 2, "egg" = 2, "mayonnaise" = 2)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/salad/melonfruitbowl
name = "melon fruit bowl"
@@ -159,7 +150,6 @@
trash = null
list_reagents = list("nutriment" = 6, "vitamin" = 4)
tastes = list("melon" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/salad/herb
name = "herb salad"
@@ -168,7 +158,6 @@
filling_color = "#76B87F"
list_reagents = list("nutriment" = 8, "vitamin" = 2)
tastes = list("lettuce" = 1, "apple" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
/obj/item/food/salad/valid
name = "valid salad"
@@ -177,7 +166,6 @@
filling_color = "#76B87F"
list_reagents = list("nutriment" = 8, "salglu_solution" = 5, "vitamin" = 2)
tastes = list("fried potato" = 1, "lettuce" = 1, "meat" = 1, "valids" = 1)
- goal_difficulty = FOOD_GOAL_NORMAL
//////////////////////
diff --git a/code/modules/food_and_drinks/food/foods/sandwiches.dm b/code/modules/food_and_drinks/food/foods/sandwiches.dm
index ea754baae0f..cd5760bf036 100644
--- a/code/modules/food_and_drinks/food/foods/sandwiches.dm
+++ b/code/modules/food_and_drinks/food/foods/sandwiches.dm
@@ -12,7 +12,6 @@
icon_state = "burger"
/obj/item/food/burger/plain
- name = "burger"
desc = "The cornerstone of every nutritious breakfast."
icon_state = "hburger"
filling_color = "#D63C3C"
@@ -110,7 +109,6 @@
name = "mime burger"
desc = "Its taste defies language."
icon_state = "mimeburger"
- filling_color = "#FFFFFF"
bitesize = 3
list_reagents = list("nutriment" = 6, "vitamin" = 1)
tastes = list("bun" = 4, "silence" = 2)
@@ -170,8 +168,6 @@
name = "white pretty patty"
desc = "Delicious titanium!"
icon_state = "ppatty-mime"
- filling_color = "#FFFFFF"
- bitesize = 2
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "white" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -181,7 +177,6 @@
desc = "Perfect for hiding the fact that it's burnt to a crisp."
icon_state = "ppatty-red"
filling_color = "#D63C3C"
- bitesize = 2
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "red" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -191,7 +186,6 @@
desc = "Contains 0% juice."
icon_state = "ppatty-orange"
filling_color = "#FFA500"
- bitesize = 2
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "orange" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -201,7 +195,6 @@
desc = "Bright to the last bite."
icon_state = "ppatty-yellow"
filling_color = "#FFFF00"
- bitesize = 2
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "yellow" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -211,7 +204,6 @@
desc = "It's not tainted meat, it's painted meat!"
icon_state = "ppatty-green"
filling_color = "#00FF00"
- bitesize = 2
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "green" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -221,7 +213,6 @@
desc = "Is this blue rare?"
icon_state = "ppatty-blue"
filling_color = "#0000FF"
- bitesize = 2
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "blue" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -231,7 +222,6 @@
desc = "Regal and low class at the same time."
icon_state = "ppatty-purple"
filling_color = "#800080"
- bitesize = 2
list_reagents = list("nutriment" = 7, "protein" = 1)
tastes = list("bun" = 2, "meat" = 2, "purple" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
@@ -251,7 +241,6 @@
desc = "It's shockingly good, if you live off of electricity that is."
icon_state = "empoweredburger"
filling_color = "#FFFF00"
- bitesize = 2
list_reagents = list("nutriment" = 5, "protein" = 1, "plasma" = 2)
tastes = list("bun" = 2, "pure electricity" = 5)
goal_difficulty = FOOD_GOAL_HARD
@@ -261,7 +250,6 @@
desc = "Pretty much what you'd expect..."
icon_state = "ratburger"
filling_color = "#808080"
- bitesize = 2
list_reagents = list("nutriment" = 5, "protein" = 1)
tastes = list("bun" = 2, "dead rat" = 5)
@@ -415,7 +403,6 @@
/obj/item/food/wrap
name = "egg wrap"
desc = "The precursor to Pigs in a Blanket."
- icon = 'icons/obj/food/food.dmi'
icon_state = "wrap"
list_reagents = list("nutriment" = 5)
tastes = list("egg" = 1)
@@ -438,7 +425,6 @@
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "peanut_butter_jelly_sandwich"
filling_color = "#9E3A78"
- bitesize = 2
tastes = list("peanut butter" = 3, "jelly" = 3, "bread" = 2)
/obj/item/food/peanut_butter_jelly/slime
@@ -468,7 +454,6 @@
icon = 'icons/obj/food/burgerbread.dmi'
icon_state = "peanut_butter_banana_sandwich"
filling_color = "#D9BE29"
- bitesize = 2
list_reagents = list("nutriment" = 5, "protein" = 2)
tastes = list("peanutbutter" = 3, "banana" = 3, "bread" = 2)
goal_difficulty = FOOD_GOAL_NORMAL
diff --git a/code/modules/food_and_drinks/food_base.dm b/code/modules/food_and_drinks/food_base.dm
index 0461d6f0a79..62999a767ce 100644
--- a/code/modules/food_and_drinks/food_base.dm
+++ b/code/modules/food_and_drinks/food_base.dm
@@ -373,7 +373,6 @@
/obj/item/food/cereal
name = "box of cereal"
desc = "A box of cereal."
- icon = 'icons/obj/food/food.dmi'
icon_state = "cereal_box"
list_reagents = list("nutriment" = 3)
diff --git a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
index 5b4988bbcfb..48c4612ae1c 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm
@@ -1,7 +1,6 @@
/obj/machinery/cooker
name = "cooker"
desc = "You shouldn't be seeing this!"
- layer = 2.9
density = TRUE
anchored = TRUE
idle_power_consumption = 5
diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
index 995d588430f..10fa3722920 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
@@ -4,7 +4,6 @@
/obj/machinery/kitchen_machine
name = "Base Kitchen Machine"
desc = "If you are seeing this, a coder/mapper messed up. Please report it."
- layer = 2.9
density = TRUE
anchored = TRUE
idle_power_consumption = 5
diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
index 5251e8e941b..8df9421511c 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm
@@ -5,7 +5,6 @@ GLOBAL_LIST_EMPTY(monkey_recyclers)
desc = "A machine used for recycling dead monkeys into monkey cubes."
icon = 'icons/obj/kitchen.dmi'
icon_state = "grinder"
- layer = 2.9
density = TRUE
anchored = TRUE
idle_power_consumption = 5
diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
index 309bd224c39..e1984c1e726 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm
@@ -3,7 +3,6 @@
desc = "Used for turning ingredients into other ingredients."
icon = 'icons/obj/kitchen.dmi'
icon_state = "processor"
- layer = 2.9
density = TRUE
anchored = TRUE
idle_power_consumption = 5
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 7bbda0229e5..f0f0c494c1c 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -7,7 +7,6 @@
name = "\improper SmartFridge"
icon = 'icons/obj/vending.dmi'
icon_state = "smartfridge"
- layer = 2.9
density = TRUE
anchored = TRUE
idle_power_consumption = 5
@@ -548,7 +547,6 @@
/obj/machinery/smartfridge/seeds
name = "\improper Seed Storage"
desc = "When you need seeds fast!"
- icon = 'icons/obj/vending.dmi'
icon_state = "seeds"
board_type = /obj/machinery/smartfridge/seeds
@@ -609,7 +607,6 @@
desc = "A storage unit for circuits."
icon_state = "circuits"
icon_lightmask = "circuits"
- visible_contents = TRUE
board_type = /obj/machinery/smartfridge/secure/circuits
/obj/machinery/smartfridge/secure/circuits/Initialize(mapload)
@@ -682,7 +679,6 @@
/obj/machinery/smartfridge/medbay
name = "\improper Refrigerated Medicine Storage"
desc = "A refrigerated storage unit for storing medicine and chemicals."
- icon_state = "smartfridge" //To fix the icon in the map editor.
board_type = /obj/machinery/smartfridge/medbay
/obj/machinery/smartfridge/medbay/Initialize(mapload)
@@ -722,7 +718,6 @@
/obj/machinery/smartfridge/secure/medbay
name = "\improper Secure Refrigerated Medicine Storage"
desc = "A refrigerated storage unit for storing medicine and chemicals."
- icon_state = "smartfridge" //To fix the icon in the map editor.
req_one_access = list(ACCESS_MEDICAL, ACCESS_CHEMISTRY)
board_type = /obj/machinery/smartfridge/secure/medbay
@@ -746,7 +741,6 @@
/obj/machinery/smartfridge/secure/chemistry
name = "\improper Smart Chemical Storage"
desc = "A refrigerated storage unit for medicine and chemical storage."
- icon_state = "smartfridge" //To fix the icon in the map editor.
board_type = /obj/machinery/smartfridge/secure/chemistry
req_access = list(ACCESS_CHEMISTRY)
@@ -794,7 +788,6 @@
icon_state = "disktoaster"
icon_lightmask = "disktoaster"
pass_flags = PASSTABLE
- visible_contents = TRUE
board_type = /obj/machinery/smartfridge/disks
/obj/machinery/smartfridge/disks/Initialize(mapload)
diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index 6b4e42830f2..051821bbe57 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -21,8 +21,6 @@
throw_speed = 3
throw_range = 10
- throwforce = 0
- force = 0
var/list/cards = list()
/// How often the deck can be shuffled.
diff --git a/code/modules/hallucinations/effects/common.dm b/code/modules/hallucinations/effects/common.dm
index dafdc3cf139..88ae786f30f 100644
--- a/code/modules/hallucinations/effects/common.dm
+++ b/code/modules/hallucinations/effects/common.dm
@@ -4,7 +4,6 @@
* A generic hallucination that causes the target to trip if they cross it.
*/
/obj/effect/hallucination/tripper
- anchored = TRUE
/// Chance to trip when crossing.
var/trip_chance = 100
/// Stun to add when crossed.
diff --git a/code/modules/hallucinations/effects/grenades.dm b/code/modules/hallucinations/effects/grenades.dm
index 8aa24b13bd3..e95a20bb151 100644
--- a/code/modules/hallucinations/effects/grenades.dm
+++ b/code/modules/hallucinations/effects/grenades.dm
@@ -111,7 +111,6 @@
hallucination_icon = 'icons/mob/carp.dmi'
hallucination_icon_state = "base"
duration = 30 SECONDS
- damage = 25
/obj/effect/hallucination/chaser/attacker/space_carp/Initialize(mapload, mob/living/carbon/hallucination_target)
. = ..()
diff --git a/code/modules/hallucinations/effects/major.dm b/code/modules/hallucinations/effects/major.dm
index e771a904961..ec088a1b2ae 100644
--- a/code/modules/hallucinations/effects/major.dm
+++ b/code/modules/hallucinations/effects/major.dm
@@ -30,7 +30,6 @@
hallucination_icon = 'icons/mob/terrorspider.dmi'
hallucination_icon_state = "terror_green"
duration = 30 SECONDS
- damage = 25
/obj/effect/hallucination/chaser/attacker/terror_spider/Initialize(mapload, mob/living/carbon/target)
. = ..()
@@ -433,7 +432,6 @@
hallucination_icon = 'icons/mob/human.dmi'
hallucination_icon_state = "zombie2_s"
duration = 45 SECONDS
- damage = 25
/// The hallucination that spawned us.
var/obj/effect/hallucination/blob/owning_hallucination = null
/// Whether or not the target has been zombified already.
@@ -483,7 +481,6 @@
* Fires a penetrator round at the target. On hit, knockdown + stam loss + hallucinated blood splatter for a bit.
*/
/obj/effect/hallucination/sniper
- duration = 15 SECONDS
/obj/effect/hallucination/sniper/Initialize(mapload, mob/living/carbon/target)
. = ..()
@@ -528,7 +525,6 @@
START_PROCESSING(SSprojectiles, bullet)
/obj/effect/hallucination/sniper_bloodsplatter
- duration = 15 SECONDS
hallucination_icon = 'icons/effects/blood.dmi'
hallucination_icon_state = "mfloor1"
hallucination_color = "#A10808"
diff --git a/code/modules/hallucinations/effects/minor.dm b/code/modules/hallucinations/effects/minor.dm
index 7a1d8d8211d..f215f1407a1 100644
--- a/code/modules/hallucinations/effects/minor.dm
+++ b/code/modules/hallucinations/effects/minor.dm
@@ -48,7 +48,6 @@
* Visually bolts a random number of airlocks around the target.
*/
/obj/effect/hallucination/bolts
- duration = 15 SECONDS
/// The maximum amount of airlocks to fake bolt.
var/bolt_amount = 2
/// The duration of fake bolt in deciseconds.
diff --git a/code/modules/hallucinations/effects/moderate.dm b/code/modules/hallucinations/effects/moderate.dm
index 3f5c3ec897f..565288387f7 100644
--- a/code/modules/hallucinations/effects/moderate.dm
+++ b/code/modules/hallucinations/effects/moderate.dm
@@ -431,7 +431,6 @@
* Changes the target's appearance to something else temporarily.
*/
/obj/effect/hallucination/self_delusion
- duration = 15 SECONDS
/obj/effect/hallucination/self_delusion/Initialize(mapload, mob/living/carbon/target)
. = ..()
@@ -455,7 +454,6 @@
* Changes the appearance of all humans around the target.
*/
/obj/effect/hallucination/delusion
- duration = 15 SECONDS
/obj/effect/hallucination/delusion/Initialize(mapload, mob/living/carbon/target, override_icon, override_icon_state)
. = ..()
diff --git a/code/modules/hallucinations/hallucinations.dm b/code/modules/hallucinations/hallucinations.dm
index 29dcc6448a7..ed8fa21451d 100644
--- a/code/modules/hallucinations/hallucinations.dm
+++ b/code/modules/hallucinations/hallucinations.dm
@@ -42,7 +42,6 @@ GLOBAL_LIST_INIT(hallucinations, list(
* Base object for hallucinations. Contains basic behaviour to display an icon only to the target.
*/
/obj/effect/hallucination
- density = FALSE
invisibility = INVISIBILITY_OBSERVER
/// Duration in deciseconds. Can also be a list with the form [lower bound, upper bound] for a random duration.
var/duration = 15 SECONDS
diff --git a/code/modules/holiday/holiday.dm b/code/modules/holiday/holiday.dm
index 4894ebb0392..e7c47afb5e8 100644
--- a/code/modules/holiday/holiday.dm
+++ b/code/modules/holiday/holiday.dm
@@ -96,7 +96,6 @@
/datum/holiday/april_fools
name = APRIL_FOOLS
- begin_day = 1
begin_month = APRIL
end_day = 8 //7 days extra so everyone can enjoy the festivities
@@ -112,7 +111,6 @@
/datum/holiday/labor
name = "Labor Day"
- begin_day = 1
begin_month = MAY
/datum/holiday/firefighter
@@ -124,7 +122,6 @@
/datum/holiday/doctor
name = "Doctor's Day"
- begin_day = 1
begin_month = JULY
/datum/holiday/ufo
@@ -193,7 +190,6 @@
/datum/holiday/vegan
name = "Vegan Day"
- begin_day = 1
begin_month = NOVEMBER
/datum/holiday/kindness
diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm
index 21e3c917560..6f662730ea6 100644
--- a/code/modules/hydroponics/fermenting_barrel.dm
+++ b/code/modules/hydroponics/fermenting_barrel.dm
@@ -7,7 +7,6 @@
anchored = TRUE
container_type = DRAINABLE | AMOUNT_VISIBLE
pressure_resistance = 2 * ONE_ATMOSPHERE
- max_integrity = 300
var/open = FALSE
var/speed_multiplier = 1 //How fast it distills. Defaults to 100% (1.0). Lower is better.
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 2519a007649..1519b9e0a5c 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -18,7 +18,6 @@
var/wine_flavor //If NULL, this is automatically set to the fruit's flavor. Determines the flavor of the wine if distill_reagent is NULL.
var/wine_power = 0.1 //Determines the boozepwr of the wine if distill_reagent is NULL. Uses 0.1 - 1.2 not tg's boozepower (divide by 100) else you'll end up with 1000% proof alcohol!
dried_type = -1 // Saves us from having to define each stupid grown's dried_type as itself. If you don't want a plant to be driable (watermelons) set this to null in the time definition.
- resistance_flags = FLAMMABLE
origin_tech = "biotech=1"
/obj/item/food/grown/Initialize(mapload, obj/new_seed = null)
diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm
index 9c6af062c69..3c065249e7e 100644
--- a/code/modules/hydroponics/grown/ambrosia.dm
+++ b/code/modules/hydroponics/grown/ambrosia.dm
@@ -31,7 +31,6 @@
reagents_add = list("space_drugs" = 0.15, "bicaridine" = 0.1, "kelotane" = 0.1, "vitamin" = 0.04, "plantmatter" = 0.05, "toxin" = 0.1)
/obj/item/food/grown/ambrosia/vulgaris
- seed = /obj/item/seeds/ambrosia
name = "ambrosia vulgaris branch"
desc = "This is a plant containing various healing chemicals."
origin_tech = "biotech=2"
diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm
index 1ef61356814..e129e6c5362 100644
--- a/code/modules/hydroponics/grown/banana.dm
+++ b/code/modules/hydroponics/grown/banana.dm
@@ -50,9 +50,7 @@
icon_state = "banana_peel"
item_state = "banana_peel"
w_class = WEIGHT_CLASS_TINY
- throwforce = 0
throw_speed = 3
- throw_range = 7
/obj/item/grown/bananapeel/Initialize(mapload)
. = ..()
diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm
index dbe83098a40..34582e5e26e 100644
--- a/code/modules/hydroponics/grown/berries.dm
+++ b/code/modules/hydroponics/grown/berries.dm
@@ -92,7 +92,6 @@
/obj/item/food/grown/berries/glow
seed = /obj/item/seeds/berry/glow
name = "bunch of glow-berries"
- desc = "Nutritious!"
icon_state = "glowberrypile"
filling_color = "#7CFC00"
origin_tech = "plasmatech=6"
diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm
index c4ee41cafa9..d7a8009bf5b 100644
--- a/code/modules/hydroponics/grown/citrus.dm
+++ b/code/modules/hydroponics/grown/citrus.dm
@@ -25,10 +25,7 @@
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.05)
/obj/item/food/grown/citrus/lime
- seed = /obj/item/seeds/lime
name = "lime"
- desc = "It's so sour, your face will twist."
- icon_state = "lime"
filling_color = "#00FF00"
tastes = list("lime" = 1)
diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm
index d57ee07ec30..77e89ae0187 100644
--- a/code/modules/hydroponics/grown/cocoa_vanilla.dm
+++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm
@@ -64,7 +64,6 @@
mutatelist = null
reagents_add = list("enzyme"= 0.1, "nutriment" = 0.1, "bungojuice" = 0.1)
growthstages = 4
- growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
icon_grow = "bungotree-grow"
icon_dead = "bungotree-dead"
@@ -82,5 +81,4 @@
name = "bungo pit"
icon_state = "bungopit"
desc = "A large seed from a bungo fruit."
- w_class = WEIGHT_CLASS_TINY
tastes = list("acrid bitterness" = 1)
diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm
index 35a4a697837..eb8047d1001 100644
--- a/code/modules/hydroponics/grown/corn.dm
+++ b/code/modules/hydroponics/grown/corn.dm
@@ -34,9 +34,7 @@
icon_state = "corncob"
item_state = "corncob"
w_class = WEIGHT_CLASS_TINY
- throwforce = 0
throw_speed = 3
- throw_range = 7
/obj/item/grown/corncob/attackby__legacy__attackchain(obj/item/grown/W, mob/user, params)
if(W.sharp)
@@ -65,9 +63,7 @@
icon_state = "snapcorn"
item_state = "corncob"
w_class = WEIGHT_CLASS_TINY
- throwforce = 0
throw_speed = 3
- throw_range = 7
var/snap_pops = 1
/obj/item/grown/snapcorn/add_juice()
diff --git a/code/modules/hydroponics/grown/cotton.dm b/code/modules/hydroponics/grown/cotton.dm
index 4f1df4e85a4..064d8f9dcd4 100644
--- a/code/modules/hydroponics/grown/cotton.dm
+++ b/code/modules/hydroponics/grown/cotton.dm
@@ -13,7 +13,6 @@
yield = 2
potency = 50
growthstages = 3
- growing_icon = 'icons/obj/hydroponics/growing.dmi'
icon_dead = "cotton-dead"
mutatelist = list(/obj/item/seeds/cotton/durathread)
@@ -22,10 +21,7 @@
name = "cotton bundle"
desc = "A fluffy bundle of cotton."
icon_state = "cotton"
- force = 0
- throwforce = 0
w_class = WEIGHT_CLASS_TINY
- throw_speed = 2
throw_range = 3
attack_verb = list("pomfed")
var/cotton_type = /obj/item/stack/sheet/cotton
@@ -56,14 +52,7 @@
product = /obj/item/grown/cotton/durathread
lifespan = 80
endurance = 50
- maturation = 15
- production = 1
- yield = 2
- potency = 50
- growthstages = 3
mutatelist = list()
- growing_icon = 'icons/obj/hydroponics/growing.dmi'
- icon_dead = "cotton-dead"
/obj/item/grown/cotton/durathread
seed = /obj/item/seeds/cotton/durathread
@@ -73,8 +62,6 @@
force = 5
throwforce = 5
w_class = WEIGHT_CLASS_NORMAL
- throw_speed = 2
- throw_range = 3
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
cotton_type = /obj/item/stack/sheet/cotton/durathread
cotton_name = "raw durathread"
diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm
index 62ec89da4c8..c8f1deea5de 100644
--- a/code/modules/hydroponics/grown/flowers.dm
+++ b/code/modules/hydroponics/grown/flowers.dm
@@ -62,14 +62,11 @@
product = /obj/item/food/grown/trumpet
lifespan = 80
production = 5
- endurance = 10
maturation = 12
yield = 4
- potency = 20
growthstages = 4
weed_rate = 2
weed_chance = 10
- growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
icon_grow = "spacemanstrumpet-grow"
icon_dead = "spacemanstrumpet-dead"
mutatelist = null
@@ -160,9 +157,7 @@
desc = "It's beautiful! A certain person might beat you to death if you trample these."
icon_state = "sunflower"
damtype = "fire"
- force = 0
slot_flags = ITEM_SLOT_HEAD
- throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_speed = 1
throw_range = 3
@@ -179,7 +174,6 @@
species = "moonflower"
plantname = "Moonflowers"
icon_grow = "moonflower-grow"
- icon_dead = "sunflower-dead"
product = /obj/item/food/grown/moonflower
mutatelist = list()
reagents_add = list("moonshine" = 0.2, "vitamin" = 0.02, "plantmatter" = 0.02)
@@ -204,7 +198,6 @@
species = "novaflower"
plantname = "Novaflowers"
icon_grow = "novaflower-grow"
- icon_dead = "sunflower-dead"
product = /obj/item/grown/novaflower
mutatelist = list()
reagents_add = list("condensedcapsaicin" = 0.25, "capsaicin" = 0.3, "plantmatter" = 0)
@@ -216,9 +209,7 @@
desc = "These beautiful flowers have a crisp smokey scent, like a summer bonfire."
icon_state = "novaflower"
damtype = "fire"
- force = 0
slot_flags = ITEM_SLOT_HEAD
- throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_speed = 1
throw_range = 3
diff --git a/code/modules/hydroponics/grown/garlic.dm b/code/modules/hydroponics/grown/garlic.dm
index 66979391b39..9ef1949036f 100644
--- a/code/modules/hydroponics/grown/garlic.dm
+++ b/code/modules/hydroponics/grown/garlic.dm
@@ -19,4 +19,3 @@
filling_color = "#C0C9A0"
bitesize_mod = 2
tastes = list("garlic" = 1)
- wine_power = 0.1
diff --git a/code/modules/hydroponics/grown/misc_seeds.dm b/code/modules/hydroponics/grown/misc_seeds.dm
index 25c6d038e46..1ccca14a80c 100644
--- a/code/modules/hydroponics/grown/misc_seeds.dm
+++ b/code/modules/hydroponics/grown/misc_seeds.dm
@@ -10,7 +10,6 @@
maturation = 5
production = 1
yield = 2
- potency = 10
growthstages = 3
growing_icon = 'icons/obj/hydroponics/growing_flowers.dmi'
genes = list(/datum/plant_gene/trait/plant_type/weed_hardy)
@@ -125,7 +124,6 @@
yield = 5
potency = 50
growthstages = 3
- growing_icon = 'icons/obj/hydroponics/growing.dmi'
icon_dead = "bamboo-dead"
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = null
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index cc7df22619c..a934d4ed217 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -159,7 +159,6 @@
endurance = 30
maturation = 5
yield = 1
- growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi'
mutatelist = list()
reagents_add = list("vitamin" = 0.05, "nutriment" = 0.15)
rarity = 30
@@ -225,9 +224,7 @@
product = /obj/item/food/grown/mushroom/glowshroom
lifespan = 100 //ten times that is the delay
endurance = 30
- maturation = 6
production = 1
- yield = 3 //-> spread
potency = 30 //-> brightness
growthstages = 4
rarity = 20
@@ -291,7 +288,6 @@
name = "glowcap cluster"
desc = "Mycena Ruthenia: This species of mushroom glows in the dark, but isn't actually bioluminescent. They're warm to the touch..."
icon_state = "glowcap"
- filling_color = "#00FA9A"
effect_path = /obj/structure/glowshroom/glowcap
origin_tech = "biotech=4;powerstorage=6;plasmatech=4"
light_color = "#8E0300"
diff --git a/code/modules/hydroponics/grown/nettle.dm b/code/modules/hydroponics/grown/nettle.dm
index 0d679bc1e23..34e62373027 100644
--- a/code/modules/hydroponics/grown/nettle.dm
+++ b/code/modules/hydroponics/grown/nettle.dm
@@ -40,7 +40,6 @@
force = 15
hitsound = 'sound/weapons/bladeslice.ogg'
throwforce = 5
- w_class = WEIGHT_CLASS_NORMAL // Two nettle/deathnettle fit in a pneumatic cannon. They fit in plant bags.
throw_speed = 1
throw_range = 3
origin_tech = "combat=3"
diff --git a/code/modules/hydroponics/grown/olive.dm b/code/modules/hydroponics/grown/olive.dm
index 60cafcca01c..4eb35d2a566 100644
--- a/code/modules/hydroponics/grown/olive.dm
+++ b/code/modules/hydroponics/grown/olive.dm
@@ -9,7 +9,6 @@
lifespan = 150
endurance = 35
yield = 5
- growthstages = 6
growing_icon = 'icons/obj/hydroponics/growing_fruits.dmi'
genes = list(/datum/plant_gene/trait/repeated_harvest)
mutatelist = list()
diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm
index e5e66d8c007..9fc0c7e05d1 100644
--- a/code/modules/hydroponics/grown/potato.dm
+++ b/code/modules/hydroponics/grown/potato.dm
@@ -32,9 +32,7 @@
name = "potato wedges"
desc = "Slices of neatly cut potato."
icon_state = "potato_wedges"
- filling_color = "#E9967A"
tastes = list("potato" = 1)
- bitesize = 100
distill_reagent = "sbiten"
diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm
index 5f6592da81f..20fa91d92d3 100644
--- a/code/modules/hydroponics/grown/pumpkin.dm
+++ b/code/modules/hydroponics/grown/pumpkin.dm
@@ -56,7 +56,6 @@
desc = "The pumpkin's toxic sibling."
icon_state = "blumpkin"
filling_color = "#87CEFA"
- bitesize_mod = 2
tastes = list("blumpkin" = 1)
wine_power = 0.5
carved_type = /obj/item/clothing/head/hardhat/pumpkinhead/blumpkin
diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm
index b1cc2c829ac..660726e6895 100644
--- a/code/modules/hydroponics/grown/root.dm
+++ b/code/modules/hydroponics/grown/root.dm
@@ -28,8 +28,6 @@
name = "carrot wedges"
desc = "Slices of neatly cut carrot."
icon_state = "carrot_wedges"
- filling_color = "#FFA500"
- bitesize_mod = 2
/obj/item/food/grown/carrot/attackby__legacy__attackchain(obj/item/I, mob/user, params)
if(I.sharp)
diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm
index 041b6c74898..e6062ddf702 100644
--- a/code/modules/hydroponics/grown/tomato.dm
+++ b/code/modules/hydroponics/grown/tomato.dm
@@ -84,7 +84,6 @@
species = "bluespacetomato"
plantname = "Bluespace Tomato Plants"
product = /obj/item/food/grown/tomato/blue/bluespace
- yield = 2
mutatelist = list()
genes = list(/datum/plant_gene/trait/squash, /datum/plant_gene/trait/slip, /datum/plant_gene/trait/teleport, /datum/plant_gene/trait/repeated_harvest)
reagents_add = list("lube" = 0.2, "singulo" = 0.2, "vitamin" = 0.04, "plantmatter" = 0.1)
diff --git a/code/modules/hydroponics/grown/towercap.dm b/code/modules/hydroponics/grown/towercap.dm
index 686e3698246..fd0e12b9cd6 100644
--- a/code/modules/hydroponics/grown/towercap.dm
+++ b/code/modules/hydroponics/grown/towercap.dm
@@ -39,8 +39,6 @@
icon_state = "logs"
force = 5
throwforce = 5
- w_class = WEIGHT_CLASS_NORMAL
- throw_speed = 2
throw_range = 3
origin_tech = "materials=1"
attack_verb = list("bashed", "battered", "bludgeoned", "whacked")
@@ -130,7 +128,6 @@
var/heat_factor = 1000 // How much does this heat up the air?
var/light_strength = 6
light_color = "#ED9200"
- density = FALSE
anchored = TRUE
new_attack_chain = TRUE
@@ -229,8 +226,6 @@
desc = "For grilling, broiling, charring, smoking, heating, roasting, toasting, simmering, searing, melting, and occasionally burning things."
icon = 'icons/obj/hydroponics/equipment.dmi'
icon_state = "bonfire"
- density = FALSE
- anchored = TRUE
buckle_lying = FALSE
/obj/structure/lightable/bonfire/dense
@@ -289,7 +284,6 @@
..()
/obj/structure/lightable/torch/lava_bridge
- anchored = TRUE
/obj/structure/lightable/torch/lava_bridge/Initialize(mapload)
. = ..()
diff --git a/code/modules/hydroponics/hydroitemdefines.dm b/code/modules/hydroponics/hydroitemdefines.dm
index 90eaab7b7fb..66f20ac5d6e 100644
--- a/code/modules/hydroponics/hydroitemdefines.dm
+++ b/code/modules/hydroponics/hydroitemdefines.dm
@@ -41,11 +41,6 @@
item_state = "plantbgone"
belt_icon = null
volume = 100
- container_type = OPENCONTAINER
- slot_flags = ITEM_SLOT_BELT
- throwforce = 0
- w_class = WEIGHT_CLASS_SMALL
- throw_speed = 3
throw_range = 10
list_reagents = list("atrazine" = 100)
@@ -62,11 +57,6 @@
item_state = "plantbgone"
belt_icon = null
volume = 100
- container_type = OPENCONTAINER
- slot_flags = ITEM_SLOT_BELT
- throwforce = 0
- w_class = WEIGHT_CLASS_SMALL
- throw_speed = 3
throw_range = 10
list_reagents = list("pestkiller" = 100)
@@ -144,7 +134,6 @@
icon_state = "scythe0"
force = 13
throwforce = 5
- throw_speed = 2
throw_range = 3
w_class = WEIGHT_CLASS_BULKY
flags = CONDUCT
@@ -248,13 +237,9 @@
/obj/item/reagent_containers/glass/bottle/nutrient
name = "jug of nutrient"
desc = "A decent sized plastic jug."
- icon = 'icons/obj/chemical.dmi'
icon_state = "plastic_jug"
item_state = "plastic_jug"
- w_class = WEIGHT_CLASS_TINY
- amount_per_transfer_from_this = 10
possible_transfer_amounts = list(1,2,5,10,20,40,80)
- container_type = OPENCONTAINER
volume = 80
hitsound = 'sound/weapons/jug_empty_impact.ogg'
mob_throw_hit_sound = 'sound/weapons/jug_empty_impact.ogg'
@@ -307,7 +292,6 @@
/obj/item/reagent_containers/glass/bottle/nutrient/ez
name = "jug of E-Z-Nutrient"
desc = "Contains a basic fertilizer with no special traits."
- icon = 'icons/obj/chemical.dmi'
icon_state = "plastic_jug_ez"
list_reagents = list("eznutrient" = 80)
@@ -320,25 +304,19 @@
/obj/item/reagent_containers/glass/bottle/nutrient/l4z
name = "jug of Left 4 Zed"
desc = "Contains a fertilizer that limits plant yields to no more than one and causes significant mutations in plants."
- icon = 'icons/obj/chemical.dmi'
icon_state = "plastic_jug_l4z"
list_reagents = list("left4zednutrient" = 80)
/obj/item/reagent_containers/glass/bottle/nutrient/rh
name = "jug of Robust Harvest"
desc = "Contains a fertilizer that increases the yield of a plant by 30% while causing no mutations."
- icon = 'icons/obj/chemical.dmi'
icon_state = "plastic_jug_rh"
list_reagents = list("robustharvestnutrient" = 80)
/obj/item/reagent_containers/glass/bottle/nutrient/empty
- icon = 'icons/obj/chemical.dmi'
- icon_state = "plastic_jug"
/obj/item/reagent_containers/glass/bottle/nutrient/killer
- icon = 'icons/obj/chemical.dmi'
icon_state = "plastic_jug_k"
- w_class = WEIGHT_CLASS_TINY
/obj/item/reagent_containers/glass/bottle/nutrient/killer/Initialize(mapload)
. = ..()
@@ -347,13 +325,11 @@
/obj/item/reagent_containers/glass/bottle/nutrient/killer/weedkiller
name = "jug of weed killer"
desc = "Contains a herbicide."
- icon = 'icons/obj/chemical.dmi'
icon_state = "plastic_jug_wk"
list_reagents = list("atrazine" = 80)
/obj/item/reagent_containers/glass/bottle/nutrient/killer/pestkiller
name = "jug of pest spray"
desc = "Contains a pesticide."
- icon = 'icons/obj/chemical.dmi'
icon_state = "plastic_jug_pk"
list_reagents = list("pestkiller" = 80)
diff --git a/code/modules/hydroponics/hydroponics_tray.dm b/code/modules/hydroponics/hydroponics_tray.dm
index 7b2cb64a435..d686cea0a66 100644
--- a/code/modules/hydroponics/hydroponics_tray.dm
+++ b/code/modules/hydroponics/hydroponics_tray.dm
@@ -93,8 +93,6 @@
create_reagents(300) // This should get cleared every time it is filled, barring admemery
/obj/machinery/hydroponics/constructable
- name = "hydroponics tray"
- icon = 'icons/obj/hydroponics/equipment.dmi'
icon_state = "hydrotray3"
/obj/machinery/hydroponics/constructable/Initialize(mapload)
@@ -1027,7 +1025,6 @@
/// Not actually hydroponics at all! Honk!
/obj/machinery/hydroponics/soil
name = "soil"
- icon = 'icons/obj/hydroponics/equipment.dmi'
icon_state = "soil"
density = FALSE
power_state = NO_POWER_USE
diff --git a/code/modules/instruments/objs/items/instrument_items.dm b/code/modules/instruments/objs/items/instrument_items.dm
index 4c8477c4d47..5c524455f3e 100644
--- a/code/modules/instruments/objs/items/instrument_items.dm
+++ b/code/modules/instruments/objs/items/instrument_items.dm
@@ -105,8 +105,6 @@
/obj/item/instrument/saxophone/spectral
name = "spectral saxophone"
desc = "This spooky sound will be sure to leave mortals in bones."
- icon_state = "saxophone"
- item_state = "saxophone"
force = 0
attack_verb = list("played", "jazzed", "saxxed", "mourned", "dooted", "spooked")
@@ -128,8 +126,6 @@
/obj/item/instrument/trombone/spectral
name = "spectral trombone"
desc = "A skeleton's favorite instrument. Apply directly on the mortals."
- icon_state = "trombone"
- item_state = "trombone"
force = 0
attack_verb = list("played", "jazzed", "tromboned", "mourned", "dooted", "spooked")
@@ -186,7 +182,6 @@
w_class = WEIGHT_CLASS_TINY
force = 0
throw_speed = 3
- throw_range = 7
hitsound = 'sound/items/bikehorn.ogg'
allowed_instrument_ids = list("bikehorn", "honk")
diff --git a/code/modules/library/book.dm b/code/modules/library/book.dm
index a2c1e104fc2..45cafe512b3 100644
--- a/code/modules/library/book.dm
+++ b/code/modules/library/book.dm
@@ -18,7 +18,6 @@
throw_speed = 1
throw_range = 5
force = 2
- w_class = WEIGHT_CLASS_NORMAL
attack_verb = list("bashed", "whacked")
resistance_flags = FLAMMABLE
drop_sound = 'sound/items/handling/book_drop.ogg'
@@ -393,7 +392,6 @@
name = "\improper Codex Gigas"
desc = "A book documenting the nature of devils, it seems whatever magic that once possessed this codex is long gone."
icon_state = "demonomicon"
- throw_speed = 1
throw_range = 10
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
author = "Forces beyond your comprehension"
diff --git a/code/modules/library/library_computer.dm b/code/modules/library/library_computer.dm
index 54c6f3a900c..42390b60041 100644
--- a/code/modules/library/library_computer.dm
+++ b/code/modules/library/library_computer.dm
@@ -19,12 +19,9 @@
/obj/machinery/computer/library
name = "Library Computer"
desc = "Used by dusty librarians for their dusty books."
- icon = 'icons/obj/computer.dmi'
icon_state = "oldcomp"
icon_screen = "library"
icon_keyboard = null
- density = TRUE
- anchored = TRUE
//We define a required access only to lock library specific actions like ordering/managing books to librarian access+
req_one_access = list(ACCESS_LIBRARY)
diff --git a/code/modules/library/library_equipment.dm b/code/modules/library/library_equipment.dm
index 4453dcabc49..8f4f44c14d4 100644
--- a/code/modules/library/library_equipment.dm
+++ b/code/modules/library/library_equipment.dm
@@ -148,7 +148,6 @@
var/category = null
var/book_count = 5
icon_state = "random_bookshelf"
- anchored = TRUE
/obj/structure/bookcase/random/Initialize(mapload)
. = ..()
diff --git a/code/modules/mapping/windoor_access_helpers.dm b/code/modules/mapping/windoor_access_helpers.dm
index 8f81052f0ad..d70dcab71c4 100644
--- a/code/modules/mapping/windoor_access_helpers.dm
+++ b/code/modules/mapping/windoor_access_helpers.dm
@@ -1,5 +1,4 @@
/obj/effect/mapping_helpers/airlock/windoor/access
- layer = DOOR_HELPER_LAYER
icon_state = "access_windoor"
var/access
diff --git a/code/modules/martial_arts/judo.dm b/code/modules/martial_arts/judo.dm
index 8bf8a1a3046..48c328ef678 100644
--- a/code/modules/martial_arts/judo.dm
+++ b/code/modules/martial_arts/judo.dm
@@ -12,9 +12,6 @@
/obj/item/storage/belt/judobelt
name = "\improper Corporate Judo Belt"
desc = "Teaches the wearer NT Corporate Judo."
- icon = 'icons/obj/clothing/belts.dmi'
- lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi'
icon_state = "judobelt"
item_state = "judo"
w_class = WEIGHT_CLASS_BULKY
diff --git a/code/modules/martial_arts/krav_maga.dm b/code/modules/martial_arts/krav_maga.dm
index 4fbc39be841..b7412e498c9 100644
--- a/code/modules/martial_arts/krav_maga.dm
+++ b/code/modules/martial_arts/krav_maga.dm
@@ -145,8 +145,6 @@
// Krav Maga gloves
/obj/item/clothing/gloves/color/black/krav_maga
can_be_cut = FALSE
- resistance_flags = NONE
- dyeable = TRUE
var/datum/martial_art/krav_maga/style
/obj/item/clothing/gloves/color/black/krav_maga/Initialize(mapload)
@@ -203,11 +201,6 @@
siemens_coefficient = 0
permeability_coefficient = 0.05
strip_delay = 8 SECONDS
- cold_protection = HANDS
- min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
- heat_protection = HANDS
- max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
- resistance_flags = NONE
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 200, ACID = 50)
/obj/item/clothing/gloves/color/black/krav_maga/combat/examine_more(mob/user)
diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
index 70676bfc4eb..26d68428095 100644
--- a/code/modules/martial_arts/martial.dm
+++ b/code/modules/martial_arts/martial.dm
@@ -376,7 +376,6 @@
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
throwforce = 20
- throw_speed = 2
attack_verb = list("smashed", "slammed", "whacked", "thwacked")
/obj/item/bostaff/Initialize(mapload)
diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm
index 55254d93c14..aeb81165663 100644
--- a/code/modules/mining/abandonedcrates.dm
+++ b/code/modules/mining/abandonedcrates.dm
@@ -3,7 +3,6 @@
/obj/structure/closet/crate/secure/loot
name = "abandoned crate"
desc = "What could be inside?"
- icon_state = "securecrate"
var/code = null
var/lastattempt = null
var/attempts = 10
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index 5499c70e2a1..739c26c5d57 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -28,7 +28,6 @@
desc = "An armoured hood for exploring harsh environments."
icon_state = "explorer"
item_state = "explorer"
- body_parts_covered = HEAD
flags = BLOCKHAIR | NODROP
flags_cover = HEADCOVERSEYES
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
@@ -51,14 +50,12 @@
icon_state = "hostile_env"
item_state = "hostile_env"
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET
resistance_flags = FIRE_PROOF | LAVA_PROOF
flags_2 = RAD_PROTECT_CONTENTS_2
slowdown = 0
armor = list(MELEE = 120, BULLET = 35, LASER = 25, ENERGY = 25, BOMB = 150, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY)
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/melee/spellblade)
hide_tail_by_species = list("Vox", "Vulpkanin", "Unathi", "Tajaran")
- dyeable = FALSE
sprite_sheets = list(
"Vox" = 'icons/mob/clothing/species/vox/suit.dmi',
@@ -90,9 +87,7 @@
desc = "Hostile Environment Cross-Kinetic Helmet: A helmet designed to withstand the wide variety of hazards from Lavaland. It wasn't enough for its last owner."
icon_state = "hostile_env"
item_state = "hostile_env"
- w_class = WEIGHT_CLASS_NORMAL
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
- heat_protection = HEAD
armor = list(MELEE = 120, BULLET = 35, LASER = 25, ENERGY = 25, BOMB = 150, RAD = INFINITY, FIRE = INFINITY, ACID = INFINITY)
resistance_flags = FIRE_PROOF | LAVA_PROOF
flags_2 = RAD_PROTECT_CONTENTS_2
@@ -110,19 +105,12 @@
desc = "An unarmored heat resistant mining suit, heavy and uncomfortable as a punishment in itself."
icon_state = "hardsuit_gulag"
item_state = "hardsuit_gulag"
- w_class = WEIGHT_CLASS_BULKY
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
- body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
- slowdown = 1
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 50, RAD = 10, FIRE = 50, ACID = 50)
- flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
- heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
- cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
- dyeable = FALSE
strip_delay = 60
put_on_delay = 60
resistance_flags = FIRE_PROOF
@@ -133,12 +121,9 @@
desc = "A metallic helmet designed to operate with the mining suit, while dense it offers little protection aside heat."
icon_state = "hardsuit_gulag"
item_state = "hardsuit_gulag"
- body_parts_covered = HEAD
flags = BLOCKHAIR
flags_cover = HEADCOVERSEYES
min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT
- cold_protection = HEAD
- heat_protection = HEAD
armor = list(MELEE = 10, BULLET = 5, LASER = 10, ENERGY = 5, BOMB = 50, RAD = 10, FIRE = 50, ACID = 50)
resistance_flags = FIRE_PROOF
diff --git a/code/modules/mining/equipment/hardmode_grenade.dm b/code/modules/mining/equipment/hardmode_grenade.dm
index 32eee7eb263..b7dd5de18c0 100644
--- a/code/modules/mining/equipment/hardmode_grenade.dm
+++ b/code/modules/mining/equipment/hardmode_grenade.dm
@@ -1,9 +1,7 @@
/obj/item/grenade/megafauna_hardmode
name = "\improper HRD-MDE Scanning Grenade"
desc = "An advanced grenade that releases nanomachines, which enter nearby megafauna. This will enrage them greatly, but allows nanotrasen to fully research their abilities."
- icon = 'icons/obj/grenade.dmi'
icon_state = "enrager"
- item_state = "grenade"
/obj/item/grenade/megafauna_hardmode/prime()
update_mob()
@@ -15,7 +13,6 @@
/obj/item/paper/hardmode
name = "HRD-MDE Scanner Guide"
- icon_state = "paper"
info = {"Welcome to the NT HRD-MDE Project
This guide will cover the basics on the Hi-tech Research and Development, Mining Department Experiment project.
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index e8a175ff62c..dd1c62812d7 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -9,7 +9,6 @@
righthand_file = 'icons/mob/inhands/weapons_righthand.dmi'
icon_state = "crusher"
item_state = "crusher0"
- force = 0 //You can't hit stuff unless wielded
w_class = WEIGHT_CLASS_BULKY
slot_flags = ITEM_SLOT_BACK
throwforce = 5
@@ -197,7 +196,6 @@
icon_state = "pulse1"
nodamage = TRUE
damage = 0 //We're just here to mark people. This is still a melee weapon.
- damage_type = BRUTE
flag = BOMB
range = 6
log_override = TRUE
@@ -434,7 +432,6 @@
icon_state = "demon_claws"
gender = PLURAL
denied_type = /obj/item/crusher_trophy/demon_claws
- bonus_value = 10
var/static/list/damage_heal_order = list(BRUTE, BURN, OXY)
/obj/item/crusher_trophy/demon_claws/effect_desc()
diff --git a/code/modules/mining/equipment/lazarus_injector.dm b/code/modules/mining/equipment/lazarus_injector.dm
index 5bbd2f4676c..89efc818957 100644
--- a/code/modules/mining/equipment/lazarus_injector.dm
+++ b/code/modules/mining/equipment/lazarus_injector.dm
@@ -6,7 +6,6 @@
icon_state = "lazarus_hypo"
item_state = "hypo"
origin_tech = "biotech=4;magnets=6"
- throwforce = 0
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 5
@@ -81,7 +80,6 @@
icon = 'icons/obj/mobcap.dmi'
icon_state = "mobcap0"
w_class = WEIGHT_CLASS_TINY
- throw_range = 7
var/mob/living/simple_animal/captured = null
var/colorindex = 0
var/capture_type = SENTIENCE_ORGANIC //So you can't capture boss monsters or robots with it
diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm
index deb2ff69465..615c6131f5b 100644
--- a/code/modules/mining/equipment/mineral_scanner.dm
+++ b/code/modules/mining/equipment/mineral_scanner.dm
@@ -35,9 +35,7 @@
name = "advanced automatic mining scanner"
icon_state = "mining0"
item_state = "analyzer"
- w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
- slot_flags = ITEM_SLOT_BELT
var/cooldown = 35
var/current_cooldown = 0
var/range = 7
diff --git a/code/modules/mining/equipment/mining_tools.dm b/code/modules/mining/equipment/mining_tools.dm
index 6d7317191c9..f688446804c 100644
--- a/code/modules/mining/equipment/mining_tools.dm
+++ b/code/modules/mining/equipment/mining_tools.dm
@@ -18,7 +18,6 @@
sharp = TRUE
var/excavation_amount = 100
usesound = 'sound/effects/picaxe1.ogg'
- toolspeed = 1
/obj/item/pickaxe/Initialize(mapload)
. = ..()
@@ -121,7 +120,6 @@
name = "sonic jackhammer"
desc = "Cracks rocks with sonic blasts, and doubles as a demolition power tool for smashing walls."
icon_state = "jackhammer"
- item_state = "jackhammer"
origin_tech = "materials=6;powerstorage=4;engineering=5;magnets=4"
digsound = list('sound/weapons/sonic_jackhammer.ogg')
hitsound = 'sound/weapons/sonic_jackhammer.ogg'
@@ -139,7 +137,6 @@
force = 8
throwforce = 4
item_state = "shovel"
- w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL = 200)
origin_tech = "materials=2;engineering=2"
attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
diff --git a/code/modules/mining/equipment/resonator.dm b/code/modules/mining/equipment/resonator.dm
index 5a6853f3d91..4b01acda2b8 100644
--- a/code/modules/mining/equipment/resonator.dm
+++ b/code/modules/mining/equipment/resonator.dm
@@ -6,7 +6,6 @@
item_state = "resonator"
origin_tech = "magnets=3;engineering=3"
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 = WEIGHT_CLASS_NORMAL
force = 15
throwforce = 10
@@ -69,7 +68,6 @@
/obj/effect/temp_visual/resonance
name = "resonance field"
desc = "A resonating field that significantly damages anything inside of it when the field eventually ruptures. More damaging in low pressure environments."
- icon = 'icons/effects/effects.dmi'
icon_state = "shield1"
layer = ABOVE_ALL_MOB_LAYER
duration = 60 SECONDS
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index 5f15ccb3a9f..6329eb0f8b2 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -2,7 +2,6 @@
name = "\improper Emergency Shelter"
icon_state = "away"
requires_power = FALSE
- has_gravity = TRUE
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
ambientsounds = MINING_SOUNDS
@@ -94,8 +93,6 @@
icon = 'icons/obj/smooth_structures/windows/pod_window.dmi'
icon_state = "pod_window-0"
base_icon_state = "pod_window"
- smoothing_flags = SMOOTH_BITMASK
- glass_type = /obj/item/stack/sheet/titaniumglass
smoothing_groups = list(SMOOTH_GROUP_SHUTTLE_PARTS, SMOOTH_GROUP_SURVIVAL_TIANIUM_POD)
canSmoothWith = list(SMOOTH_GROUP_SURVIVAL_TIANIUM_POD)
@@ -174,7 +171,6 @@
//Sleeper
/obj/machinery/sleeper/survival_pod
icon = 'icons/obj/lavaland/survival_pod.dmi'
- icon_state = "sleeper-open"
density = FALSE
/obj/machinery/sleeper/survival_pod/Initialize(mapload)
@@ -247,7 +243,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/economy/vending/wallmed/survival_pod,
//Bed
/obj/structure/bed/pod
icon = 'icons/obj/lavaland/survival_pod.dmi'
- icon_state = "bed"
//Survival Storage Unit
/obj/machinery/smartfridge/survival_pod
@@ -372,7 +367,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/economy/vending/wallmed/survival_pod,
name = "tubes"
anchored = TRUE
layer = MOB_LAYER - 0.2
- density = FALSE
/obj/structure/tubes/wrench_act(mob/living/user, obj/item/W)
. = TRUE
diff --git a/code/modules/mining/equipment/vendor_items.dm b/code/modules/mining/equipment/vendor_items.dm
index 8868d4655b5..4827864135a 100644
--- a/code/modules/mining/equipment/vendor_items.dm
+++ b/code/modules/mining/equipment/vendor_items.dm
@@ -5,10 +5,8 @@
/obj/item/clothing/mask/facehugger/toy
item_state = "facehugger_inactive"
desc = "A toy often used to play pranks on other miners by putting it in their beds. It takes a bit to recharge after latching onto something."
- throwforce = 0
real = 0
sterile = 1
- tint = 3 //Makes it feel more authentic when it latches on
/obj/item/clothing/mask/facehugger/toy/Die()
return
diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm
index 9f268d4441b..8e507685721 100644
--- a/code/modules/mining/equipment/wormhole_jaunter.dm
+++ b/code/modules/mining/equipment/wormhole_jaunter.dm
@@ -8,7 +8,6 @@ GLOBAL_LIST_EMPTY(wormhole_effect)
The wormholes it creates are unpleasant to travel through, to say the least. If attached to your belt, it'll automatically activate should you fall into a chasm."
icon_state = "Jaunter"
item_state = "electronic"
- throwforce = 0
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 5
@@ -76,7 +75,6 @@ GLOBAL_LIST_EMPTY(wormhole_effect)
icon = 'icons/effects/effects.dmi'
icon_state = "bhole3"
desc = "A stable hole in the universe made by a wormhole jaunter. Turbulent doesn't even begin to describe how rough passage through one of these is, but at least it will always get you somewhere near a beacon."
- failchance = 0
/obj/effect/portal/jaunt_tunnel/can_teleport(atom/movable/M)
if(!emagged && ismegafauna(M))
@@ -242,7 +240,6 @@ GLOBAL_LIST_EMPTY(wormhole_effect)
name = "wormhole weaver"
icon = 'icons/obj/device.dmi'
icon_state = "wormhole_weaver"
- item_state = "electronic"
desc = "This peculiar device is a prototype from a discontinued project. It was designed as an alternative to jaunters, offering more precise teleportation. However, as a prototype, it drains its entire battery with a single wormhole and can only target the beacons included in the kit."
/// Where are we teleporting to?
var/destination
diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm
index 71dee585df6..e0b0d3e106e 100644
--- a/code/modules/mining/fulton.dm
+++ b/code/modules/mining/fulton.dm
@@ -6,7 +6,6 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
icon = 'icons/obj/fulton.dmi'
icon_state = "extraction_pack"
flags = NOBLUDGEON
- w_class = WEIGHT_CLASS_NORMAL
new_attack_chain = TRUE
var/obj/structure/extraction_point/beacon
var/list/beacon_networks = list("station")
@@ -177,7 +176,6 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
icon = 'icons/obj/fulton.dmi'
icon_state = "extraction_point"
anchored = TRUE
- density = FALSE
var/beacon_network = "station"
/obj/structure/extraction_point/Initialize(mapload)
diff --git a/code/modules/mining/laborcamp/laborshuttle.dm b/code/modules/mining/laborcamp/laborshuttle.dm
index 4e64315478b..2fe9d4ed215 100644
--- a/code/modules/mining/laborcamp/laborshuttle.dm
+++ b/code/modules/mining/laborcamp/laborshuttle.dm
@@ -32,7 +32,6 @@
desc = "A console used by released prisoners to move the shuttle."
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
- density = FALSE
var/inserted_id_uid
var/obj/item/radio/intercom/announcer
@@ -165,7 +164,6 @@
desc = "A console used by prisoners to check the progress on their quotas. Simply swipe a prisoner ID."
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
- density = FALSE
/obj/machinery/mineral/labor_points_checker/attack_hand(mob/user)
. = ..()
diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm
index d8ccea7d08a..fb5b67dc397 100644
--- a/code/modules/mining/lavaland/ash_flora.dm
+++ b/code/modules/mining/lavaland/ash_flora.dm
@@ -145,7 +145,6 @@
harvest_message_low = "You pick a cactus fruit."
harvest_message_med = "You pick several cactus fruit." //shouldn't show up, because you can't get more than two
harvest_message_high = "You pick a pair of cactus fruit."
- regrowth_time_low = 4800
regrowth_time_high = 7200
/obj/structure/flora/ash/cacti/Initialize(mapload)
@@ -165,7 +164,6 @@
density = TRUE
resistance_flags = FIRE_PROOF
harvest = /obj/item/stack/ore/glass/basalt
- harvest_time = 6 SECONDS
harvest_amount_low = 10
harvest_amount_high = 20
harvest_message_low = "You finish mining the rock."
@@ -195,8 +193,6 @@
desc = "Some shavings from a tall mushroom. With enough, might serve as a bowl."
icon = 'icons/obj/lavaland/ash_flora.dmi'
icon_state = "mushroom_shavings"
- w_class = WEIGHT_CLASS_TINY
- resistance_flags = FLAMMABLE
max_integrity = 100
seed = /obj/item/seeds/lavaland/polypore
wine_power = 0.2
@@ -316,7 +312,6 @@
name = "Mushroom Bowl"
result = list(/obj/item/reagent_containers/drinks/mushroom_bowl)
reqs = list(/obj/item/food/grown/ash_flora/shavings = 5)
- time = 30
category = CAT_PRIMAL
/obj/item/reagent_containers/drinks/mushroom_bowl
diff --git a/code/modules/mining/lavaland/loot/ashdragon_loot.dm b/code/modules/mining/lavaland/loot/ashdragon_loot.dm
index b57116b6a9a..c3938311649 100644
--- a/code/modules/mining/lavaland/loot/ashdragon_loot.dm
+++ b/code/modules/mining/lavaland/loot/ashdragon_loot.dm
@@ -212,8 +212,6 @@
agent = "dragon's blood"
desc = "What do dragons have to do with Space Station 13?"
stage_prob = 20
- severity = BIOHAZARD
- visibility_flags = 0
stage1 = list("Your bones ache.")
stage2 = list("Your skin feels scaley.")
stage3 = list("You have an overwhelming urge to terrorize some peasants.", "Your teeth feel sharper.")
diff --git a/code/modules/mining/lavaland/loot/colossus_loot.dm b/code/modules/mining/lavaland/loot/colossus_loot.dm
index 178d82860e4..7e66922fc52 100644
--- a/code/modules/mining/lavaland/loot/colossus_loot.dm
+++ b/code/modules/mining/lavaland/loot/colossus_loot.dm
@@ -68,7 +68,6 @@
/// Warps the area you're in to look like a new one
/obj/machinery/anomalous_crystal/theme_warp
- activation_method = "touch"
cooldown_add = 200
var/terrain_theme = "winter"
var/NewTerrainFloors
@@ -140,7 +139,6 @@
/// Generates a projectile when interacted with
/obj/machinery/anomalous_crystal/emitter
- activation_method = "touch"
cooldown_add = 50
var/generated_projectile = /obj/item/projectile/beam/emitter
@@ -170,7 +168,6 @@
/// Revives anyone nearby, but turns them into shadowpeople and renders them uncloneable, so the crystal is your only hope of getting up again if you go down.
/obj/machinery/anomalous_crystal/dark_reprise
- activation_method = "touch"
activation_sound = 'sound/hallucinations/growl1.ogg'
/obj/machinery/anomalous_crystal/dark_reprise/ActivationReaction(mob/user, method)
@@ -189,7 +186,6 @@
/// Lets ghost spawn as helpful creatures that can only heal people slightly. Incredibly fragile and they can't converse with humans
/obj/machinery/anomalous_crystal/helpers
- activation_method = "touch"
var/ready_to_deploy = 0
/obj/machinery/anomalous_crystal/helpers/ActivationReaction(mob/user, method)
@@ -232,7 +228,6 @@
icon_state = "lightgeist"
icon_living = "lightgeist"
icon_dead = "butterfly_dead"
- turns_per_move = 1
response_help = "waves away"
response_disarm = "brushes aside"
response_harm = "disrupts"
@@ -252,7 +247,6 @@
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
luminosity = 4
faction = list("neutral")
- universal_understand = TRUE
del_on_death = TRUE
unsuitable_atmos_damage = 0
minbodytemp = 0
@@ -287,7 +281,6 @@
/// Allows you to bodyjack small animals, then exit them at your leisure, but you can only do this once per activation. Because they blow up. Also, if the bodyjacked animal dies, SO DO YOU.
/obj/machinery/anomalous_crystal/possessor
- activation_method = "touch"
/obj/machinery/anomalous_crystal/possessor/ActivationReaction(mob/user, method)
if(..())
@@ -307,7 +300,6 @@
name = "quantum entanglement stasis warp field"
desc = "You can hardly comprehend this thing... which is why you can't see it."
icon_state = null //This shouldn't even be visible, so if it DOES show up, at least nobody will notice
- density = TRUE
anchored = TRUE
resistance_flags = FIRE_PROOF | ACID_PROOF | INDESTRUCTIBLE
var/mob/living/simple_animal/holder_animal
@@ -360,7 +352,6 @@
desc = "Exits the body you are possessing."
base_cooldown = 60
clothes_req = FALSE
- invocation_type = "none"
action_icon_state = "exit_possession"
sound = null
diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm
index 47ad887ff74..09f151db1bf 100644
--- a/code/modules/mining/lavaland/loot/tendril_loot.dm
+++ b/code/modules/mining/lavaland/loot/tendril_loot.dm
@@ -5,7 +5,6 @@
name = "paradox bag"
desc = "Somehow, it's in two places at once."
max_combined_w_class = 60
- max_w_class = WEIGHT_CLASS_NORMAL
var/obj/item/shared_storage/red
var/obj/item/shared_storage/blue
@@ -27,8 +26,6 @@
bag?.update_viewers()
/obj/item/shared_storage/red
- name = "paradox bag"
- desc = "Somehow, it's in two places at once."
/obj/item/shared_storage/red/New()
..()
@@ -158,7 +155,6 @@
item_state = "rods"
desc = "Not to be confused with the kind Research hassles you for."
force = 12
- w_class = WEIGHT_CLASS_NORMAL
resistance_flags = LAVA_PROOF | FIRE_PROOF
/datum/crafting_recipe/oar
@@ -353,10 +349,8 @@
name = "hook"
icon_state = "hook"
icon = 'icons/obj/lavaland/artefacts.dmi'
- pass_flags = PASSTABLE
damage = 25
armour_penetration_percentage = 100
- damage_type = BRUTE
hitsound = 'sound/effects/splat.ogg'
weaken = 1 SECONDS
knockdown = 6 SECONDS
@@ -441,7 +435,6 @@
to_chat(user, "[src] is still recharging.")
/obj/effect/immortality_talisman
- icon_state = "blank"
icon = 'icons/effects/effects.dmi'
var/can_destroy = FALSE
diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm
index 2cb41350bbe..9e62a844b64 100644
--- a/code/modules/mining/machine_processing.dm
+++ b/code/modules/mining/machine_processing.dm
@@ -16,7 +16,6 @@
name = "production machine console"
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
- density = FALSE
anchored = TRUE
var/obj/machinery/mineral/processing_unit/machine = null
speed_process = TRUE
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index 4327a4f9418..0ba95ffb4e0 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -10,11 +10,8 @@
icon_state = "ore_redemption"
density = TRUE
anchored = TRUE
- input_dir = NORTH
- output_dir = SOUTH
req_access = list(ACCESS_MINERAL_STOREROOM)
speed_process = TRUE
- layer = BELOW_OBJ_LAYER
// Settings
/// The access number required to claim points from the machine.
var/req_access_claim = ACCESS_MINING_STATION
diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm
index 9299a2bb9fb..6ea8b0ba294 100644
--- a/code/modules/mining/machine_stacking.dm
+++ b/code/modules/mining/machine_stacking.dm
@@ -5,7 +5,6 @@
icon = 'icons/obj/machines/mining_machines.dmi'
icon_state = "console"
desc = "Controls a stacking machine... in theory."
- density = FALSE
anchored = TRUE
var/obj/machinery/mineral/stacking_machine/machine
diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm
index 4065bcdf4c3..8115deb7435 100644
--- a/code/modules/mining/mine_items.dm
+++ b/code/modules/mining/mine_items.dm
@@ -3,7 +3,6 @@
//this item is intended to give the effect of entering the mine, so that light gradually fades
/obj/effect/light_emitter
name = "Light emitter"
- anchored = TRUE
invisibility = 101
var/set_luminosity = 8
var/set_cap = 0
@@ -22,7 +21,6 @@
/obj/structure/closet/wardrobe/miner
name = "mining wardrobe"
- icon_state = "generic"
closed_door_sprite = "mixed"
/obj/structure/closet/wardrobe/miner/populate_contents()
@@ -90,6 +88,5 @@
desc = "A mining car. This one doesn't work on rails, but has to be dragged."
name = "mining car (not for rails)"
icon_state = "miningcar"
- density = TRUE
icon_opened = "miningcar_open"
icon_closed = "miningcar"
diff --git a/code/modules/mining/money_bag.dm b/code/modules/mining/money_bag.dm
index cfe03086e7d..f8034ab7e94 100644
--- a/code/modules/mining/money_bag.dm
+++ b/code/modules/mining/money_bag.dm
@@ -2,7 +2,6 @@
name = "money bag"
icon_state = "moneybag"
force = 10
- throwforce = 0
resistance_flags = FLAMMABLE
max_integrity = 100
w_class = WEIGHT_CLASS_BULKY
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index 3db620b4d2f..c044d83562d 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -12,7 +12,6 @@
lefthand_file = 'icons/mob/inhands/ore_lefthand.dmi'
righthand_file = 'icons/mob/inhands/ore_righthand.dmi'
icon_state = "ore"
- max_amount = 50
singular_name = "ore chunk"
var/points = 0 //How many points this ore gets you from the ore redemption machine
var/refined_type = null //What this ore defaults to being refined into
@@ -53,7 +52,6 @@
desc = "A coarse, dust mainly composed of quartz and silica-rich rock. Among its many uses, it can be refined into glass when fired at high tempratures."
icon_state = "sand"
item_state = "sand"
- origin_tech = "materials=1"
singular_name = "sand pile"
points = 1
refined_type = /obj/item/stack/sheet/glass
@@ -110,8 +108,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
/obj/item/stack/ore/glass/basalt/ancient
name = "ancient sand"
desc = "Basultic sand mined from an exceptionally old and compacted formation."
- icon_state = "volcanic_sand"
- item_state = "volcanic_sand"
singular_name = "ancient sand pile"
/obj/item/stack/ore/iron
@@ -119,7 +115,6 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
desc = "Exceptionally common ore that can be refined into iron and steel."
icon_state = "iron_ore"
item_state = "iron_ore"
- origin_tech = "materials=1"
singular_name = "iron ore chunk"
points = 1
refined_type = /obj/item/stack/sheet/metal
diff --git a/code/modules/mob/dead/observer/observer_base.dm b/code/modules/mob/dead/observer/observer_base.dm
index ce88be67df6..a6ec09ea865 100644
--- a/code/modules/mob/dead/observer/observer_base.dm
+++ b/code/modules/mob/dead/observer/observer_base.dm
@@ -13,11 +13,9 @@ GLOBAL_DATUM_INIT(ghost_crew_monitor, /datum/ui_module/crew_monitor/ghost, new)
icon = 'icons/mob/mob.dmi'
icon_state = "ghost"
layer = GHOST_LAYER
- plane = GAME_PLANE
stat = DEAD
density = FALSE
alpha = 127
- move_resist = INFINITY // don't get pushed around
invisibility = INVISIBILITY_OBSERVER
blocks_emissive = FALSE // Ghosts are transparent, duh
hud_type = /datum/hud/ghost
diff --git a/code/modules/mob/dead/observer/observer_spells.dm b/code/modules/mob/dead/observer/observer_spells.dm
index 959a7e5f724..a2469d81c39 100644
--- a/code/modules/mob/dead/observer/observer_spells.dm
+++ b/code/modules/mob/dead/observer/observer_spells.dm
@@ -23,7 +23,6 @@ GLOBAL_LIST_INIT(boo_phrases, list(
clothes_req = FALSE
stat_allowed = UNCONSCIOUS
invocation = ""
- invocation_type = "none"
// no need to spam admins regarding boo casts
create_attack_logs = FALSE
diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm
index 4bf9d7b538c..f0140b97d49 100644
--- a/code/modules/mob/language.dm
+++ b/code/modules/mob/language.dm
@@ -414,7 +414,6 @@
/datum/language/common
name = "Galactic Common"
desc = "Originally a carefully crafted fusion of various Human and Skrell dialects, Galactic Common is the most commonly spoken language in the Sector, and incorporates influences from nearly every known sapient species."
- speech_verb = "says"
exclaim_verbs = list("exclaims", "shouts", "yells")
whisper_verb = "whispers"
key = "9"
@@ -425,7 +424,6 @@
/datum/language/human
name = "Sol Common"
desc = "An artifical language designed by the Trans-Solar Federation for ease of use and concise communication."
- speech_verb = "says"
exclaim_verbs = list("snaps", "shouts", "barks")
whisper_verb = "whispers"
colour = "solcom"
@@ -540,7 +538,6 @@
/datum/language/ling
name = "Changeling"
desc = "Although they are normally wary and suspicious of each other, changelings can commune over a distance."
- speech_verb = "says"
colour = "changeling"
key = "g"
flags = RESTRICTED | HIVEMIND | NOBABEL
@@ -650,11 +647,8 @@
speech_verb = "transmits"
ask_verb = "transmits"
exclaim_verbs = list("transmits")
- colour = "say_quote"
key = "d"
- flags = RESTRICTED | HIVEMIND | NOBABEL
drone_only = TRUE
- follow = TRUE
/datum/language/drone
name = "Drone"
diff --git a/code/modules/mob/living/basic/farm_animals/deer_ai.dm b/code/modules/mob/living/basic/farm_animals/deer_ai.dm
index f486a7e7cf3..6607ae0aea2 100644
--- a/code/modules/mob/living/basic/farm_animals/deer_ai.dm
+++ b/code/modules/mob/living/basic/farm_animals/deer_ai.dm
@@ -91,7 +91,6 @@
/// subtree to mark trees as territories
/datum/ai_planning_subtree/find_and_hunt_target/mark_territory
target_key = BB_DEER_TREE_TARGET
- finding_behavior = /datum/ai_behavior/find_hunt_target
hunting_behavior = /datum/ai_behavior/hunt_target/mark_territory
hunt_targets = list(/obj/structure/flora/tree)
hunt_range = 7
diff --git a/code/modules/mob/living/basic/hostile/hellhound.dm b/code/modules/mob/living/basic/hostile/hellhound.dm
index 9d0927d7232..e7593095fa5 100644
--- a/code/modules/mob/living/basic/hostile/hellhound.dm
+++ b/code/modules/mob/living/basic/hostile/hellhound.dm
@@ -104,7 +104,6 @@
smoke_freq = 20 SECONDS
life_regen_cycle_trigger = 5
melee_damage_lower = 20
- melee_damage_upper = 30
/mob/living/basic/hellhound/greater/Initialize(mapload)
. = ..()
diff --git a/code/modules/mob/living/basic/hostile/skeleton_mob.dm b/code/modules/mob/living/basic/hostile/skeleton_mob.dm
index 54d3c75ac24..aaebfe7cc43 100644
--- a/code/modules/mob/living/basic/hostile/skeleton_mob.dm
+++ b/code/modules/mob/living/basic/hostile/skeleton_mob.dm
@@ -29,7 +29,6 @@
faction = list("skeleton")
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
basic_mob_flags = DEL_ON_DEATH
- speed = 1
step_type = FOOTSTEP_MOB_SHOE
gold_core_spawnable = HOSTILE_SPAWN
loot = list(/obj/effect/decal/remains/human)
@@ -59,14 +58,11 @@
/mob/living/basic/skeleton/warden
name = "skeleton warden"
desc = "The remains of a warden."
- icon = 'icons/mob/simple_human.dmi'
icon_state = "skeleton_warden"
icon_living = "skeleton_warden"
loot = list(/obj/effect/decal/cleanable/shreds, /mob/living/basic/skeleton/angered_warden)
maxHealth = 300
health = 300
- melee_damage_lower = 15
- melee_damage_upper = 15
death_message = null
gold_core_spawnable = NO_SPAWN
ai_controller = /datum/ai_controller/basic_controller/simple/simple_hostile_obstacles/skeleton_warden
@@ -77,12 +73,10 @@
/mob/living/basic/skeleton/angered_warden
name = "angered skeleton warden" // round 2
desc = "An angry skeleton."
- icon = 'icons/mob/simple_human.dmi'
icon_state = "skeleton_warden_alt"
icon_living = "skeleton_warden_alt"
attack_verb_simple = "claw"
attack_verb_continuous = "claws"
- attack_sound = 'sound/hallucinations/growl1.ogg'
maxHealth = 200
health = 200
speed = -1
diff --git a/code/modules/mob/living/basic/minebots/minebot.dm b/code/modules/mob/living/basic/minebots/minebot.dm
index f3074164a95..a0f3ed03c52 100644
--- a/code/modules/mob/living/basic/minebots/minebot.dm
+++ b/code/modules/mob/living/basic/minebots/minebot.dm
@@ -1,12 +1,10 @@
/mob/living/basic/mining_drone
name = "nanotrasen minebot"
desc = "The instructions printed on the side read: This is a small robot used to support miners, can be set to search and collect loose ore, or to help fend off wildlife. A mining scanner can instruct it to drop loose ore. Field repairs can be done with a welder."
- gender = NEUTER
icon = 'icons/obj/aibots.dmi'
icon_state = "mining_drone"
icon_living = "mining_drone"
status_flags = CANSTUN|CANWEAKEN|CANPUSH
- mouse_opacity = MOUSE_OPACITY_ICON
basic_mob_flags = DEL_ON_DEATH
sentience_type = SENTIENCE_MINEBOT
faction = list("neutral", "goldgrub") // goldgrubs are invulnerable to PKA fire
@@ -23,7 +21,6 @@
speak_emote = list("states")
healable = FALSE
ai_controller = /datum/ai_controller/basic_controller/minebot
- hud_type = /datum/hud/simple_animal
var/light_on = FALSE
var/obj/item/gun/energy/kinetic_accelerator/minebot/stored_gun
var/obj/item/radio/radio
diff --git a/code/modules/mob/living/basic/nether_mobs/blankbody.dm b/code/modules/mob/living/basic/nether_mobs/blankbody.dm
index 2e06b93219d..478ac1e6aa2 100644
--- a/code/modules/mob/living/basic/nether_mobs/blankbody.dm
+++ b/code/modules/mob/living/basic/nether_mobs/blankbody.dm
@@ -11,7 +11,6 @@
melee_damage_upper = 10
attack_verb_continuous = "punches"
attack_verb_simple = "punch"
- attack_sound = 'sound/weapons/bladeslice.ogg'
melee_attack_cooldown_min = 0.5 SECONDS
melee_attack_cooldown_max = 1.5 SECONDS
speak_emote = list("screams")
diff --git a/code/modules/mob/living/basic/nether_mobs/faithless.dm b/code/modules/mob/living/basic/nether_mobs/faithless.dm
index 8943d267e48..0127fca53a6 100644
--- a/code/modules/mob/living/basic/nether_mobs/faithless.dm
+++ b/code/modules/mob/living/basic/nether_mobs/faithless.dm
@@ -6,8 +6,6 @@
icon_living = "faithless"
icon_dead = "faithless_dead"
mob_biotypes = MOB_ORGANIC | MOB_HUMANOID
- maxHealth = 80
- health = 80
melee_damage_lower = 15
melee_damage_upper = 15
harm_intent_damage = 10
@@ -16,7 +14,6 @@
attack_verb_continuous = "grips"
attack_sound = 'sound/hallucinations/growl1.ogg'
speed = 0
- gold_core_spawnable = HOSTILE_SPAWN
faction = "faithless"
/mob/living/basic/netherworld/faithless/Process_Spacemove(movement_dir = 0, continuous_move = FALSE)
diff --git a/code/modules/mob/living/basic/nether_mobs/migo.dm b/code/modules/mob/living/basic/nether_mobs/migo.dm
index fc1334f2edc..92381f831cf 100644
--- a/code/modules/mob/living/basic/nether_mobs/migo.dm
+++ b/code/modules/mob/living/basic/nether_mobs/migo.dm
@@ -10,7 +10,6 @@
speed = 0
death_message = "wails as its form turns into a pulpy mush."
death_sound = 'sound/voice/hiss6.ogg'
- gold_core_spawnable = HOSTILE_SPAWN
/// List of sounds the migo can make
var/static/list/migo_sounds
/// Will the migo dodge?
diff --git a/code/modules/mob/living/basic/retaliate/clown.dm b/code/modules/mob/living/basic/retaliate/clown.dm
index 07c366b24b4..3f2c4b3c772 100644
--- a/code/modules/mob/living/basic/retaliate/clown.dm
+++ b/code/modules/mob/living/basic/retaliate/clown.dm
@@ -20,11 +20,7 @@
melee_damage_upper = 10
melee_attack_cooldown_min = 1.5 SECONDS
melee_attack_cooldown_max = 2.5 SECONDS
- attack_verb_simple = "attack"
- attack_verb_continuous = "attacks"
attack_sound = 'sound/items/bikehorn.ogg'
- obj_damage = 0
- environment_smash = 0
minimum_survivable_temperature = 270
maximum_survivable_temperature = 370
unsuitable_heat_damage = 15 //amount of damage applied if animal's body temperature is higher than maxbodytemp
diff --git a/code/modules/mob/living/brain/MMI.dm b/code/modules/mob/living/brain/MMI.dm
index 49d30828cfa..08e4b612726 100644
--- a/code/modules/mob/living/brain/MMI.dm
+++ b/code/modules/mob/living/brain/MMI.dm
@@ -4,7 +4,6 @@
It can be installed into a cyborg shell, AI core, mech, spiderbot, or an Integrated Robotic Chassis' chest cavity."
icon = 'icons/obj/assemblies.dmi'
icon_state = "mmi_empty"
- w_class = WEIGHT_CLASS_NORMAL
origin_tech = "biotech=2;programming=3;engineering=2"
//Revised. Brainmob is now contained directly within object of transfer. MMI in this case.
diff --git a/code/modules/mob/living/brain/robotic_brain.dm b/code/modules/mob/living/brain/robotic_brain.dm
index 870adf823a2..d06d87d8b55 100644
--- a/code/modules/mob/living/brain/robotic_brain.dm
+++ b/code/modules/mob/living/brain/robotic_brain.dm
@@ -6,7 +6,6 @@
var/blank_icon = "boris_blank"
var/searching_icon = "boris_recharging"
var/occupied_icon = "boris"
- w_class = WEIGHT_CLASS_NORMAL
origin_tech = "biotech=3;programming=3;plasmatech=2"
req_access = list(ACCESS_ROBOTICS)
mecha = null//This does not appear to be used outside of reference in mecha.dm.
diff --git a/code/modules/mob/living/carbon/alien/humanoid/empress.dm b/code/modules/mob/living/carbon/alien/humanoid/empress.dm
index 9ea090b459e..2aea81b5ee9 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/empress.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/empress.dm
@@ -14,7 +14,6 @@
alien_slash_damage = 30 //Empress do higher slashing damage to people
/mob/living/carbon/alien/humanoid/empress/large
- name = "alien empress"
caste = "e"
icon = 'icons/mob/alienhuge.dmi'
icon_state = "empress_s"
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index 1177124863f..9e4341d5eb8 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -1,6 +1,5 @@
#define XENO_TOTAL_LAYERS 6
/mob/living/carbon/alien/humanoid
- name = "alien"
icon_state = "alien_s"
butcher_results = list(/obj/item/food/monstermeat/xenomeat = 5, /obj/item/stack/sheet/animalhide/xeno = 1)
diff --git a/code/modules/mob/living/carbon/human/human_emote.dm b/code/modules/mob/living/carbon/human/human_emote.dm
index ba8c1f97488..39c02b505d7 100644
--- a/code/modules/mob/living/carbon/human/human_emote.dm
+++ b/code/modules/mob/living/carbon/human/human_emote.dm
@@ -34,7 +34,6 @@
/datum/emote/living/carbon/human/airguitar
key = "airguitar"
message = "is strumming the air and headbanging like a safari chimp."
- emote_type = EMOTE_VISIBLE
hands_use_check = TRUE
/datum/emote/living/carbon/human/clap
@@ -116,7 +115,6 @@
hands_use_check = TRUE
sound = 'sound/weapons/slap.ogg'
emote_type = EMOTE_AUDIBLE
- volume = 50
/datum/emote/living/carbon/human/palm
key = "palm"
@@ -161,7 +159,6 @@
message_postfix = "at %t!"
muzzled_noises = list("very loud")
emote_type = EMOTE_AUDIBLE | EMOTE_MOUTH
- only_forced_audio = FALSE
vary = TRUE
age_based = TRUE
cooldown = 5 SECONDS
@@ -437,7 +434,6 @@
/datum/emote/living/carbon/human/highfive/rps
key = "rps"
param_desc = "r,p,s"
- hands_use_check = TRUE
status = STATUS_EFFECT_RPS
action_name = "play rock-paper-scissors with"
target_behavior = EMOTE_TARGET_BHVR_IGNORE
@@ -515,9 +511,7 @@
key = "signal"
key_third_person = "signals"
message_param = "raises %t fingers."
- param_desc = "number(0-10)"
mob_type_allowed_typecache = list(/mob/living/carbon/human)
- hands_use_check = TRUE
/////////
// Species-specific emotes
@@ -826,7 +820,6 @@
// CC0
// https://freesound.org/people/greenvwbeetle/sounds/244653/
sound = 'sound/effects/mob_effects/slime_pop.ogg'
- volume = 50
/datum/emote/living/carbon/human/howl
key = "howl"
diff --git a/code/modules/mob/living/carbon/human/npcs.dm b/code/modules/mob/living/carbon/human/npcs.dm
index 68734d50577..26b7cf4976d 100644
--- a/code/modules/mob/living/carbon/human/npcs.dm
+++ b/code/modules/mob/living/carbon/human/npcs.dm
@@ -1,7 +1,6 @@
/obj/item/clothing/under/punpun
name = "fancy uniform"
desc = "It looks like it was tailored for a monkey."
- icon_state = "punpun"
item_color = "punpun"
species_restricted = list("Monkey")
species_exception = list(/datum/species/monkey)
diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm
index cb47c382414..f5b7bdcb92b 100644
--- a/code/modules/mob/living/carbon/human/species/golem.dm
+++ b/code/modules/mob/living/carbon/human/species/golem.dm
@@ -504,7 +504,6 @@
/datum/action/innate/unstable_teleport
name = "Unstable Teleport"
check_flags = AB_CHECK_CONSCIOUS
- button_overlay_icon_state = "blink"
button_overlay_icon = 'icons/mob/actions/actions.dmi'
var/activated = FALSE // To prevent spamming
var/cooldown = 150
diff --git a/code/modules/mob/living/carbon/human/species/human_species.dm b/code/modules/mob/living/carbon/human/species/human_species.dm
index ef5fa94650b..c210dfcc9c9 100644
--- a/code/modules/mob/living/carbon/human/species/human_species.dm
+++ b/code/modules/mob/living/carbon/human/species/human_species.dm
@@ -1,7 +1,6 @@
/datum/species/human
name = "Human"
name_plural = "Humans"
- icobase = 'icons/mob/human_races/r_human.dmi'
primitive_form = /datum/species/monkey
language = "Sol Common"
species_traits = list(LIPS)
diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm
index 28cb896704a..23c5c6bd92f 100644
--- a/code/modules/mob/living/carbon/human/species/machine.dm
+++ b/code/modules/mob/living/carbon/human/species/machine.dm
@@ -25,7 +25,6 @@
inherent_biotypes = MOB_ROBOTIC | MOB_HUMANOID
clothing_flags = HAS_UNDERWEAR | HAS_UNDERSHIRT | HAS_SOCKS
bodyflags = HAS_SKIN_COLOR | HAS_HEAD_MARKINGS | HAS_HEAD_ACCESSORY | ALL_RPARTS | SHAVED
- dietflags = 0 //IPCs can't eat, so no diet
taste_sensitivity = TASTE_SENSITIVITY_NO_TASTE
blood_color = COLOR_BLOOD_MACHINE
flesh_color = "#AAAAAA"
diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm
index 02595565f07..6a2c27a2af0 100644
--- a/code/modules/mob/living/carbon/human/species/monkey.dm
+++ b/code/modules/mob/living/carbon/human/species/monkey.dm
@@ -83,7 +83,6 @@
flesh_color = "#AFA59E"
base_color = "#000000"
tail = "farwatail"
- reagent_tag = PROCESS_ORG
has_organ = list(
"heart" = /obj/item/organ/internal/heart/tajaran,
"lungs" = /obj/item/organ/internal/lungs/tajaran,
@@ -106,7 +105,6 @@
flesh_color = "#966464"
base_color = "#000000"
tail = "wolpintail"
- reagent_tag = PROCESS_ORG
has_organ = list(
"heart" = /obj/item/organ/internal/heart/vulpkanin,
"lungs" = /obj/item/organ/internal/lungs/vulpkanin,
@@ -128,7 +126,6 @@
default_language = "Neara"
flesh_color = "#8CD7A3"
blood_color = "#1D2CBF"
- reagent_tag = PROCESS_ORG
tail = null
inherent_traits = list(TRAIT_NOEXAMINE, TRAIT_NOFAT, TRAIT_WATERBREATH)
@@ -154,9 +151,7 @@
default_language = "Stok"
flesh_color = "#34AF10"
base_color = "#000000"
- reagent_tag = PROCESS_ORG
- bodyflags = HAS_TAIL | HAS_BODYACC_COLOR
has_organ = list(
"heart" = /obj/item/organ/internal/heart/unathi,
@@ -173,14 +168,11 @@
name_plural = "nian worme"
icobase = 'icons/mob/human_races/monkeys/r_worme.dmi'
tail = ""
- total_health = 75
inherent_biotypes = MOB_ORGANIC | MOB_HUMANOID | MOB_BUG
bodyflags = BALD | SHAVED
greater_form = /datum/species/moth
default_language = "Tkachi"
- eyes = "blank_eyes"
butt_sprite = "nian"
- reagent_tag = PROCESS_ORG
dietflags = DIET_HERB
tox_mod = 3 // Die. Terrible creatures. Die.
diff --git a/code/modules/mob/living/carbon/human/species/unathi.dm b/code/modules/mob/living/carbon/human/species/unathi.dm
index 01cd9399abf..eddd9c9a6c2 100644
--- a/code/modules/mob/living/carbon/human/species/unathi.dm
+++ b/code/modules/mob/living/carbon/human/species/unathi.dm
@@ -120,7 +120,6 @@
blurb = "These reptillian creatures appear to be related to the Unathi, but seem significantly less evolved. \
They roam the wastes of Lavaland, worshipping a dead city and capturing unsuspecting miners."
- language = "Sinta'unathi"
default_language = "Sinta'unathi"
speed_mod = -0.80
diff --git a/code/modules/mob/living/living_emote.dm b/code/modules/mob/living/living_emote.dm
index 65f888b60aa..3c6f799e2fe 100644
--- a/code/modules/mob/living/living_emote.dm
+++ b/code/modules/mob/living/living_emote.dm
@@ -44,7 +44,6 @@
key = "collapse"
key_third_person = "collapses"
message = "collapses!"
- emote_type = EMOTE_VISIBLE
/datum/emote/living/collapse/run_emote(mob/user, params, type_override, intentional)
. = ..()
@@ -186,8 +185,6 @@
message = "points."
message_param = "points at %t."
hands_use_check = TRUE
- target_behavior = EMOTE_TARGET_BHVR_USE_PARAMS_ANYWAY
- emote_target_type = EMOTE_TARGET_ANY
/datum/emote/living/point/act_on_target(mob/user, target)
if(!target)
@@ -302,7 +299,6 @@
/datum/emote/living/nightmare
key = "nightmare"
message = "writhes in their sleep."
- emote_type = EMOTE_VISIBLE
stat_allowed = UNCONSCIOUS
max_stat_allowed = UNCONSCIOUS
unintentional_stat_allowed = UNCONSCIOUS
diff --git a/code/modules/mob/living/silicon/ai/ai_mob.dm b/code/modules/mob/living/silicon/ai/ai_mob.dm
index 39a636f3a4c..e0fe809a664 100644
--- a/code/modules/mob/living/silicon/ai/ai_mob.dm
+++ b/code/modules/mob/living/silicon/ai/ai_mob.dm
@@ -41,7 +41,6 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
icon = 'icons/mob/ai.dmi'//
icon_state = "ai"
move_resist = MOVE_FORCE_NORMAL
- density = TRUE
status_flags = CANSTUN|CANPARALYSE|CANPUSH
d_hud = DATA_HUD_DIAGNOSTIC_ADVANCED
mob_size = MOB_SIZE_LARGE
diff --git a/code/modules/mob/living/silicon/ai/ai_programs.dm b/code/modules/mob/living/silicon/ai/ai_programs.dm
index f1b5b2c4791..b70ad4c50aa 100644
--- a/code/modules/mob/living/silicon/ai/ai_programs.dm
+++ b/code/modules/mob/living/silicon/ai/ai_programs.dm
@@ -291,7 +291,6 @@
action_icon = 'icons/effects/random_spawners.dmi'
action_icon_state = "glowstick"
ranged_mousepointer = 'icons/mecha/mecha_mouse.dmi'
- auto_use_uses = FALSE
base_cooldown = 30 SECONDS
cooldown_min = 5 SECONDS
level_max = 5
@@ -361,7 +360,6 @@
action_icon = 'icons/obj/power.dmi'
action_icon_state = "smes-o"
ranged_mousepointer = 'icons/mecha/mecha_mouse.dmi'
- auto_use_uses = FALSE
base_cooldown = 120 SECONDS
cooldown_min = 30 SECONDS
level_max = 7
@@ -440,7 +438,6 @@
action_icon = 'icons/obj/surgery.dmi'
action_icon_state = "tube"
ranged_mousepointer = 'icons/mecha/mecha_mouse.dmi'
- auto_use_uses = FALSE
base_cooldown = 150 SECONDS
cooldown_min = 30 SECONDS
level_max = 7
@@ -493,7 +490,6 @@
program_name = "Universal Adapter"
program_id = "universal_adapter"
description = "Upgraded firmware allows IPCs to be valid targets for Power Shunt and Repair Nanites, at half efficiency."
- nanite_cost = 0
unlock_text = "Universal adapter installation complete!"
upgrade = TRUE
@@ -534,7 +530,6 @@
action_icon = 'icons/obj/doors/doorint.dmi'
action_icon_state = "door_closed"
ranged_mousepointer = 'icons/mecha/mecha_mouse.dmi'
- auto_use_uses = FALSE
base_cooldown = 60 SECONDS
cooldown_min = 60 SECONDS
level_max = 5
@@ -598,7 +593,6 @@
action_icon = 'icons/effects/effects.dmi'
action_icon_state = "frozen_smoke_capsule"
ranged_mousepointer = 'icons/mecha/mecha_mouse.dmi'
- auto_use_uses = FALSE
base_cooldown = 60 SECONDS
cooldown_min = 30 SECONDS
level_max = 3
@@ -639,8 +633,6 @@
program_name = "Bluespace Miner Subsystem"
program_id = "bluespace_miner"
description = "You link yourself to a miniature bluespace harvester, generating income for the science account at the cost of increasing your core's power needs."
- nanite_cost = 0
- max_level = 5
unlock_text = "Bluespace miner installation complete!"
upgrade = TRUE
@@ -670,7 +662,6 @@
program_name = "Multimarket Analysis Subsystem"
program_id = "multimarket_analyser"
description = "You connect to a digital marketplace to price-check all orders from the station, ensuring you get the best prices! This reduces the cost of crates in cargo!"
- nanite_cost = 0
unlock_text = "Online marketplace detected... connected!"
max_level = 6
upgrade = TRUE
@@ -709,7 +700,6 @@
action_icon = 'icons/obj/janitor.dmi'
action_icon_state = "lightreplacer0"
ranged_mousepointer = 'icons/mecha/mecha_mouse.dmi'
- auto_use_uses = FALSE
base_cooldown = 30 SECONDS
cooldown_min = 5 SECONDS
level_max = 5
@@ -764,7 +754,6 @@
action_icon = 'icons/obj/surgery.dmi'
action_icon_state = "scalpel_laser1_on"
ranged_mousepointer = 'icons/mecha/mecha_mouse.dmi'
- auto_use_uses = FALSE
base_cooldown = 150 SECONDS
cooldown_min = 30 SECONDS
level_max = 10
@@ -826,9 +815,7 @@
program_name = "Enhanced Door Controls"
program_id = "enhanced_doors"
description = "You enhance the subroutines that let you control doors, speeding up response times!"
- nanite_cost = 0
unlock_text = "Doors connected and optimized. You feel right at home."
- max_level = 5
upgrade = TRUE
/// Track the original delay
var/original_door_delay = 3 SECONDS
@@ -945,7 +932,6 @@
action_icon = 'icons/obj/structures.dmi'
action_icon_state = "reinforced"
ranged_mousepointer = 'icons/mecha/mecha_mouse.dmi'
- auto_use_uses = FALSE
base_cooldown = 180 SECONDS
cooldown_min = 30 SECONDS
level_max = 5
@@ -986,7 +972,6 @@
program_name = "Holosign Displayer"
program_id = "holosign_displayer"
description = "Deploy a holographic sign to alert crewmembers to potential hazards."
- cost = 1
nanite_cost = 10
power_type = /datum/spell/ai_spell/ranged/holosign_displayer
unlock_text = "Metal foam synthesizer online."
@@ -997,7 +982,6 @@
action_icon = 'icons/obj/device.dmi'
action_icon_state = "signmaker"
ranged_mousepointer = 'icons/mecha/mecha_mouse.dmi'
- auto_use_uses = FALSE
base_cooldown = 30 SECONDS
cooldown_min = 30 SECONDS
level_max = 8
@@ -1064,7 +1048,6 @@
action_icon = 'icons/obj/items.dmi'
action_icon_state = "bike_horn"
ranged_mousepointer = 'icons/mecha/mecha_mouse.dmi'
- auto_use_uses = FALSE
base_cooldown = 30 SECONDS
cooldown_min = 15 SECONDS
level_max = 10
@@ -1103,7 +1086,6 @@
program_id = "enhanced_tracker"
description = "New camera firmware allows automated alerts when an individual of interest enters camera view."
cost = 5
- nanite_cost = 0
power_type = /datum/spell/ai_spell/enhanced_tracker
unlock_text = "Tag and track software online."
max_level = 8
@@ -1168,7 +1150,6 @@
program_name = "Holopointer"
program_id = "holopointer"
description = "Illuminate a hologram to notify or beckon crew."
- cost = 1
nanite_cost = 5
power_type = /datum/spell/ai_spell/ranged/pointer
unlock_text = "Hologram emitters online."
@@ -1179,7 +1160,6 @@
action_icon = 'icons/mob/telegraphing/telegraph_holographic.dmi'
action_icon_state = "target_circle"
ranged_mousepointer = 'icons/mecha/mecha_mouse.dmi'
- auto_use_uses = FALSE
base_cooldown = 15 SECONDS
cooldown_min = 15 SECONDS
level_max = 1
diff --git a/code/modules/mob/living/silicon/robot/component.dm b/code/modules/mob/living/silicon/robot/component.dm
index 643d344c9f5..13705715f32 100644
--- a/code/modules/mob/living/silicon/robot/component.dm
+++ b/code/modules/mob/living/silicon/robot/component.dm
@@ -181,7 +181,6 @@
/datum/robot_component/binary_communication
name = "binary communication device"
external_type = /obj/item/robot_parts/robot_component/binary_communication_device
- max_damage = 30
/datum/robot_component/camera
name = "camera"
@@ -199,7 +198,6 @@
/datum/robot_component/diagnosis_unit
name = "self-diagnosis unit"
external_type = /obj/item/robot_parts/robot_component/diagnosis_unit
- max_damage = 30
/mob/living/silicon/robot/proc/initialize_components()
// This only initializes the components, it doesn't set them to installed.
diff --git a/code/modules/mob/living/silicon/robot/drone/maint_drone.dm b/code/modules/mob/living/silicon/robot/drone/maint_drone.dm
index 4468839dce8..6155d294b50 100644
--- a/code/modules/mob/living/silicon/robot/drone/maint_drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/maint_drone.dm
@@ -2,13 +2,11 @@
/mob/living/silicon/robot/drone
name = "drone"
real_name = "drone"
- icon = 'icons/mob/robots.dmi'
icon_state = "repairbot"
maxHealth = 35
health = 35
bubble_icon = "machine"
pass_flags = PASSTABLE
- flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
braintype = "Robot"
lawupdate = FALSE
density = FALSE
diff --git a/code/modules/mob/living/silicon/robot/robot_mob.dm b/code/modules/mob/living/silicon/robot/robot_mob.dm
index a0eb9055242..567a927759c 100644
--- a/code/modules/mob/living/silicon/robot/robot_mob.dm
+++ b/code/modules/mob/living/silicon/robot/robot_mob.dm
@@ -7,8 +7,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
real_name = "Cyborg"
icon = 'icons/mob/robots.dmi'
icon_state = "robot"
- maxHealth = 100
- health = 100
bubble_icon = "robot"
universal_understand = TRUE
deathgasp_on_death = TRUE
diff --git a/code/modules/mob/living/silicon/silicon_mob.dm b/code/modules/mob/living/silicon/silicon_mob.dm
index cb37a13b61d..ec143aecb48 100644
--- a/code/modules/mob/living/silicon/silicon_mob.dm
+++ b/code/modules/mob/living/silicon/silicon_mob.dm
@@ -1,5 +1,4 @@
/mob/living/silicon
- gender = NEUTER
voice_name = "synthesized voice"
bubble_icon = "machine"
has_unlimited_silicon_privilege = TRUE
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index e7e5a7673ac..12e77c0473b 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -198,7 +198,6 @@
/obj/item/radio/headset/bot
requires_tcomms = FALSE
- canhear_range = 0
/obj/item/radio/headset/bot/recalculateChannels()
var/mob/living/simple_animal/bot/B = loc
diff --git a/code/modules/mob/living/simple_animal/bot/bot_construction.dm b/code/modules/mob/living/simple_animal/bot/bot_construction.dm
index ee1cc37414f..562132d81c3 100644
--- a/code/modules/mob/living/simple_animal/bot/bot_construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot_construction.dm
@@ -8,9 +8,7 @@
icon_state = "bucket_proxy"
force = 3
throwforce = 5
- throw_speed = 2
throw_range = 5
- w_class = WEIGHT_CLASS_NORMAL
var/created_name = "Cleanbot"
var/robot_arm = /obj/item/robot_parts/l_arm
@@ -236,9 +234,7 @@
icon_state = "toolbox_tiles"
force = 3
throwforce = 10
- throw_speed = 2
throw_range = 5
- w_class = WEIGHT_CLASS_NORMAL
var/created_name = "Floorbot"
var/toolbox = /obj/item/storage/toolbox/mechanical
var/toolbox_color = "" //Blank for blue, r for red, y for yellow, etc.
@@ -357,7 +353,6 @@
desc = "A first aid kit with a robot arm permanently grafted to it."
icon = 'icons/obj/aibots.dmi'
icon_state = "firstaid_arm"
- w_class = WEIGHT_CLASS_NORMAL
req_one_access = list(ACCESS_MEDICAL, ACCESS_ROBOTICS)
var/build_step = 0
var/created_name = "Medibot" //To preserve the name if it's a unique medbot I guess
@@ -634,7 +629,6 @@
desc = "A clown box with a robot arm permanently grafted to it."
icon = 'icons/obj/aibots.dmi'
icon_state = "honkbot_arm"
- w_class = WEIGHT_CLASS_NORMAL
req_one_access = list(ACCESS_CLOWN, ACCESS_ROBOTICS, ACCESS_MIME)
var/build_step = 0
var/created_name = "Honkbot" //To preserve the name if it's a unique medbot I guess
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index f5eff3e78eb..2fb94927983 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -2,10 +2,8 @@
/mob/living/simple_animal/bot/cleanbot
name = "\improper Cleanbot"
desc = "A little cleaning robot, he looks so excited!"
- icon = 'icons/obj/aibots.dmi'
icon_state = "cleanbot"
density = FALSE
- anchored = FALSE
health = 25
maxHealth = 25
radio_channel = "Service" //Service
diff --git a/code/modules/mob/living/simple_animal/bot/ed209bot.dm b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
index 1b2bb21f6d9..9e8834581e9 100644
--- a/code/modules/mob/living/simple_animal/bot/ed209bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/ed209bot.dm
@@ -4,10 +4,7 @@
/mob/living/simple_animal/bot/ed209
name = "\improper ED-209 Security Robot"
desc = "A security robot. He looks less than thrilled."
- icon = 'icons/obj/aibots.dmi'
icon_state = "ed2090"
- density = TRUE
- anchored = FALSE
health = 150
maxHealth = 150
damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index ce835945de1..e1c6ea4e606 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -2,10 +2,8 @@
/mob/living/simple_animal/bot/floorbot
name = "\improper Floorbot"
desc = "A little floor repairing robot, he looks so excited!"
- icon = 'icons/obj/aibots.dmi'
icon_state = "floorbot"
density = FALSE
- anchored = FALSE
health = 25
maxHealth = 25
diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm
index 7abfce0731e..5e6457be267 100644
--- a/code/modules/mob/living/simple_animal/bot/honkbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm
@@ -1,10 +1,8 @@
/mob/living/simple_animal/bot/honkbot
name = "honkbot"
desc = "A little robot. It looks happy with its bike horn."
- icon = 'icons/obj/aibots.dmi'
icon_state = "honkbot"
density = FALSE
- anchored = FALSE
health = 25
maxHealth = 25
damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
index 5a5415b4506..3302fbc5ad9 100644
--- a/code/modules/mob/living/simple_animal/bot/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -7,12 +7,8 @@
/mob/living/simple_animal/bot/medbot
name = "\improper Medibot"
desc = "A little medical robot. He looks somewhat underwhelmed."
- icon = 'icons/obj/aibots.dmi'
icon_state = "medibot0"
density = FALSE
- anchored = FALSE
- health = 20
- maxHealth = 20
pass_flags = PASSMOB
radio_channel = "Medical"
@@ -114,7 +110,6 @@
treatment_oxy = "perfluorodecalin"
treatment_brute = "bicaridine"
treatment_fire = "kelotane"
- treatment_tox = "charcoal"
/mob/living/simple_animal/bot/medbot/syndicate
name = "Suspicious Medibot"
@@ -124,7 +119,6 @@
treatment_oxy = "perfluorodecalin"
treatment_brute = "bicaridine"
treatment_fire = "kelotane"
- treatment_tox = "charcoal"
syndicate_aligned = TRUE
req_access = list(ACCESS_SYNDICATE)
control_freq = BOT_FREQ + 1000 // make it not show up on lists
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 26cb6c66889..ca06de04be1 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -10,7 +10,6 @@
name = "\improper MULEbot"
desc = "A Multiple Utility Load Effector bot."
icon_state = "mulebot0"
- density = TRUE
move_resist = MOVE_FORCE_STRONG
animate_movement = FORWARD_STEPS
health = 50
diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm
index 4c6a8cde2c0..b6ea60003d4 100644
--- a/code/modules/mob/living/simple_animal/bot/secbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/secbot.dm
@@ -4,10 +4,8 @@
/mob/living/simple_animal/bot/secbot
name = "\improper Securitron"
desc = "A little security robot. He looks less than thrilled."
- icon = 'icons/obj/aibots.dmi'
icon_state = "secbot0"
density = FALSE
- anchored = FALSE
health = 60
maxHealth = 60
damage_coeff = list(BRUTE = 0.5, BURN = 0.7, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
@@ -62,8 +60,6 @@
/mob/living/simple_animal/bot/secbot/beepsky
name = "Officer Beepsky"
desc = "It's Officer Beepsky! Powered by a potato and a shot of whiskey."
- idcheck = FALSE
- weapons_check = FALSE
auto_patrol = TRUE
/mob/living/simple_animal/bot/secbot/beepsky/explode()
@@ -82,7 +78,6 @@
/mob/living/simple_animal/bot/secbot/ofitser
name = "Prison Ofitser"
desc = "It's Prison Ofitser! Powered by the tears and sweat of prisoners."
- idcheck = FALSE
weapons_check = TRUE
auto_patrol = TRUE
diff --git a/code/modules/mob/living/simple_animal/clockwork_constructs.dm b/code/modules/mob/living/simple_animal/clockwork_constructs.dm
index e443268daa1..5fd4b91745f 100644
--- a/code/modules/mob/living/simple_animal/clockwork_constructs.dm
+++ b/code/modules/mob/living/simple_animal/clockwork_constructs.dm
@@ -116,6 +116,5 @@
/mob/living/simple_animal/hostile/clockwork_construct/clockwork_marauder/hostile
AIStatus = AI_ON
- environment_smash = ENVIRONMENT_SMASH_STRUCTURES
#undef MARAUDER_SHIELD_MAX
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index a5a0469ae27..a2e9479bf26 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -340,7 +340,6 @@
obj_damage = 20 // Bit better at breaking stuff than cult ghosts, but only *barely*
retreat_distance = 4 // AI proteons will rapidly move in and out of combat to avoid conflict, but will still target and follow you.
attacktext = "pinches"
- environment_smash = ENVIRONMENT_SMASH_STRUCTURES // No you can not break down all the walls of the station
attack_sound = 'sound/weapons/punch2.ogg'
playstyle_string = "You are a Proteon. Your abilities in combat are outmatched by most combat constructs, but you are still fast and nimble. Run metal and supplies, and cooperate with your fellow cultists."
construct_type = "proteon"
diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm
index 22c79dcada1..e7834347492 100644
--- a/code/modules/mob/living/simple_animal/corpse.dm
+++ b/code/modules/mob/living/simple_animal/corpse.dm
@@ -6,7 +6,6 @@
id_access_list = list(ACCESS_SYNDICATE)
outfit = /datum/outfit/syndicatecorpse
del_types = list()
- disable_pda = TRUE
var/name_changed
var/name_to_add
var/num_to_add
@@ -115,11 +114,9 @@
/obj/effect/mob_spawn/human/corpse/clown/corpse
roundstart = TRUE
- instant = TRUE
/obj/effect/mob_spawn/human/corpse/mime/corpse
roundstart = TRUE
- instant = TRUE
/obj/effect/mob_spawn/human/corpse/pirate
name = "Pirate"
@@ -140,7 +137,6 @@
/obj/effect/mob_spawn/human/corpse/pirate/ranged
name = "Pirate Gunner"
mob_name = "Pirate Gunner"
- outfit = /datum/outfit/piratecorpse
/datum/outfit/piratecorpse/ranged
name = "Corpse of a Pirate Gunner"
diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
index 70268a03723..ef4598656df 100644
--- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm
+++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
@@ -4,13 +4,11 @@
icon_state = "butterfly"
icon_living = "butterfly"
icon_dead = "butterfly_dead"
- turns_per_move = 1
emote_see = list("flutters")
faction = list("neutral", "jungle")
response_help = "shoos"
response_disarm = "brushes aside"
response_harm = "squashes"
- speak_chance = 0
maxHealth = 2
health = 2
harm_intent_damage = 1
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index ae3c7e47bd3..a59ab213ee3 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -14,7 +14,6 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- mob_size = MOB_SIZE_SMALL
animal_species = /mob/living/simple_animal/pet/cat
childtype = list(/mob/living/simple_animal/pet/cat/kitten)
butcher_results = list(/obj/item/food/meat = 3)
@@ -179,7 +178,6 @@
/mob/living/simple_animal/pet/cat/proc_cat
name = "Proc"
- gender = MALE
gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
diff --git a/code/modules/mob/living/simple_animal/friendly/cockroach.dm b/code/modules/mob/living/simple_animal/friendly/cockroach.dm
index a0415460190..f38bf75d4ab 100644
--- a/code/modules/mob/living/simple_animal/friendly/cockroach.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cockroach.dm
@@ -12,7 +12,6 @@
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_biotypes = MOB_ORGANIC | MOB_BUG
mob_size = MOB_SIZE_TINY
- response_help = "pokes"
response_disarm = "shoos"
response_harm = "splats"
density = FALSE
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index 2fd41ecf05d..20e44fa3743 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -43,9 +43,6 @@
name = "Coffee"
real_name = "Coffee"
desc = "It's Coffee, the other pet!"
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "stomps"
gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
@@ -58,5 +55,4 @@
icon_dead = "evilcrab_dead"
response_help = "pokes"
response_disarm = "shoves"
- response_harm = "stomps"
gold_core_spawnable = HOSTILE_SPAWN
diff --git a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm
index 3d22c9dde18..c9f9d094e16 100644
--- a/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm
+++ b/code/modules/mob/living/simple_animal/friendly/diona_nymph.dm
@@ -38,13 +38,11 @@
attack_sound = 'sound/weapons/bite.ogg'
speed = 0
- stop_automated_movement = FALSE
turns_per_move = 4
var/list/donors = list()
holder_type = /obj/item/holder/diona
- a_intent = INTENT_HELP
var/evolve_donors = 5 //amount of blood donors needed before evolving
var/awareness_donors = 3 //amount of blood donors needed for understand language
var/nutrition_need = 500 //amount of nutrition needed before evolving
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 1f599885b55..faf12a06042 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -73,7 +73,6 @@
butcher_results = list(/obj/item/food/meat/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
childtype = list(/mob/living/simple_animal/pet/dog/corgi/puppy = 95, /mob/living/simple_animal/pet/dog/corgi/puppy/void = 5)
animal_species = /mob/living/simple_animal/pet/dog
- hud_type = /datum/hud/corgi
///Currently worn item on the head slot
var/obj/item/inventory_head = null
///Currently worn item on the back slot
@@ -327,9 +326,6 @@
desc = "It's the HoP's beloved corgi."
var/turns_since_scan = 0
var/obj/movement_target
- response_help = "pets"
- response_disarm = "bops"
- response_harm = "kicks"
gold_core_spawnable = NO_SPAWN
unique_pet = TRUE
var/age = 0
@@ -513,14 +509,12 @@
/mob/living/simple_animal/pet/dog/corgi/puppy
name = "corgi puppy"
- real_name = "corgi"
desc = "It's a corgi puppy!"
icon_state = "puppy"
icon_living = "puppy"
icon_dead = "puppy_dead"
density = FALSE
pass_flags = PASSMOB
- mob_size = MOB_SIZE_SMALL
strippable_inventory_slots = list() // Puppies do not have a head or back equipment slot.
collar_icon_state = "puppy"
@@ -551,9 +545,6 @@
icon_state = "lisa"
icon_living = "lisa"
icon_dead = "lisa_dead"
- response_help = "pets"
- response_disarm = "bops"
- response_harm = "kicks"
strippable_inventory_slots = list(/datum/strippable_item/corgi_back) //Lisa already has a cute bow!
var/turns_since_scan = 0
@@ -571,7 +562,6 @@
/mob/living/simple_animal/pet/dog/corgi/exoticcorgi
name = "Exotic Corgi"
desc = "As cute as it is colorful!"
- icon = 'icons/mob/pets.dmi'
icon_state = "corgigrey"
icon_living = "corgigrey"
icon_dead = "corgigrey_dead"
@@ -651,7 +641,6 @@
name = "pug"
real_name = "pug"
desc = "It's a pug."
- icon = 'icons/mob/pets.dmi'
icon_state = "pug"
icon_living = "pug"
icon_dead = "pug_dead"
diff --git a/code/modules/mob/living/simple_animal/friendly/fox.dm b/code/modules/mob/living/simple_animal/friendly/fox.dm
index 5da9a2e234c..10305fed743 100644
--- a/code/modules/mob/living/simple_animal/friendly/fox.dm
+++ b/code/modules/mob/living/simple_animal/friendly/fox.dm
@@ -10,13 +10,10 @@
speak_emote = list("geckers", "barks")
emote_hear = list("howls","barks")
emote_see = list("shakes its head", "shivers")
- speak_chance = 1
turns_per_move = 5
see_in_dark = 6
butcher_results = list(/obj/item/food/meat = 3)
- response_help = "pets"
response_disarm = "gently pushes aside"
- response_harm = "kicks"
//Captain fox
/mob/living/simple_animal/pet/dog/fox/renault
diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm
index 4119e34aec3..bfb512190db 100644
--- a/code/modules/mob/living/simple_animal/friendly/lizard.dm
+++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm
@@ -9,7 +9,6 @@
health = 5
maxHealth = 5
attacktext = "bites"
- obj_damage = 0
melee_damage_lower = 1
melee_damage_upper = 2
response_help = "pets"
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index bab3b8564f0..d0129513d33 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -26,11 +26,9 @@
mob_biotypes = MOB_ORGANIC | MOB_BEAST
mob_size = MOB_SIZE_TINY
var/mouse_color //brown, gray and white, leave blank for random
- layer = MOB_LAYER
atmos_requirements = list("min_oxy" = 16, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 223 //Below -50 Degrees Celcius
maxbodytemp = 323 //Above 50 Degrees Celcius
- universal_speak = FALSE
can_hide = TRUE
pass_door_while_hidden = TRUE
holder_type = /obj/item/holder/mouse
@@ -160,8 +158,6 @@
/mob/living/simple_animal/mouse/brown/tom
name = "Tom"
real_name = "Tom"
- response_help = "pets"
- response_disarm = "gently pushes aside"
response_harm = "splats"
unique_pet = TRUE
gold_core_spawnable = NO_SPAWN
diff --git a/code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm b/code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm
index 74a9769dfc3..8d5aeeadcfc 100644
--- a/code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm
+++ b/code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm
@@ -18,7 +18,6 @@
maxHealth = 50
health = 50
speed = 0.75
- stop_automated_movement = FALSE
turns_per_move = 4
// What they sound like
diff --git a/code/modules/mob/living/simple_animal/friendly/penguin.dm b/code/modules/mob/living/simple_animal/friendly/penguin.dm
index c2f16d8f348..3fb7a6dfe8d 100644
--- a/code/modules/mob/living/simple_animal/friendly/penguin.dm
+++ b/code/modules/mob/living/simple_animal/friendly/penguin.dm
@@ -24,7 +24,6 @@
/mob/living/simple_animal/pet/penguin/emperor
name = "Emperor penguin"
- real_name = "penguin"
desc = "Emperor of all he surveys."
icon_state = "penguin"
icon_living = "penguin"
@@ -34,7 +33,6 @@
/mob/living/simple_animal/pet/penguin/eldrich
name = "Albino penguin"
- real_name = "penguin"
desc = "Found in the depths of mountains."
response_help = "taps"
response_disarm = "pokes"
@@ -59,11 +57,9 @@
/mob/living/simple_animal/pet/penguin/baby
speak = list("gah", "noot noot", "noot!", "noot", "squeee!", "noo!")
name = "Penguin chick"
- real_name = "penguin"
desc = "Can't fly and can barely waddles, but the prince of all chicks."
icon_state = "penguin_baby"
icon_living = "penguin_baby"
icon_dead = "penguin_baby_dead"
density = FALSE
pass_flags = PASSMOB
- mob_size = MOB_SIZE_SMALL
diff --git a/code/modules/mob/living/simple_animal/friendly/sloth.dm b/code/modules/mob/living/simple_animal/friendly/sloth.dm
index c30f73aa5bf..6046082fc87 100644
--- a/code/modules/mob/living/simple_animal/friendly/sloth.dm
+++ b/code/modules/mob/living/simple_animal/friendly/sloth.dm
@@ -1,7 +1,6 @@
/mob/living/simple_animal/pet/sloth
name = "sloth"
desc = "An adorable, sleepy creature."
- icon = 'icons/mob/pets.dmi'
icon_state = "sloth"
icon_living = "sloth"
icon_dead = "sloth_dead"
@@ -18,8 +17,6 @@
response_disarm = "gently pushes aside"
response_harm = "kicks"
gold_core_spawnable = FRIENDLY_SPAWN
- melee_damage_lower = 0
- melee_damage_upper = 0
health = 50
maxHealth = 50
speed = 2
diff --git a/code/modules/mob/living/simple_animal/friendly/snake.dm b/code/modules/mob/living/simple_animal/friendly/snake.dm
index 2087b05505c..61b53ac184f 100644
--- a/code/modules/mob/living/simple_animal/friendly/snake.dm
+++ b/code/modules/mob/living/simple_animal/friendly/snake.dm
@@ -16,8 +16,6 @@
icon_living = "snake"
icon_dead = "snake_dead"
speak_emote = list("hisses")
- health = 20
- maxHealth = 20
attacktext = "bites"
melee_damage_lower = 5
melee_damage_upper = 6
diff --git a/code/modules/mob/living/simple_animal/hide_action.dm b/code/modules/mob/living/simple_animal/hide_action.dm
index 3321004d443..0f9d6768323 100644
--- a/code/modules/mob/living/simple_animal/hide_action.dm
+++ b/code/modules/mob/living/simple_animal/hide_action.dm
@@ -26,7 +26,6 @@
button_background_icon_state = "bg_alien"
button_overlay_icon_state = "alien_hide"
layer_to_change_to = ABOVE_NORMAL_TURF_LAYER
- layer_to_change_from = MOB_LAYER
/datum/action/innate/hide/drone_hide
button_overlay_icon_state = "repairbot"
diff --git a/code/modules/mob/living/simple_animal/hostile/alien_types.dm b/code/modules/mob/living/simple_animal/hostile/alien_types.dm
index b08d371a934..ab66a947f94 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien_types.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien_types.dm
@@ -7,9 +7,6 @@
icon_dead = "alienh_dead"
icon_gib = "syndicate_gib"
gender = FEMALE
- response_help = "pokes"
- response_disarm = "shoves"
- response_harm = "hits"
speed = 0
butcher_results = list(/obj/item/food/monstermeat/xenomeat= 3, /obj/item/stack/sheet/animalhide/xeno = 1)
maxHealth = 125
@@ -27,11 +24,9 @@
unsuitable_atmos_damage = 15
heat_damage_per_tick = 20
faction = list("alien")
- status_flags = CANPUSH
minbodytemp = 0
see_in_dark = 8
lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- gold_core_spawnable = NO_SPAWN
death_sound = 'sound/voice/hiss6.ogg'
deathmessage = "lets out a waning guttural screech, green blood bubbling from its maw..."
footstep_type = FOOTSTEP_MOB_CLAW
@@ -137,7 +132,6 @@
icon_living = "queen_s"
icon_dead = "queen_dead"
bubble_icon = "alienroyal"
- move_to_delay = 4
maxHealth = 400
health = 400
butcher_results = list(/obj/item/food/monstermeat/xenomeat= 10, /obj/item/stack/sheet/animalhide/xeno = 2)
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index 6246881b830..c2e9d2bc52a 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -12,7 +12,6 @@
name = "bee"
desc = "Buzzy buzzy bee, stingy sti- Ouch!"
icon_state = ""
- icon_living = ""
icon = 'icons/mob/bees.dmi'
gender = FEMALE
speak_emote = list("buzzes")
diff --git a/code/modules/mob/living/simple_animal/hostile/deathsquid.dm b/code/modules/mob/living/simple_animal/hostile/deathsquid.dm
index 8366cd05071..6ba6849d46c 100644
--- a/code/modules/mob/living/simple_animal/hostile/deathsquid.dm
+++ b/code/modules/mob/living/simple_animal/hostile/deathsquid.dm
@@ -3,7 +3,6 @@
desc = "A large, floating eldritch horror. Its body glows with an evil red light, and its tentacles look to have been dipped in alien blood."
mob_biotypes = MOB_ORGANIC | MOB_BEAST
- speed = 1
speak_emote = list("telepathically thunders", "telepathically booms")
maxHealth = 2500 // same as megafauna
health = 2500
@@ -29,8 +28,6 @@
see_in_dark = 8
mob_size = MOB_SIZE_LARGE
- ventcrawler = VENTCRAWLER_NONE
- gold_core_spawnable = NO_SPAWN
@@ -47,6 +44,5 @@
health = 200
speed = 3
armour_penetration_flat = 5
- melee_damage_lower = 10
melee_damage_upper = 20
environment_smash = 2
diff --git a/code/modules/mob/living/simple_animal/hostile/drakehound.dm b/code/modules/mob/living/simple_animal/hostile/drakehound.dm
index 8d948385462..5d9cf46d5ac 100644
--- a/code/modules/mob/living/simple_animal/hostile/drakehound.dm
+++ b/code/modules/mob/living/simple_animal/hostile/drakehound.dm
@@ -9,7 +9,6 @@
speak_chance = 1
turns_per_move = 3
response_help = "pushes the"
- response_disarm = "shoves"
response_harm = "slashes"
speed = 0
maxHealth = 100
diff --git a/code/modules/mob/living/simple_animal/hostile/feral_cat.dm b/code/modules/mob/living/simple_animal/hostile/feral_cat.dm
index 4fe530dd62e..fd962820656 100644
--- a/code/modules/mob/living/simple_animal/hostile/feral_cat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/feral_cat.dm
@@ -7,8 +7,6 @@
icon_dead = "cat2_dead"
gender = MALE
mob_biotypes = MOB_ORGANIC | MOB_BEAST
- maxHealth = 20
- health = 20
melee_damage_lower = 10
melee_damage_upper = 5
attacktext = "claws"
diff --git a/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm b/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm
index b34931c644d..db335e4f627 100644
--- a/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm
+++ b/code/modules/mob/living/simple_animal/hostile/floorcluwne.dm
@@ -15,7 +15,6 @@
maxHealth = 200
health = 200
speed = -1
- attacktext = "attacks"
anchored = TRUE
attack_sound = 'sound/items/bikehorn.ogg'
del_on_death = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index 50a6484e493..f70a8397fb3 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -17,7 +17,6 @@
butcher_results = list(/obj/item/food/monstermeat/spidermeat = 2, /obj/item/food/monstermeat/spiderleg = 8)
response_help = "pets"
response_disarm = "gently pushes aside"
- response_harm = "hits"
maxHealth = 200
health = 200
obj_damage = 60
@@ -101,7 +100,6 @@
maxHealth = 120
health = 120
melee_damage_lower = 10
- melee_damage_upper = 20
venom_per_bite = 10
move_to_delay = 5
diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
index d5e5fe3d108..8545e2e13ca 100644
--- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
+++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
@@ -24,7 +24,6 @@
faction = list("hostile", "monkey", "jungle")
robust_searching = TRUE
minbodytemp = 270
- maxbodytemp = 350
footstep_type = FOOTSTEP_MOB_BAREFOOT
stat_attack = UNCONSCIOUS // Sleeping won't save you
a_intent = INTENT_HARM // Angrilla
@@ -219,7 +218,6 @@
icon = 'icons/mob/cargorillia.dmi'
desc = "Cargo's pet gorilla. He seems to have an 'I love Mom' tattoo."
faction = list("neutral", "monkey", "jungle")
- gold_core_spawnable = NO_SPAWN
gender = MALE
a_intent = INTENT_HELP
unique_pet = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/hivebot.dm b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
index 8ce9afac83e..d8510a6579f 100644
--- a/code/modules/mob/living/simple_animal/hostile/hivebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hivebot.dm
@@ -1,6 +1,4 @@
/obj/item/projectile/hivebotbullet
- damage = 10
- damage_type = BRUTE
/mob/living/simple_animal/hostile/hivebot
name = "Hivebot"
@@ -31,7 +29,6 @@
footstep_type = FOOTSTEP_MOB_CLAW
/mob/living/simple_animal/hostile/hivebot/range
- name = "Hivebot"
desc = "A smallish robot, this one is armed!"
ranged = TRUE
retreat_distance = 5
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm b/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm
index 16220e1d560..29ba49a8956 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle_animals.dm
@@ -12,14 +12,12 @@
icon_resting = "panther_rest"
icon_gib = "panther_dead"
mob_biotypes = MOB_ORGANIC | MOB_BEAST
- speak_chance = 0
turns_per_move = 3
butcher_results = list(/obj/item/food/meat = 3)
faction = list("hostile", "jungle")
response_help = "pets the"
response_disarm = "gently pushes aside the"
response_harm = "hits the"
- stop_automated_movement_when_pulled = FALSE
maxHealth = 50
health = 50
pixel_x = -16
diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
index 2b10afea5e4..dd137f4a0c6 100644
--- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm
+++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
@@ -5,7 +5,6 @@
icon_living = "tomato"
icon_dead = "tomato_dead"
mob_biotypes = MOB_ORGANIC | MOB_PLANT
- speak_chance = 0
turns_per_move = 5
maxHealth = 30
health = 30
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
index a2e06580e54..08726f2bf11 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm
@@ -60,7 +60,6 @@ Difficulty: Hard
friendly = "stares down"
speak_emote = list("BUZZES")
universal_speak = TRUE
- universal_understand = TRUE
armour_penetration_percentage = 50
melee_damage_lower = 20
melee_damage_upper = 20
@@ -158,7 +157,6 @@ Difficulty: Hard
icon_state = null
gpstag = "Malfunctioning Signal"
desc = "ERROR_NULL_ENTRY"
- invisibility = 100
/mob/living/simple_animal/hostile/megafauna/ancient_robot/death(gibbed, allowed = FALSE)
icon = 'icons/mob/lavaland/corpses.dmi'
@@ -813,12 +811,10 @@ Difficulty: Hard
/obj/item/projectile/bullet/ancient_robot_bullet
damage = 8
- damage_type = BRUTE
/obj/item/projectile/bullet/rock
name= "thrown rock"
damage = 25
- damage_type = BRUTE
icon = 'icons/obj/meteor.dmi'
icon_state = "small1"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index b4a0b099969..d4d61b686b1 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -32,7 +32,6 @@ Difficulty: Medium
light_color = "#E4C7C5"
speak_emote = list("roars")
speed = 3
- move_to_delay = 3
projectiletype = /obj/item/projectile/kinetic/miner
projectilesound = 'sound/weapons/kenetic_accel.ogg'
ranged = TRUE
@@ -67,7 +66,6 @@ Difficulty: Medium
icon_state = null
gpstag = "Resonant Signal"
desc = "The sweet blood, oh, it sings to me."
- invisibility = 100
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/Initialize(mapload)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index af6dcd873b0..e61f4b84459 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -86,7 +86,6 @@ Difficulty: Hard
icon_state = null
gpstag = "Bloody Signal"
desc = "You're not quite sure how a signal can be bloody."
- invisibility = 100
/mob/living/simple_animal/hostile/megafauna/bubblegum/Initialize(mapload)
. = ..()
@@ -500,7 +499,6 @@ Difficulty: Hard
name = "thick blood"
desc = "Thick, splattered blood."
random_icon_states = list("gib3", "gib5", "gib6")
- bloodiness = 20
/obj/effect/decal/cleanable/blood/gibs/bubblegum/can_bloodcrawl_in()
return TRUE
@@ -660,7 +658,6 @@ Difficulty: Hard
projectilesound = 'sound/effects/splat.ogg'
deathmessage = null
death_sound = 'sound/hallucinations/veryfar_noise.ogg'
- ranged = TRUE
ranged_cooldown_time = 10
enraged_loot = /obj/item/disk/fauna_research/bubblegum
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index d21946f4620..478b637de9d 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -323,7 +323,6 @@ Difficulty: Very Hard
/obj/effect/temp_visual/at_shield
name = "anti-toolbox field"
desc = "A shimmering forcefield protecting the colossus."
- icon = 'icons/effects/effects.dmi'
icon_state = "at_shield2"
layer = FLY_LAYER
light_range = 2
@@ -363,9 +362,6 @@ Difficulty: Very Hard
damage = 25
armour_penetration_percentage = 100
speed = 2
- eyeblur = 0
- damage_type = BRUTE
- pass_flags = PASSTABLE
/obj/item/projectile/colossus/on_hit(atom/target, blocked = 0)
. = ..()
@@ -382,7 +378,6 @@ Difficulty: Very Hard
icon_state = null
gpstag = "Angelic Signal"
desc = "Get in the fucking robot."
- invisibility = 100
#undef RANDOM_SHOTS
#undef BLAST
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index bf18c0deb0a..cbf347760d6 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -103,7 +103,6 @@ Difficulty: Medium
icon_state = null
gpstag = "Fiery Signal"
desc = "Here there be dragons."
- invisibility = 100
/mob/living/simple_animal/hostile/megafauna/dragon/death(gibbed)
move_force = MOVE_FORCE_OVERPOWERING
@@ -487,8 +486,6 @@ Difficulty: Medium
name = "Fire Barrier"
icon = 'icons/effects/fire.dmi'
icon_state = "1"
- anchored = TRUE
- opacity = FALSE
density = TRUE
duration = 82
color = COLOR_DARK_ORANGE
@@ -512,14 +509,12 @@ Difficulty: Medium
pixel_x = -32
pixel_y = -32
color = "#FF0000"
- duration = 10
/obj/effect/temp_visual/dragon_flight
icon = 'icons/mob/lavaland/96x96megafauna.dmi'
icon_state = "dragon"
layer = ABOVE_ALL_MOB_LAYER
pixel_x = -32
- duration = 10
randomdir = FALSE
/obj/effect/temp_visual/dragon_flight/Initialize(mapload, negative)
@@ -541,7 +536,6 @@ Difficulty: Medium
/obj/effect/temp_visual/dragon_flight/end
pixel_x = DRAKE_SWOOP_HEIGHT
pixel_z = DRAKE_SWOOP_HEIGHT
- duration = 10
/obj/effect/temp_visual/dragon_flight/end/flight(negative)
if(negative)
@@ -609,7 +603,6 @@ Difficulty: Medium
obj_damage = 80
melee_damage_upper = 30
melee_damage_lower = 30
- mouse_opacity = MOUSE_OPACITY_ICON
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
crusher_loot = list()
butcher_results = list(/obj/item/stack/ore/diamond = 5, /obj/item/stack/sheet/sinew = 5, /obj/item/stack/sheet/bone = 30)
@@ -634,7 +627,6 @@ Difficulty: Medium
melee_damage_upper = 35
melee_damage_lower = 35
speed = 0
- mouse_opacity = MOUSE_OPACITY_ICON
move_to_delay = 3
rapid = 2
crusher_loot = list()
@@ -678,7 +670,6 @@ Difficulty: Medium
sound = 'sound/magic/tail_swing.ogg'
base_cooldown = 150
clothes_req = FALSE
- cooldown_min = 150
invocation_type = "none"
sparkle_path = /obj/effect/temp_visual/dir_setting/tailsweep
action_icon_state = "tailsweep"
@@ -699,7 +690,6 @@ Difficulty: Medium
icon_state = null
gpstag = "Corrupted Signal"
desc = "Fish and chips."
- invisibility = 100
#undef DRAKE_SWOOP_HEIGHT
#undef DRAKE_SWOOP_DIRECTION_CHANGE_RANGE
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 15538919304..7689123f784 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -806,7 +806,6 @@ Difficulty: Hard
icon_state = "hierophant_tele_off"
light_range = 2
layer = LOW_OBJ_LAYER
- anchored = TRUE
/obj/effect/hierophant/ex_act()
return
@@ -838,4 +837,3 @@ Difficulty: Hard
icon_state = null
gpstag = "Zealous Signal"
desc = "Heed its words."
- invisibility = 100
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
index 53f5698357a..a247cf95237 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
@@ -49,7 +49,6 @@ Difficulty: Medium
enraged_loot = /obj/item/disk/fauna_research/legion
vision_range = 13
elimination = TRUE
- mouse_opacity = MOUSE_OPACITY_ICON
stat_attack = UNCONSCIOUS // Overriden from /tg/ - otherwise Legion starts chasing its minions
appearance_flags = 512
contains_xeno_organ = TRUE
@@ -236,4 +235,3 @@ Difficulty: Medium
icon_state = null
gpstag = "Echoing Signal"
desc = "The message repeats."
- invisibility = 100
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index fdb98017537..a9fe322e3ed 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -26,7 +26,6 @@
mob_size = MOB_SIZE_LARGE
layer = LARGE_MOB_LAYER //Looks weird with them slipping under mineral walls and cameras and shit otherwise
flags_2 = IMMUNE_TO_SHUTTLECRUSH_2
- mouse_opacity = MOUSE_OPACITY_ICON
dodging = FALSE // This needs to be false until someone fixes megafauna pathing so they dont lag-switch teleport at you (09-15-2023)
initial_traits = list(TRAIT_FLYING)
var/list/crusher_loot
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mimic_mobs.dm
index 33356c1d36d..02ad0664a34 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic_mobs.dm
@@ -17,7 +17,6 @@
harm_intent_damage = 5
melee_damage_lower = 8
melee_damage_upper = 12
- attacktext = "attacks"
attack_sound = 'sound/weapons/bite.ogg'
emote_taunt = list("growls")
speak_emote = list("creaks")
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/abandoned_minebot.dm b/code/modules/mob/living/simple_animal/hostile/mining/abandoned_minebot.dm
index 927327d5c20..76531edc994 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/abandoned_minebot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/abandoned_minebot.dm
@@ -21,7 +21,6 @@
attack_sound = 'sound/weapons/circsawhit.ogg'
projectiletype = /obj/item/projectile/kinetic
projectilesound = 'sound/weapons/kenetic_accel.ogg'
- ranged_cooldown_time = 30
speak_emote = list("states")
throw_message = "does not go through the armor of"
del_on_death = TRUE
@@ -30,7 +29,6 @@
ranged = TRUE
dodging = FALSE // I feel like they are pretty strong as is, no need to dodge.
retreat_distance = 2
- minimum_distance = 1
deathmessage = "blows apart!"
loot = list(/obj/effect/gibspawner/robot, /obj/item/pickaxe/drill)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
index 4bef86ed488..ad18f72cd2a 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
@@ -14,9 +14,7 @@
projectilesound = 'sound/weapons/pierce.ogg'
ranged = TRUE
ranged_message = "stares"
- ranged_cooldown_time = 30
throw_message = "does nothing against the hard shell of"
- vision_range = 2
speed = 3
maxHealth = 200
health = 200
@@ -25,10 +23,8 @@
melee_damage_lower = 12
melee_damage_upper = 12
attacktext = "bites into"
- a_intent = INTENT_HARM
speak_emote = list("chitters")
attack_sound = 'sound/weapons/bladeslice.ogg'
- aggro_vision_range = 9
turns_per_move = 5
gold_core_spawnable = HOSTILE_SPAWN
contains_xeno_organ = TRUE
@@ -40,10 +36,6 @@
/obj/item/projectile/temp/basilisk
name = "freezing blast"
icon_state = "ice_2"
- damage = 0
- damage_type = BURN
- nodamage = TRUE
- flag = ENERGY
temperature = 50
/obj/item/projectile/temp/basilisk/on_hit(atom/target, blocked)
@@ -85,9 +77,7 @@
melee_damage_lower = 15
melee_damage_upper = 15
attacktext = "impales"
- a_intent = INTENT_HARM
speak_emote = list("telepathically cries")
- attack_sound = 'sound/weapons/bladeslice.ogg'
stat_attack = UNCONSCIOUS
robust_searching = TRUE
crusher_loot = /obj/item/crusher_trophy/watcher_wing
@@ -130,14 +120,12 @@
name = "scorching blast"
icon_state = "lava"
damage = 5
- damage_type = BURN
nodamage = FALSE
temperature = 500 //Heats you up!
immolate = 1
/obj/item/projectile/temp/basilisk/icewing
damage = 5
- damage_type = BURN
nodamage = FALSE
/obj/item/projectile/temp/basilisk/icewing/on_hit(atom/target, blocked = FALSE)
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm
index 574d59e0890..d1f8f10f4a4 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm
@@ -12,7 +12,6 @@
robust_searching = TRUE
ranged_ignores_vision = TRUE
ranged = TRUE
- obj_damage = 30
vision_range = 6
aggro_vision_range = 18
environment_smash = ENVIRONMENT_SMASH_NONE //This is to prevent elites smashing up the mining station (entirely), we'll make sure they can smash minerals fine below.
@@ -162,7 +161,6 @@ While using this makes the system rely on OnFire, it still gives options for tim
light_color = LIGHT_COLOR_BLOOD_MAGIC
light_range = 3
anchored = TRUE
- density = FALSE
var/activity = TUMOR_INACTIVE
var/boosted = FALSE
var/times_won = 0
@@ -468,7 +466,6 @@ While using this makes the system rely on OnFire, it still gives options for tim
canSmoothWith = list(SMOOTH_GROUP_HIERO_WALL)
duration = 5 SECONDS
layer = BELOW_MOB_LAYER
- plane = GAME_PLANE
color = rgb(255,0,0)
light_range = MINIMUM_USEFUL_LIGHT_RANGE
light_color = LIGHT_COLOR_PURE_RED
@@ -499,7 +496,6 @@ While using this makes the system rely on OnFire, it still gives options for tim
icon_state = null
gpstag = "Cancerous Signal"
desc = "Ghosts in a fauna? That's cancerous!"
- invisibility = 100
#undef TUMOR_INACTIVE
#undef TUMOR_ACTIVE
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/goliath_broodmother.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/goliath_broodmother.dm
index 3843f05b34a..8938920abc4 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/elites/goliath_broodmother.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/goliath_broodmother.dm
@@ -36,7 +36,6 @@
speed = 2
move_to_delay = 5
mob_biotypes = MOB_ORGANIC|MOB_BEAST
- mouse_opacity = MOUSE_OPACITY_ICON
deathmessage = "explodes into gore!"
loot_drop = /obj/item/crusher_trophy/broodmother_tongue
contains_xeno_organ = TRUE
@@ -186,7 +185,6 @@
speed = 2
move_to_delay = 5
mob_biotypes = MOB_ORGANIC|MOB_BEAST
- mouse_opacity = MOUSE_OPACITY_ICON
deathmessage = "falls to the ground."
status_flags = CANPUSH
var/mob/living/simple_animal/hostile/asteroid/elite/broodmother/mother = null
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm
index 9328e2953a1..660a99a05d4 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm
@@ -37,7 +37,6 @@
throw_message = "doesn't affect the purity of"
speed = 2
move_to_delay = 10
- mouse_opacity = MOUSE_OPACITY_ICON
death_sound = 'sound/misc/demon_dies.ogg'
deathmessage = "begins to shudder as it becomes transparent..."
loot_drop = /obj/item/clothing/neck/cloak/herald_cloak
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/legionnaire.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/legionnaire.dm
index 29c6dcb1752..9b0b7c52ca0 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/elites/legionnaire.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/legionnaire.dm
@@ -33,8 +33,6 @@
attack_sound = 'sound/weapons/bladeslice.ogg'
throw_message = "doesn't affect the sturdiness of"
speed = 0.5 //Since it is mainly melee, this *should* be right
- move_to_delay = 3
- mouse_opacity = MOUSE_OPACITY_ICON
death_sound = 'sound/hallucinations/wail.ogg'
deathmessage = "'s arms reach out before it falls apart onto the floor, lifeless."
sight = SEE_MOBS // So it can see through smoke / charge through walls like the kool aid man.
@@ -290,7 +288,6 @@
max_integrity = 100
move_resist = MOVE_FORCE_EXTREMELY_STRONG
anchored = TRUE
- density = FALSE
light_range = 4
light_color = LIGHT_COLOR_FLARE
var/mob/living/simple_animal/hostile/asteroid/elite/legionnaire/myowner = null
@@ -318,7 +315,6 @@
//The visual effect which appears in front of legionnaire when he goes to charge.
/obj/effect/temp_visual/dragon_swoop/legionnaire
- duration = 10
/obj/effect/temp_visual/dragon_swoop/legionnaire/Initialize(mapload)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm b/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm
index 6cbb3c0cbc5..5ae6ed4fd32 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm
@@ -37,7 +37,6 @@
ranged_cooldown_time = 20
speed = 2
move_to_delay = 10
- mouse_opacity = MOUSE_OPACITY_ICON
death_sound = 'sound/magic/repulse.ogg'
deathmessage = "'s lights flicker, before its top part falls down."
loot_drop = /obj/item/clothing/accessory/pandora_hope
@@ -210,7 +209,6 @@
icon_state = "hope"
item_state = "hope"
item_color = "hope"
- slot_flags = ITEM_SLOT_ACCESSORY
allow_duplicates = FALSE
resistance_flags = FIRE_PROOF
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm
index 416b8d19d18..a57ad115237 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm
@@ -9,15 +9,11 @@
icon_dead = "Goldgrub_dead"
icon_gib = "syndicate_gib"
mob_biotypes = MOB_ORGANIC | MOB_BEAST
- vision_range = 2
- aggro_vision_range = 9
move_to_delay = 5
friendly = "harmlessly rolls into"
maxHealth = 45
health = 45
harm_intent_damage = 5
- melee_damage_lower = 0
- melee_damage_upper = 0
attacktext = "barrels into"
attack_sound = 'sound/weapons/punch1.ogg'
a_intent = INTENT_HELP
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
index c755127a9ab..dfd0795b891 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/goliath.dm
@@ -9,7 +9,6 @@
icon_dead = "Goliath_dead"
icon_gib = "syndicate_gib"
mob_biotypes = MOB_ORGANIC | MOB_BEAST
- mouse_opacity = MOUSE_OPACITY_ICON
move_to_delay = 40
ranged = TRUE
ranged_cooldown_time = 120
@@ -26,7 +25,6 @@
attack_sound = 'sound/weapons/punch1.ogg'
throw_message = "does nothing to the rocky hide of the"
vision_range = 5
- aggro_vision_range = 9
move_force = MOVE_FORCE_VERY_STRONG
move_resist = MOVE_FORCE_VERY_STRONG
pull_force = MOVE_FORCE_VERY_STRONG
@@ -82,9 +80,7 @@
//Lavaland Goliath
/mob/living/simple_animal/hostile/asteroid/goliath/beast
- name = "goliath"
desc = "A hulking, armor-plated beast with long tendrils arching from its back."
- icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
icon_state = "goliath"
icon_living = "goliath"
icon_aggro = "goliath"
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm b/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm
index 7f0f2b40830..7ff8fbe854c 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/gutlunch.dm
@@ -27,7 +27,6 @@
gold_core_spawnable = FRIENDLY_SPAWN
stat_attack = UNCONSCIOUS
gender = NEUTER
- stop_automated_movement = FALSE
stop_automated_movement_when_pulled = TRUE
stat_exclusive = TRUE
robust_searching = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
index 64c8721c1ff..817ea3eb692 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm
@@ -7,23 +7,18 @@
icon_aggro = "Hivelord_alert"
icon_dead = "Hivelord_dead"
icon_gib = "syndicate_gib"
- mob_biotypes = MOB_ORGANIC
mouse_opacity = MOUSE_OPACITY_OPAQUE
move_to_delay = 14
ranged = TRUE
vision_range = 5
- aggro_vision_range = 9
speed = 3
maxHealth = 75
health = 75
harm_intent_damage = 5
- melee_damage_lower = 0
- melee_damage_upper = 0
attacktext = "lashes out at"
speak_emote = list("telepathically cries")
attack_sound = 'sound/weapons/pierce.ogg'
throw_message = "falls right through the strange body of the"
- ranged_cooldown = 0
ranged_cooldown_time = 20
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
@@ -167,20 +162,16 @@
/mob/living/simple_animal/hostile/asteroid/hivelord/legion
name = "legion"
desc = "You can still see what was once a person under the shifting mass of corruption."
- icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
icon_state = "legion"
icon_living = "legion"
icon_aggro = "legion"
icon_dead = "legion"
- icon_gib = "syndicate_gib"
mob_biotypes = MOB_ORGANIC | MOB_HUMANOID
mouse_opacity = MOUSE_OPACITY_ICON
obj_damage = 60
melee_damage_lower = 15
melee_damage_upper = 15
- attacktext = "lashes out at"
speak_emote = list("echoes")
- attack_sound = 'sound/weapons/pierce.ogg'
throw_message = "bounces harmlessly off of"
crusher_loot = /obj/item/crusher_trophy/legion_skull
loot = list(/obj/item/organ/internal/regenerative_core/legion)
@@ -227,24 +218,16 @@
/mob/living/simple_animal/hostile/asteroid/hivelordbrood/legion
name = "legion"
desc = "One of many."
- icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
icon_state = "legion_head"
icon_living = "legion_head"
icon_aggro = "legion_head"
icon_dead = "legion_head"
- icon_gib = "syndicate_gib"
- friendly = "buzzes near"
- vision_range = 10
- maxHealth = 1
health = 5
- harm_intent_damage = 5
melee_damage_lower = 12
melee_damage_upper = 12
attacktext = "bites"
speak_emote = list("echoes")
- attack_sound = 'sound/weapons/pierce.ogg'
throw_message = "is shrugged off by"
- del_on_death = TRUE
stat_attack = UNCONSCIOUS
robust_searching = TRUE
var/can_infest_dead = FALSE
@@ -302,8 +285,6 @@
maxHealth = 350
melee_damage_lower = 30
melee_damage_upper = 30
- wander = TRUE
- layer = MOB_LAYER
move_force = MOVE_FORCE_VERY_STRONG
move_resist = MOVE_FORCE_VERY_STRONG
pull_force = MOVE_FORCE_VERY_STRONG
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/mining.dm b/code/modules/mob/living/simple_animal/hostile/mining/mining.dm
index 70ae70c6ed6..3e447222baf 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/mining.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/mining.dm
@@ -9,8 +9,6 @@
environment_smash = ENVIRONMENT_SMASH_WALLS
minbodytemp = 0
maxbodytemp = INFINITY
- response_help = "pokes"
- response_disarm = "shoves"
response_harm = "strikes"
status_flags = 0
a_intent = INTENT_HARM
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index 5028628dac6..ce5dc0764cc 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -5,8 +5,6 @@
icon_living = "mushroom_color"
icon_dead = "mushroom_dead"
mob_biotypes = MOB_ORGANIC | MOB_PLANT
- speak_chance = 0
- turns_per_move = 1
maxHealth = 10
health = 10
butcher_results = list(/obj/item/food/hugemushroomslice = 1)
@@ -23,8 +21,6 @@
faction = list("mushroom", "jungle")
environment_smash = 0
stat_attack = DEAD
- mouse_opacity = MOUSE_OPACITY_ICON
- speed = 1
ventcrawler = VENTCRAWLER_ALWAYS
robust_searching = TRUE
speak_emote = list("squeaks")
diff --git a/code/modules/mob/living/simple_animal/hostile/pirate.dm b/code/modules/mob/living/simple_animal/hostile/pirate.dm
index 8ac5a8f6b40..01a8a1eb8ee 100644
--- a/code/modules/mob/living/simple_animal/hostile/pirate.dm
+++ b/code/modules/mob/living/simple_animal/hostile/pirate.dm
@@ -10,7 +10,6 @@
turns_per_move = 3
death_sound = 'sound/creatures/piratedeath.ogg'
response_help = "pushes the"
- response_disarm = "shoves"
response_harm = "slashes"
speed = 0
maxHealth = 100
@@ -64,7 +63,6 @@
name = "Pirate Gunner"
icon_state = "piratespaceranged"
icon_living = "piratespaceranged"
- icon_dead = "piratemelee_dead" // Does not actually exist. del_on_death.
projectilesound = 'sound/weapons/laser.ogg'
ranged = TRUE
rapid = 2
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/araneus.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/araneus.dm
index 136e0df9245..cf9005914e1 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/araneus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/araneus.dm
@@ -1,7 +1,6 @@
/mob/living/simple_animal/hostile/retaliate/araneus
name = "Sergeant Araneus"
real_name = "Sergeant Araneus"
- voice_name = "unidentifiable voice"
desc = "A fierce companion for any person of power, this spider has been carefully trained by Nanotrasen specialists. Its beady, staring eyes send shivers down your spine."
faction = list("spiders")
icon_state = "guard"
@@ -14,7 +13,6 @@
emote_hear = list("chitters")
maxHealth = 250
health = 250
- harm_intent_damage = 3
melee_damage_lower = 15
melee_damage_upper = 20
unique_pet = TRUE
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/combat_drone.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/combat_drone.dm
index aeb57abcae3..577cadca0c1 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/combat_drone.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/combat_drone.dm
@@ -19,7 +19,6 @@
speak = list("ALERT.", "Hostile-ile-ile entities dee-twhoooo-wected.", "Threat parameterszzzz- szzet.", "Bring sub-sub-sub-systems uuuup to combat alert alpha-a-a.")
emote_see = list("beeps menacingly.", "whirrs threateningly.", "scans for targets.")
a_intent = INTENT_HARM
- stop_automated_movement_when_pulled = FALSE
health = 200
maxHealth = 200
speed = 8
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
index af86be821c8..c5290561ae6 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/fish.dm
@@ -6,12 +6,10 @@
icon_state = "carp"
icon_gib = "carp_gib"
mob_biotypes = MOB_ORGANIC | MOB_BEAST
- speak_chance = 0
turns_per_move = 5
butcher_results = list(/obj/item/food/carpmeat = 1)
response_help = "pets"
response_disarm = "gently pushes aside"
- response_harm = "hits"
speed = 0
maxHealth = 25
health = 25
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/kangaroo.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/kangaroo.dm
index faed781ee1c..fc7339b4b14 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/kangaroo.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/kangaroo.dm
@@ -1,7 +1,6 @@
/mob/living/simple_animal/hostile/retaliate/kangaroo
name = "Kangaroo"
real_name = "Kangaroo"
- voice_name = "unidentifiable voice"
desc = "A large marsupial herbivore. It has powerful hind legs, with nails that resemble long claws."
icon_state = "kangaroo" // Credit: FoS
icon_living = "kangaroo"
@@ -14,7 +13,6 @@
maxHealth = 150
health = 150
butcher_results = list(/obj/item/food/meat/kangaroo = 6)
- harm_intent_damage = 3
melee_damage_lower = 5 // avg damage 12.5 without kick, (12.5+12.5+60)/3=25 with kick
melee_damage_upper = 20
attacktext = "slashes"
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
index d1be7e7ae34..1c3ad3281e3 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/undead.dm
@@ -7,16 +7,11 @@
mob_biotypes = MOB_SPIRIT
density = FALSE // ghost
invisibility = 60 // no seriously ghost
- speak_chance = 0 // fyi, ghost
response_help = "passes through" // by the way ghost
- response_disarm = "shoves"
- response_harm = "hits"
turns_per_move = 10
speed = 0
- maxHealth = 20
- health = 20
emote_taunt = list("wails")
taunt_chance = 20
@@ -30,7 +25,6 @@
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
pressure_resistance = 300
- gold_core_spawnable = NO_SPAWN //too spooky for science
faction = list("undead") // did I mention ghost
loot = list(/obj/item/food/ectoplasm)
del_on_death = TRUE
@@ -54,14 +48,9 @@
icon_living = "skeleton_s"
icon_dead = "skeleton_l"
mob_biotypes = MOB_UNDEAD | MOB_HUMANOID
- speak_chance = 0
turns_per_move = 10
response_help = "shakes hands with"
- response_disarm = "shoves"
- response_harm = "hits"
speed = 0
- maxHealth = 20
- health = 20
harm_intent_damage = 10
melee_damage_lower = 5
@@ -84,14 +73,9 @@
icon_living = "zombie_s"
icon_dead = "zombie_l"
mob_biotypes = MOB_UNDEAD | MOB_HUMANOID
- speak_chance = 0
turns_per_move = 10
response_help = "gently prods"
- response_disarm = "shoves"
- response_harm = "hits"
speed = -1
- maxHealth = 20
- health = 20
harm_intent_damage = 10
melee_damage_lower = 5
diff --git a/code/modules/mob/living/simple_animal/hostile/soviet.dm b/code/modules/mob/living/simple_animal/hostile/soviet.dm
index 19d745c6ddc..1d946f856ad 100644
--- a/code/modules/mob/living/simple_animal/hostile/soviet.dm
+++ b/code/modules/mob/living/simple_animal/hostile/soviet.dm
@@ -7,7 +7,6 @@
icon_dead = "sovietmelee_dead" // Does not actually exist. del_on_death.
icon_gib = "sovietmelee_gib" // Does not actually exist. del_on_death.
mob_biotypes = MOB_ORGANIC | MOB_HUMANOID
- speak_chance = 0
turns_per_move = 5
response_help = "pokes the"
response_disarm = "shoves the"
@@ -23,7 +22,6 @@
a_intent = INTENT_HARM
unsuitable_atmos_damage = 15
faction = list("soviet")
- status_flags = CANPUSH
loot = list(/obj/effect/mob_spawn/human/corpse/soviet,
/obj/item/kitchen/knife,
/obj/item/salvage/loot/soviet)
@@ -70,7 +68,6 @@
a_intent = INTENT_HARM
unsuitable_atmos_damage = 15
faction = list("soviet")
- status_flags = CANPUSH
loot = list(
/obj/effect/mob_spawn/human/corpse/soviet_nian,
/obj/item/melee/energy/sword/pirate,
diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm b/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm
index 0e67511ff03..993339c6780 100644
--- a/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/syndicate_mobs.dm
@@ -67,7 +67,6 @@
speed = 0
maxHealth = 200
health = 200
- unsuitable_atmos_damage = 2 // 4 actually
damage_coeff = list(BRUTE = 0.9, BURN = 0.9, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0) // Imitates our armor
melee_damage_lower = 30
melee_damage_upper = 30
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm
index 0eb0e4b3ad8..d5e86b80bfa 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm
@@ -56,7 +56,6 @@
/datum/action/innate/terrorspider/mother/royaljelly
name = "Lay Royal Jelly"
- button_overlay_icon = 'icons/mob/actions/actions.dmi'
button_overlay_icon_state = "spiderjelly"
/datum/action/innate/terrorspider/mother/royaljelly/Activate()
@@ -94,7 +93,6 @@
/datum/action/innate/terrorspider/queen/queensense
name = "Hive Sense"
- button_overlay_icon = 'icons/mob/actions/actions.dmi'
button_overlay_icon_state = "mindswap"
/datum/action/innate/terrorspider/queen/queensense/Activate()
@@ -158,11 +156,7 @@
/obj/structure/spider/terrorweb
name = "terror web"
desc = "It's stringy and sticky!"
- icon = 'icons/effects/effects.dmi'
- anchored = TRUE // prevents people dragging it
- density = FALSE // prevents it blocking all movement
max_integrity = 20 // two welders, or one laser shot (15 for the normal spider webs)
- icon_state = "stickyweb1"
creates_cover = TRUE
var/creator_ckey = null
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm
index 642246b3d99..0cf9241dc83 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm
@@ -19,8 +19,6 @@
icon_state = "terror_widow"
icon_living = "terror_widow"
icon_dead = "terror_widow_dead"
- maxHealth = 120 // same health as hunter spider, aka, pretty weak.. but its bite will kill you!
- health = 120
melee_damage_lower = 5
melee_damage_upper = 10
web_type = /obj/structure/spider/terrorweb/black
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/brown.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/brown.dm
index 38defdb84a7..bd4bf47b8f9 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/brown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/brown.dm
@@ -19,8 +19,6 @@
icon_state = "terror_brown"
icon_living = "terror_brown"
icon_dead = "terror_brown_dead"
- maxHealth = 120 // Low
- health = 120
melee_damage_lower = 20
melee_damage_upper = 30
move_to_delay = 20 // Slow.
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress_terror.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress_terror.dm
index a17cdffafdb..8bf8842c359 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress_terror.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/empress_terror.dm
@@ -15,13 +15,10 @@
You have more health than any other terror spider and deal extremely high damage to anything you attack. \
You can also lay eggs at an incredibly fast rate. \
You can also break through practically anything, so the crew will have zero hope of containing you. Have fun!"
- ai_target_method = TS_DAMAGE_SIMPLE
maxHealth = 1000
health = 1000
melee_damage_lower = 30
melee_damage_upper = 60
- ventcrawler = VENTCRAWLER_NUDE
- idle_ventcrawl_chance = 0
ai_playercontrol_allowtype = 0
canlay = 1000
spider_tier = TS_TIER_5
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm
index 1a4f9101ad5..a398fd93439 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/gray.dm
@@ -20,10 +20,7 @@
icon_state = "terror_gray"
icon_living = "terror_gray"
icon_dead = "terror_gray_dead"
- maxHealth = 120 // same health as hunter spider, aka, pretty weak.. but its almost invisible while on webs.
- health = 120
melee_damage_lower = 10
- melee_damage_upper = 20
stat_attack = UNCONSCIOUS // ensures they will target people in crit, too!
delay_web = 20 // double speed
web_type = /obj/structure/spider/terrorweb/gray
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm
index 2dfd327f79e..3191e2dd7c3 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/green.dm
@@ -22,7 +22,6 @@
maxHealth = 150
health = 150
melee_damage_lower = 10
- melee_damage_upper = 20
web_type = /obj/structure/spider/terrorweb/green
var/feedings_to_lay = 2
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm
index 358894501a7..8727ebd8fe0 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/mother.dm
@@ -17,14 +17,10 @@
You can also produce royal jelly for other spiders to consume for faster health regeneration. \
Both of these require you to expend your own regeneration, though you gain much more from webbing corpses than other spiders. \
While you can open powered doors and bust open vents like a brown spider, you have low health and deal low damage, so you should avoid fights wherever possible."
- ai_target_method = TS_DAMAGE_SIMPLE
icon_state = "terror_mother"
icon_living = "terror_mother"
icon_dead = "terror_mother_dead"
- maxHealth = 120 // same combat stats as an unboosted T1 gray. Very weak in combat.
- health = 120
melee_damage_lower = 10
- melee_damage_upper = 20
regen_points_per_tick = 2
regen_points_max = 400 // enough to lay 4 jellies, if fully charged
regen_points_per_kill = 200 // >2x normal, since they're food reprocessors
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm
index 87e254f7e44..c9448373d16 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/princess.dm
@@ -17,7 +17,6 @@
You can also open powered doors and your webs are airtight, being capable of blocking off exposure to space. \
You do not take damage from weaker weapons or projectiles. \
However, you only have moderate health and deal moderate damage, making you weak in direct fights and reliant on other spiders for defence."
- ai_target_method = TS_DAMAGE_SIMPLE
icon_state = "terror_princess1"
icon_living = "terror_princess1"
icon_dead = "terror_princess1_dead"
@@ -34,7 +33,6 @@
canlay = 0
hasnested = TRUE
- spider_spawnfrequency = 120 SECONDS
var/spider_max_children = 8
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm
index 9e799044fc3..07661233b38 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/purple.dm
@@ -22,7 +22,6 @@
icon_dead = "terror_purple_dead"
maxHealth = 200
health = 200
- melee_damage_lower = 15
melee_damage_upper = 25
spider_tier = TS_TIER_2
move_to_delay = 5 // at 20ticks/sec, this is 4 tile/sec movespeed, same as a human. Faster than a normal spider, so it can intercept attacks on queen.
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen_terror.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen_terror.dm
index 4dfaf26f85a..b24824e4a4c 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen_terror.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/queen_terror.dm
@@ -17,7 +17,6 @@
Specialized egg types have a limit on how many can be laid, and you need to remain alive for some time before you can lay the strongest eggs. \
You have high health and are armored, with weaker attacks being unable to harm you. While your melee attacks only deal moderate damage, you additionally have access to a powerful ranged acid attack. \
You can also open both powered doors and welded vents, and your webs are airtight - being capable of blocking off exposure to space."
- ai_target_method = TS_DAMAGE_SIMPLE
icon_state = "terror_queen"
icon_living = "terror_queen"
icon_dead = "terror_queen_dead"
@@ -25,8 +24,6 @@
health = 200
regen_points_per_tick = 3
melee_damage_lower = 10
- melee_damage_upper = 20
- ventcrawler = VENTCRAWLER_NUDE
ai_break_lights = FALSE
ai_spins_webs = FALSE
ai_ventcrawls = FALSE
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/red.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/red.dm
index c01e9f9dd2c..59917c3b16e 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/red.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/red.dm
@@ -17,13 +17,8 @@
Your brute strength also allows you to force open powered doors and your webs are stronger and take longer for the crew to destroy. \
However, you move much slower than most other spiders."
ai_target_method = TS_DAMAGE_BRUTE
- icon_state = "terror_red"
- icon_living = "terror_red"
- icon_dead = "terror_red_dead"
maxHealth = 200
health = 200
- melee_damage_lower = 15
- melee_damage_upper = 20
move_to_delay = 10 // at 20ticks/sec, this is 2 tile/sec movespeed
speed = 2 // movement_delay() gives 4.5, or 0.45s between steps, which = about 2.2 tiles/second. Player is slightly faster than AI, but cannot move on diagonals.
spider_opens_doors = 2
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm
index c242175fc0d..89c2ae0d8c0 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/reproduction.dm
@@ -4,12 +4,7 @@
// --------------------------------------------------------------------------------
/obj/structure/spider/spiderling/terror_spiderling
- name = "spiderling"
desc = "A fast-moving tiny spider, prone to making aggressive hissing sounds. Hope it doesn't grow up."
- icon_state = "spiderling"
- anchored = FALSE
- layer = 2.75
- max_integrity = 3
var/stillborn = FALSE
var/mob/living/simple_animal/hostile/poison/terror_spider/queen/spider_myqueen = null
var/mob/living/simple_animal/hostile/poison/terror_spider/spider_mymother = null
@@ -190,7 +185,6 @@
/obj/structure/spider/eggcluster/terror_eggcluster
name = "terror egg cluster"
desc = "A cluster of tiny spider eggs. They pulse with a strong inner life, and appear to have sharp thorns on the sides."
- icon_state = "eggs"
var/spider_growinstantly = FALSE
var/mob/living/simple_animal/hostile/poison/terror_spider/queen/spider_myqueen = null
var/mob/living/simple_animal/hostile/poison/terror_spider/spider_mymother = null
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
index 79eba3ee754..657f5e64b8f 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/terror_spiders.dm
@@ -71,7 +71,6 @@ GLOBAL_LIST_EMPTY(ts_infected_list)
var/spider_max_steps = 15 // after we take X turns trying to do something, give up!
// Speech
- speak_chance = 0 // quiet but deadly
speak_emote = list("hisses")
emote_hear = list("hisses")
diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm
index 79017ee0d5e..73a41e366a5 100644
--- a/code/modules/mob/living/simple_animal/hostile/tree.dm
+++ b/code/modules/mob/living/simple_animal/hostile/tree.dm
@@ -7,12 +7,10 @@
icon_dead = "pine_1"
icon_gib = "pine_1"
mob_biotypes = MOB_ORGANIC | MOB_PLANT
- speak_chance = 0
turns_per_move = 5
response_help = "brushes the"
response_disarm = "pushes the"
response_harm = "hits the"
- speed = 1
maxHealth = 250
health = 250
mob_size = MOB_SIZE_LARGE
diff --git a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
index 89ed1d5b6b6..e4b7ae82da3 100644
--- a/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/winter_mobs.dm
@@ -4,9 +4,7 @@
/mob/living/simple_animal/hostile/winter
faction = list("hostile", "syndicate", "winter")
- speak_chance = 0
turns_per_move = 5
- speed = 1
maxHealth = 50
health = 50
icon = 'icons/mob/winter_mob.dmi'
@@ -91,8 +89,6 @@
/// stage 1: slow melee
/mob/living/simple_animal/hostile/winter/santa/stage_1
- maxHealth = 150
- health = 150
desc = "GET THE FAT MAN!"
next_stage = /mob/living/simple_animal/hostile/winter/santa/stage_2
death_message = "HO HO HO! YOU THOUGHT IT WOULD BE THIS EASY?!?"
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index f87fe41d9a8..fdabdb28710 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -27,7 +27,6 @@
/mob/living/simple_animal/parrot
name = "parrot"
desc = "The parrot squawks, \"It's a parrot! BAWWK!\""
- icon = 'icons/mob/animal.dmi'
icon_state = "parrot_fly"
icon_living = "parrot_fly"
icon_dead = "parrot_dead"
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 5b01640d90c..3640564e7e9 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -26,7 +26,6 @@
see_invisible = SEE_INVISIBLE_HIDDEN_RUNES
universal_speak = TRUE
faction = list("cult")
- status_flags = CANPUSH
loot = list(/obj/item/food/ectoplasm)
del_on_death = TRUE
deathmessage = "lets out a contented sigh as their form unwinds."
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index 2c07eb67fef..d0d02ad62c8 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -7,7 +7,6 @@
hud_type = /datum/hud/simple_animal
universal_understand = TRUE
- universal_speak = FALSE
status_flags = CANPUSH
healable = TRUE
gib_nullifies_icon = FALSE // prevents players from having transparent icon when their body is gibbed
diff --git a/code/modules/mob/living/simple_animal/slime/slime_mob.dm b/code/modules/mob/living/simple_animal/slime/slime_mob.dm
index 67e27d03428..503f0f21eeb 100644
--- a/code/modules/mob/living/simple_animal/slime/slime_mob.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime_mob.dm
@@ -9,7 +9,6 @@
var/is_adult = FALSE
var/docile = FALSE
faction = list("slime", "neutral")
- new_attack_chain = TRUE
harm_intent_damage = 5
icon_living = "grey baby slime"
diff --git a/code/modules/mob/mob_holder.dm b/code/modules/mob/mob_holder.dm
index b3a4c024d75..408730c1fd3 100644
--- a/code/modules/mob/mob_holder.dm
+++ b/code/modules/mob/mob_holder.dm
@@ -101,7 +101,6 @@
slot_flags = ITEM_SLOT_HEAD
/obj/item/holder/drone/emagged
- name = "maintenance drone"
icon_state = "drone-emagged"
/obj/item/holder/pai
diff --git a/code/modules/mob/new_player/sprite_accessories/kidan/kidan_head_accessories.dm b/code/modules/mob/new_player/sprite_accessories/kidan/kidan_head_accessories.dm
index a604341a03d..da010aa9036 100644
--- a/code/modules/mob/new_player/sprite_accessories/kidan/kidan_head_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories/kidan/kidan_head_accessories.dm
@@ -2,7 +2,6 @@
icon = 'icons/mob/sprite_accessories/kidan/kidan_head_accessories.dmi'
species_allowed = list("Kidan")
over_hair = 1
- do_colouration = 1
/datum/sprite_accessory/head_accessory/kidan/perked_antennae
name = "Perked-up Antennae"
diff --git a/code/modules/mob/new_player/sprite_accessories/moth/moth_head_accessories.dm b/code/modules/mob/new_player/sprite_accessories/moth/moth_head_accessories.dm
index 077c20531cd..27b250b134f 100644
--- a/code/modules/mob/new_player/sprite_accessories/moth/moth_head_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories/moth/moth_head_accessories.dm
@@ -2,7 +2,6 @@
icon = 'icons/mob/sprite_accessories/moth/moth_head_accessories.dmi'
species_allowed = list("Nian")
over_hair = TRUE
- do_colouration = TRUE
/datum/sprite_accessory/head_accessory/moth/plain
name = "Plain Antennae"
diff --git a/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm b/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm
index e8e065c70bb..a9c8194adc8 100644
--- a/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm
+++ b/code/modules/mob/new_player/sprite_accessories/sprite_accessories.dm
@@ -97,7 +97,6 @@
/datum/sprite_accessory/head_accessory/none
name = "None"
species_allowed = list("Human", "Unathi", "Diona", "Grey", "Kidan", "Machine", "Tajaran", "Vulpkanin", "Skrell", "Slime People", "Skeleton", "Vox")
- icon_state = "accessory_none"
/* BODY MARKINGS */
@@ -114,7 +113,6 @@
/datum/sprite_accessory/body_markings/tail
species_allowed = list()
- icon_state = "accessory_none"
marking_location = "tail"
tails_allowed = null
diff --git a/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_hair.dm b/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_hair.dm
index 487ea3fa491..8bdcb7ea232 100644
--- a/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_hair.dm
+++ b/code/modules/mob/new_player/sprite_accessories/tajaran/tajaran_hair.dm
@@ -58,7 +58,6 @@
/datum/sprite_accessory/hair/tajara/taj_hair_bedhead
name = "Tajara Bedhead"
icon_state = "bedhead"
- glasses_over = 1
/datum/sprite_accessory/hair/tajara/taj_hair_retro
name = "Tajara Ladies' Retro"
@@ -83,7 +82,6 @@
/datum/sprite_accessory/hair/tajara/taj_hair_sidebraid
name = "Tajara Sidebraid"
icon_state = "sidebraid"
- glasses_over = 1
/datum/sprite_accessory/hair/tajara/taj_hair_earrings
name = "Tajara Earrings"
@@ -113,7 +111,6 @@
/datum/sprite_accessory/hair/tajara/taj_hair_lynx
name = "Tajara Lynx"
icon_state = "lynx"
- glasses_over = 1
/datum/sprite_accessory/hair/tajara/taj_hair_longtail
name = "Tajara Long Tail"
diff --git a/code/modules/mod/mod_actions.dm b/code/modules/mod/mod_actions.dm
index fef9ee1a901..5509a16fb45 100644
--- a/code/modules/mod/mod_actions.dm
+++ b/code/modules/mod/mod_actions.dm
@@ -89,7 +89,6 @@
/datum/action/item_action/mod/pinned_module
desc = "Activate the module."
button_overlay_icon = 'icons/obj/clothing/modsuit/mod_modules.dmi'
- button_background_icon = 'icons/mob/actions/actions_mod.dmi'
button_overlay_icon_state = "module"
/// Module we are linked to.
var/obj/item/mod/module/module
diff --git a/code/modules/mod/mod_clothes.dm b/code/modules/mod/mod_clothes.dm
index 052d8f47672..37a2ed722a6 100644
--- a/code/modules/mod/mod_clothes.dm
+++ b/code/modules/mod/mod_clothes.dm
@@ -7,7 +7,6 @@
item_state = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
icon_override = 'icons/mob/clothing/modsuit/mod_clothing.dmi'
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 0, ACID = 0)
- body_parts_covered = HEAD
heat_protection = HEAD
cold_protection = HEAD
permeability_coefficient = 0.01
diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm
index 82fc0e64b17..40e8ee85aac 100644
--- a/code/modules/mod/mod_control.dm
+++ b/code/modules/mod/mod_control.dm
@@ -21,7 +21,6 @@
/datum/action/item_action/mod/panel,
/datum/action/item_action/mod/module,
)
- resistance_flags = NONE
max_heat_protection_temperature = SPACE_SUIT_MAX_TEMP_PROTECT
min_cold_protection_temperature = SPACE_SUIT_MIN_TEMP_PROTECT
siemens_coefficient = 0.5
diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm
index 4d7399bc47f..a937aad16b3 100644
--- a/code/modules/mod/mod_theme.dm
+++ b/code/modules/mod/mod_theme.dm
@@ -130,7 +130,6 @@
max_heat_protection_temperature = FIRE_SUIT_MAX_TEMP_PROTECT
siemens_coefficient = 0
slowdown_inactive = 1.5
- slowdown_active = 0.75
allowed_suit_storage = list(
/obj/item/rcd,
/obj/item/fireaxe,
@@ -181,7 +180,6 @@
charge_drain = DEFAULT_CHARGE_DRAIN * 2
siemens_coefficient = 0
slowdown_inactive = 1.5
- slowdown_active = 0.75
allowed_suit_storage = list(
/obj/item/rcd,
/obj/item/fireaxe/,
diff --git a/code/modules/mod/modules/module_kinesis.dm b/code/modules/mod/modules/module_kinesis.dm
index 968e9a573eb..067fd9ebe7b 100644
--- a/code/modules/mod/modules/module_kinesis.dm
+++ b/code/modules/mod/modules/module_kinesis.dm
@@ -264,6 +264,5 @@
beings. They can, however, still struggle after an initial burst of inertia."
complexity = 0
prebuilt = TRUE
- stat_required = CONSCIOUS //Still conscious here so we don't forget about it if the above is changed
incapacitated_required = FALSE
mob_stun_time = 10 SECONDS
diff --git a/code/modules/mod/modules/modules_engineering.dm b/code/modules/mod/modules/modules_engineering.dm
index c5fcbd9c84d..4ec0a69fdbd 100644
--- a/code/modules/mod/modules/modules_engineering.dm
+++ b/code/modules/mod/modules/modules_engineering.dm
@@ -81,7 +81,6 @@
desc = "A protoype module that improves the sensors on the modsuit to detect radiation on the user. \
Currently due to time restraints and a lack of lead on lavaland, it does not have a built in geiger counter or radiation protection."
icon_state = "radshield"
- complexity = 0 //I'm setting this to zero for now due to it not currently increasing radiaiton armor. If we add giger counter / additional rad protecion to this, it should be 2. We denied radiation potions before, so this should NOT give full rad immunity on a engi modsuit
idle_power_cost = DEFAULT_CHARGE_DRAIN * 0.1 //Lowered from 0.3 due to no protection.
incompatible_modules = list(/obj/item/mod/module/rad_protection)
tgui_id = "rad_counter"
diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm
index b0202274eea..b3d1450eb22 100644
--- a/code/modules/mod/modules/modules_general.dm
+++ b/code/modules/mod/modules/modules_general.dm
@@ -83,7 +83,6 @@
max_w_class = WEIGHT_CLASS_SMALL
removable = FALSE
max_combined_w_class = 21
- max_items = 7
/obj/item/mod/module/storage/bluespace
name = "MOD bluespace storage module"
@@ -426,7 +425,6 @@
/obj/item/mod/module/dna_lock/emp_shield
name = "MOD DN-MP shield lock"
desc = "This syndicate module is a combination EMP shield and DNA lock. Provides the best of both worlds, with the weakness of niether."
- icon_state = "dnalock"
origin_tech = "materials=6;bluespace=5;syndicate=3"
complexity = 3
use_power_cost = DEFAULT_CHARGE_DRAIN * 5
diff --git a/code/modules/mod/modules/modules_medical.dm b/code/modules/mod/modules/modules_medical.dm
index c651ab1153c..6663ed58790 100644
--- a/code/modules/mod/modules/modules_medical.dm
+++ b/code/modules/mod/modules/modules_medical.dm
@@ -57,9 +57,7 @@
icon = 'icons/obj/defib.dmi'
icon_state = "defibgauntlets0" //Inhands handled by the module overlays
flags = NODROP
- force = 0
w_class = WEIGHT_CLASS_BULKY
- toolspeed = 1
var/defib_cooldown = 5 SECONDS
var/safety = TRUE
/// Whether or not the paddles are on cooldown. Used for tracking icon states.
@@ -103,7 +101,6 @@
straight to a victims heart to disable them, or maybe even outright stop their heart with enough power."
complexity = 1
use_power_cost = DEFAULT_CHARGE_DRAIN * 400 // 2000 charge. Since you like causing heart attacks, don't you?
- module_type = MODULE_ACTIVE
overlay_state_inactive = "module_defibrillator_combat"
overlay_state_active = "module_defibrillator_combat_active"
device = /obj/item/mod_defib/syndicate
diff --git a/code/modules/mod/modules/modules_security.dm b/code/modules/mod/modules/modules_security.dm
index fe07e0cadf4..25cb67c0df2 100644
--- a/code/modules/mod/modules/modules_security.dm
+++ b/code/modules/mod/modules/modules_security.dm
@@ -133,7 +133,6 @@
/obj/effect/temp_visual/sonar_ping
duration = 3 SECONDS
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
- anchored = TRUE
randomdir = FALSE
/// The image shown to modsuit users
var/image/modsuit_image
@@ -255,9 +254,7 @@
/obj/item/grenade/cryogrenade_mod
name = "cryogenic grenade"
desc = "A very cold grenade."
- icon = 'icons/obj/grenade.dmi'
icon_state = "gluon"
- item_state = "grenade"
var/freeze_range = 4
var/stamina_damage = 60
var/body_adjustment = -230
diff --git a/code/modules/mod/modules/modules_supply.dm b/code/modules/mod/modules/modules_supply.dm
index 696a74f8757..08451683dbe 100644
--- a/code/modules/mod/modules/modules_supply.dm
+++ b/code/modules/mod/modules/modules_supply.dm
@@ -503,7 +503,6 @@
range = 6
flag = "bomb"
light_range = 1
- light_power = 1
light_color = LIGHT_COLOR_ORANGE
ammo_type = /obj/structure/mining_bomb
@@ -520,7 +519,6 @@
anchored = TRUE
resistance_flags = FIRE_PROOF|LAVA_PROOF
light_range = 1
- light_power = 1
light_color = LIGHT_COLOR_ORANGE
/// Time to prime the explosion
var/prime_time = 0.5 SECONDS
diff --git a/code/modules/newscaster/obj/newscaster.dm b/code/modules/newscaster/obj/newscaster.dm
index a77afdd9e6e..c1321fcc4d2 100644
--- a/code/modules/newscaster/obj/newscaster.dm
+++ b/code/modules/newscaster/obj/newscaster.dm
@@ -25,9 +25,7 @@ GLOBAL_LIST_EMPTY(allNewscasters)
icon = 'icons/obj/terminals.dmi'
icon_state = "newscaster_off"
armor = list(MELEE = 50, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 30)
- max_integrity = 200
integrity_failure = 50
- light_range = 0
anchored = TRUE
/// The current screen index in the UI.
var/screen = NEWSCASTER_HEADLINES
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index a6b64a4c73b..d9f282d4ec5 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/weapons/energy_melee.dmi'
icon_state = "energy_katana"
item_state = "energy_katana"
- force = 40
throwforce = 20
armour_penetration_percentage = 50
armour_penetration_flat = 10
diff --git a/code/modules/ninja/suit/ninja_gloves.dm b/code/modules/ninja/suit/ninja_gloves.dm
index 7f1059f062e..b553db732da 100644
--- a/code/modules/ninja/suit/ninja_gloves.dm
+++ b/code/modules/ninja/suit/ninja_gloves.dm
@@ -11,4 +11,3 @@
min_cold_protection_temperature = GLOVES_MIN_TEMP_PROTECT
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
- transfer_prints = FALSE
diff --git a/code/modules/ninja/suit/ninja_suit.dm b/code/modules/ninja/suit/ninja_suit.dm
index b9cd1dbdff3..7c0293a31cf 100644
--- a/code/modules/ninja/suit/ninja_suit.dm
+++ b/code/modules/ninja/suit/ninja_suit.dm
@@ -16,7 +16,6 @@ Contents:
slowdown = 0
flags_inv = HIDEJUMPSUIT|HIDETAIL
armor = list(MELEE = 75, BULLET = 50, LASER = 20, ENERGY = 10, BOMB = 20, RAD = 15, FIRE = INFINITY, ACID = INFINITY)
- dyeable = FALSE
var/suitActive = 0
var/suitBusy = 0
diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm
index 9a78635dc52..297d0b802f3 100644
--- a/code/modules/paperwork/carbonpaper.dm
+++ b/code/modules/paperwork/carbonpaper.dm
@@ -1,7 +1,5 @@
/obj/item/paper/carbon
- name = "paper"
icon_state = "paper_stack"
- item_state = "paper"
var/copied = 0
var/iscopy = 0
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index de9b34236f5..8644ba7348b 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -8,7 +8,6 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
/obj/machinery/photocopier/faxmachine
name = "fax machine"
desc = "Because just talking to your coworkers is too efficient."
- icon = 'icons/obj/library.dmi'
icon_state = "fax"
insert_anim = "faxsend"
var/receive_anim = "faxsend"
@@ -21,8 +20,6 @@ GLOBAL_LIST_EMPTY(fax_blacklist)
var/long_range_enabled = FALSE
req_one_access = list(ACCESS_INTERNAL_AFFAIRS, ACCESS_HEADS, ACCESS_ARMORY)
- idle_power_consumption = 30
- active_power_consumption = 200
/// ID card inserted into the machine, used to log in with
var/obj/item/card/id/scan = null
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 53a259291d7..19da475a24f 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -9,7 +9,6 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paper"
item_state = "paper"
- throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_range = 1
throw_speed = 1
@@ -563,7 +562,6 @@
/obj/item/paper/photograph
name = "photo"
icon_state = "photo"
- item_state = "paper"
/obj/item/paper/sop
name = "paper- 'Standard Operating Procedure'"
@@ -606,7 +604,6 @@
/obj/item/paper/crumpled/bloody/hacker
name = "burned paper scrap"
- icon_state = "scrap_bloodied"
info = "FINALLY, I DECIPHERED NTS' FAXING NETWO-
"
/obj/item/paper/fortune
@@ -700,7 +697,6 @@
info = "Objective #1: Destroy the station with a nuclear device."
/obj/item/paper/syndicate
- name = "paper"
header = "
"
info = ""
@@ -781,7 +777,6 @@
* CAUTION: Nanotrasen exploration teams growing in size and are scouring much larger areas than before. They are now operating dangerously close to this installation, requesting additional security."}
/obj/item/paper/nanotrasen
- name = "paper"
header = "
"
info = ""
@@ -840,7 +835,6 @@
7. DRAG the nuclear device to the closest opening to SPACE, and PUSH it away from the station."
/obj/item/paper/central_command
- name = "paper"
header ="
Nanotrasen Central Command
Official Expedited Memorandum
"
info = ""
footer = "
Failure to adhere appropriately to orders that may be contained herein is in violation of Space Law, and punishments may be administered appropriately upon return to Central Command.
The recipient(s) of this memorandum acknowledge by reading it that they are liable for any and all damages to crew or station that may arise from ignoring suggestions or advice given herein.
"
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index 4a28fcd2c55..48100127cd4 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -3,7 +3,6 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paper"
item_state = "paper"
- throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_range = 2
throw_speed = 1
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index ff33bdb7266..826d273091f 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -5,9 +5,7 @@
icon_state = "paper_bin1"
item_state = "sheet-metal"
throwforce = 1
- w_class = WEIGHT_CLASS_NORMAL
throw_speed = 3
- throw_range = 7
pressure_resistance = 8
var/amount = 30 //How much paper is in the bin.
var/list/papers = list() //List of papers put in the bin for reference.
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index a22fd573a05..ebb213164e0 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -4,9 +4,7 @@
desc = "Paper, folded in the shape of a plane."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paperplane"
- throw_range = 7
throw_speed = 1
- throwforce = 0
w_class = WEIGHT_CLASS_TINY
resistance_flags = FLAMMABLE
max_integrity = 50
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index a02cdf3c4eb..083c282e05a 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -16,10 +16,8 @@
icon_state = "pen"
item_state = "pen"
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BOTH_EARS
- throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_speed = 3
- throw_range = 7
materials = list(MAT_METAL=10)
var/colour = "black" //what colour the ink is!
pressure_resistance = 2
@@ -47,7 +45,6 @@
/obj/item/pen/invisible
desc = "It's an invisible pen marker."
- icon_state = "pen"
colour = "white"
/obj/item/pen/multi
@@ -180,7 +177,6 @@
desc = "A fancy metal pen. An inscription on one side reads, \"L.L. - L.R.\""
icon_state = "fancypen"
container_type = (DRAINABLE | TRANSPARENT) //cannot be refilled, but pax can be extracted for use in other items with syringe
- origin_tech = "engineering=4;syndicate=2"
transfer_amount = 25 // 4 Dosages instead of 2
/obj/item/pen/sleepy/love/Initialize(mapload)
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 038fcd899ea..af3431a4dae 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -11,7 +11,6 @@
*******/
/obj/item/camera_film
name = "film cartridge"
- icon = 'icons/obj/items.dmi'
desc = "A camera film cartridge. Insert it into a camera to reload it."
icon_state = "film"
item_state = "electropack"
@@ -24,7 +23,6 @@
********/
/obj/item/photo
name = "photo"
- icon = 'icons/obj/items.dmi'
icon_state = "photo"
item_state = "paper"
w_class = WEIGHT_CLASS_TINY
@@ -168,7 +166,6 @@
*********/
/obj/item/camera
name = "camera"
- icon = 'icons/obj/items.dmi'
desc = "A polaroid camera."
icon_state = "camera"
item_state = "camera"
@@ -529,7 +526,6 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor
desc = "A digital camera."
digital = TRUE
var/list/datum/picture/saved_pictures = list()
- pictures_left = 30
var/max_storage = 10
/obj/item/camera/digital/examine(mob/user)
@@ -609,10 +605,8 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor
/obj/item/videocam
name = "video camera"
- icon = 'icons/obj/items.dmi'
desc = "This video camera can send live feeds to the entertainment network. You must hold to use it."
icon_state = "videocam"
- w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL = 1000, MAT_GLASS = 500)
var/on = FALSE
var/obj/machinery/camera/camera
diff --git a/code/modules/paperwork/stamps.dm b/code/modules/paperwork/stamps.dm
index fa2503b390f..45bd9186be9 100644
--- a/code/modules/paperwork/stamps.dm
+++ b/code/modules/paperwork/stamps.dm
@@ -4,10 +4,8 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "stamp-ok"
item_state = "stamp"
- throwforce = 0
w_class = WEIGHT_CLASS_TINY
throw_speed = 3
- throw_range = 7
materials = list(MAT_METAL=60)
item_color = "cargo"
pressure_resistance = 2
@@ -29,7 +27,6 @@
/obj/item/stamp/law
name = "Law office's rubber stamp"
icon_state = "stamp-law"
- item_color = "cargo"
dye_color = DYE_LAW
/obj/item/stamp/captain
@@ -70,9 +67,7 @@
/obj/item/stamp/granted
name = "\improper GRANTED rubber stamp"
- icon_state = "stamp-ok"
item_color = "qm"
- dye_color = DYE_GREEN
/obj/item/stamp/denied
name = "\improper DENIED rubber stamp"
diff --git a/code/modules/paperwork/ticketmachine.dm b/code/modules/paperwork/ticketmachine.dm
index 978304aef15..eb83c83299c 100644
--- a/code/modules/paperwork/ticketmachine.dm
+++ b/code/modules/paperwork/ticketmachine.dm
@@ -6,10 +6,8 @@
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "ticketmachine"
desc = "A marvel of bureaucratic engineering encased in an efficient plastic shell. It can be refilled with a hand labeler refill roll and linked to buttons with a multitool."
- density = FALSE
anchored = TRUE
maptext_height = 26
- maptext_width = 32
maptext_x = 7
maptext_y = 10
layer = HIGH_OBJ_LAYER
@@ -68,8 +66,6 @@
/obj/machinery/door_control/ticket_machine_button
name = "increment ticket counter"
desc = "Use this button after you've served someone to tell the next person to come forward."
- icon = 'icons/obj/stationobjs.dmi'
- icon_state = "doorctrl0"
req_access = list()
id = 1
var/cooldown = FALSE
diff --git a/code/modules/pda/app.dm b/code/modules/pda/app.dm
index 9e5a26f0ff5..4dba65d325b 100644
--- a/code/modules/pda/app.dm
+++ b/code/modules/pda/app.dm
@@ -78,7 +78,6 @@
/datum/data/pda/utility
name = "Utility"
icon = "gear"
- size = 1
category = "Utilities"
/datum/data/pda/utility/scanmode
diff --git a/code/modules/pda/cart.dm b/code/modules/pda/cart.dm
index 37a42e717d1..c181d901043 100644
--- a/code/modules/pda/cart.dm
+++ b/code/modules/pda/cart.dm
@@ -286,7 +286,6 @@
/obj/item/cartridge/syndicate
name = "Detomatix Cartridge"
desc = "Allows you to remotely detonate other people's PDAs through the messenger program."
- icon_state = "cart"
charges = 4
messenger_plugins = list(new/datum/data/pda/messenger_plugin/virus/detonate)
@@ -308,7 +307,6 @@
/obj/item/cartridge/frame
name = "F.R.A.M.E. cartridge"
desc = "Allows you to upload a virus onto a PDA with it's messenger on."
- icon_state = "cart"
charges = 5
var/telecrystals = 0
messenger_plugins = list(
diff --git a/code/modules/pda/pdas.dm b/code/modules/pda/pdas.dm
index 7bb4aea2527..2e36483bea8 100644
--- a/code/modules/pda/pdas.dm
+++ b/code/modules/pda/pdas.dm
@@ -103,7 +103,6 @@
/obj/item/pda/heads/blueshield
default_cartridge = /obj/item/cartridge/hos
- icon_state = "pda-h"
default_pen = /obj/item/pen/fancy
/obj/item/pda/heads/ert
diff --git a/code/modules/power/apc/apc.dm b/code/modules/power/apc/apc.dm
index e825830a176..8423a0849d7 100644
--- a/code/modules/power/apc/apc.dm
+++ b/code/modules/power/apc/apc.dm
@@ -11,7 +11,6 @@
name = "area power controller"
desc = "A control terminal for the area electrical systems."
icon_state = "apc0"
- max_integrity = 200
integrity_failure = 50
resistance_flags = FIRE_PROOF
req_access = list(ACCESS_ENGINE_EQUIP)
@@ -1152,4 +1151,3 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/power/apc/worn_out, 24, 24)
item_state = "electronic"
flags = CONDUCT
usesound = 'sound/items/deconstruct.ogg'
- toolspeed = 1
diff --git a/code/modules/power/cables/cable.dm b/code/modules/power/cables/cable.dm
index f29723edfc7..49326864667 100644
--- a/code/modules/power/cables/cable.dm
+++ b/code/modules/power/cables/cable.dm
@@ -31,7 +31,6 @@ By design, d1 is the smallest direction and d2 is the highest
//The following vars are set here for the benefit of mapping - they are reset when the cable is spawned
alpha = 128 //is set to 255 when spawned
- plane = GAME_PLANE //is set to FLOOR_PLANE when spawned
layer = LOW_OBJ_LAYER //isset to WIRE_LAYER when spawned
/// The direction of endpoint one of this cable
diff --git a/code/modules/power/cables/cable_coil.dm b/code/modules/power/cables/cable_coil.dm
index 9a69064edbb..a6928540fb4 100644
--- a/code/modules/power/cables/cable_coil.dm
+++ b/code/modules/power/cables/cable_coil.dm
@@ -18,14 +18,12 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain
merge_type = /obj/item/stack/cable_coil // This is here to let its children merge between themselves
color = COLOR_RED
w_class = WEIGHT_CLASS_SMALL
- throw_speed = 2
throw_range = 5
materials = list(MAT_METAL = 15, MAT_GLASS = 10)
flags = CONDUCT
slot_flags = ITEM_SLOT_BELT
attack_verb = list("whipped", "lashed", "disciplined", "flogged")
usesound = 'sound/items/deconstruct.ogg'
- toolspeed = 1
/obj/item/stack/cable_coil/Initialize(mapload, length, paramcolor)
. = ..()
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 9bf1eb67433..89c0613752f 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -7,9 +7,7 @@
origin_tech = "powerstorage=1"
force = 5
throwforce = 5
- throw_speed = 2
throw_range = 5
- w_class = WEIGHT_CLASS_SMALL
/// Battery's current state of charge (kilojoules)
var/charge = 0
/// Battery's maximum state of charge (kilojoules)
@@ -340,7 +338,6 @@
charge = 100
maxcharge = 300
materials = list()
- rating = 1
grown_battery = TRUE //it has the overlays for wires
/obj/item/stock_parts/cell/high/slime
diff --git a/code/modules/power/engines/singularity/containment_field.dm b/code/modules/power/engines/singularity/containment_field.dm
index 6fdb50dfb3a..e217250c835 100644
--- a/code/modules/power/engines/singularity/containment_field.dm
+++ b/code/modules/power/engines/singularity/containment_field.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/singularity.dmi'
icon_state = "Contain_F"
anchored = TRUE
- density = FALSE
move_resist = INFINITY
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
flags_2 = RAD_NO_CONTAMINATE_2
diff --git a/code/modules/power/engines/singularity/emitter.dm b/code/modules/power/engines/singularity/emitter.dm
index 5f74677ae06..13ffc61892a 100644
--- a/code/modules/power/engines/singularity/emitter.dm
+++ b/code/modules/power/engines/singularity/emitter.dm
@@ -11,7 +11,6 @@
density = TRUE
req_access = list(ACCESS_ENGINE_EQUIP)
- power_state = NO_POWER_USE
idle_power_consumption = 10
active_power_consumption = 300
diff --git a/code/modules/power/engines/singularity/field_generator.dm b/code/modules/power/engines/singularity/field_generator.dm
index 89fd52bf6ef..871c3dc1642 100644
--- a/code/modules/power/engines/singularity/field_generator.dm
+++ b/code/modules/power/engines/singularity/field_generator.dm
@@ -25,7 +25,6 @@ GLOBAL_LIST_EMPTY(field_generator_fields)
desc = "A large thermal battery that projects a high amount of energy when powered."
icon = 'icons/obj/machines/field_generator.dmi'
icon_state = "Field_Gen"
- anchored = FALSE
density = TRUE
power_state = NO_POWER_USE
max_integrity = 500
diff --git a/code/modules/power/engines/singularity/narsie.dm b/code/modules/power/engines/singularity/narsie.dm
index 842e5303c46..27d035ae8ac 100644
--- a/code/modules/power/engines/singularity/narsie.dm
+++ b/code/modules/power/engines/singularity/narsie.dm
@@ -8,7 +8,6 @@
pixel_y = -85
current_size = 9 //It moves/eats like a max-size singulo, aside from range. --NEO
dissipate = FALSE
- move_self = TRUE
grav_pull = 5
consume_range = 6
gender = FEMALE
@@ -24,7 +23,6 @@
pixel_x = -236
pixel_y = -256
current_size = 12
- move_self = TRUE //Do we move on our own?
grav_pull = 10
consume_range = 12 //How many tiles out do we eat
diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle.dm b/code/modules/power/engines/singularity/particle_accelerator/particle.dm
index e5f03d383c9..5d2bfbd107e 100644
--- a/code/modules/power/engines/singularity/particle_accelerator/particle.dm
+++ b/code/modules/power/engines/singularity/particle_accelerator/particle.dm
@@ -3,8 +3,6 @@
desc = "Small things moving very fast."
icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "particle"
- anchored = TRUE
- density = FALSE
var/movement_range = 11
var/energy = 10
diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm
index 701d11c7b3e..c3f182a9d47 100644
--- a/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/engines/singularity/particle_accelerator/particle_accelerator.dm
@@ -64,7 +64,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
desc = "Part of a Particle Accelerator."
icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = null
- anchored = FALSE
density = TRUE
max_integrity = 500
armor = list(MELEE = 30, BULLET = 20, LASER = 20, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 90, ACID = 80)
@@ -222,7 +221,6 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
name = "Particle Accelerator"
desc = "Part of a Particle Accelerator."
icon = 'icons/obj/machines/particle_accelerator.dmi'
- anchored = FALSE
density = TRUE
power_state = NO_POWER_USE
diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle_chamber.dm b/code/modules/power/engines/singularity/particle_accelerator/particle_chamber.dm
index 78410e02d96..8766439d4dd 100644
--- a/code/modules/power/engines/singularity/particle_accelerator/particle_chamber.dm
+++ b/code/modules/power/engines/singularity/particle_accelerator/particle_chamber.dm
@@ -1,6 +1,5 @@
/obj/structure/particle_accelerator/fuel_chamber
name = "EM Acceleration Chamber"
desc_holder = "This part is where the Alpha particles are accelerated to radical speeds."
- icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "fuel_chamber"
reference = "fuel_chamber"
diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm b/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm
index a46687fe885..a8101dd8ec4 100644
--- a/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm
@@ -10,15 +10,9 @@
/obj/machinery/particle_accelerator/control_box
name = "Particle Accelerator Control Console"
desc = "This part controls the density of the particles."
- icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "control_box"
reference = "control_box"
- anchored = FALSE
- density = TRUE
- power_state = NO_POWER_USE
idle_power_consumption = 500
- active_power_consumption = 10000
- construction_state = 0
active = FALSE
dir = 1
var/strength_upper_limit = 2
diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle_emitter.dm b/code/modules/power/engines/singularity/particle_accelerator/particle_emitter.dm
index 6f8e8e5210a..caf99f77b0d 100644
--- a/code/modules/power/engines/singularity/particle_accelerator/particle_emitter.dm
+++ b/code/modules/power/engines/singularity/particle_accelerator/particle_emitter.dm
@@ -1,7 +1,6 @@
/obj/structure/particle_accelerator/particle_emitter
name = "EM Containment Grid"
desc_holder = "This part launches the Alpha particles. You might not want to stand near this end."
- icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = null
var/fire_delay = 50
var/last_shot = 0
diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle_power.dm b/code/modules/power/engines/singularity/particle_accelerator/particle_power.dm
index 527c745436e..a3257cc2eaf 100644
--- a/code/modules/power/engines/singularity/particle_accelerator/particle_power.dm
+++ b/code/modules/power/engines/singularity/particle_accelerator/particle_power.dm
@@ -1,6 +1,5 @@
/obj/structure/particle_accelerator/power_box
name = "Particle Focusing EM Lens"
desc_holder = "This part uses electromagnetic waves to focus the Alpha particles."
- icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "power_box"
reference = "power_box"
diff --git a/code/modules/power/engines/singularity/singulogen.dm b/code/modules/power/engines/singularity/singulogen.dm
index f8269d34d31..4dcb7da4f96 100644
--- a/code/modules/power/engines/singularity/singulogen.dm
+++ b/code/modules/power/engines/singularity/singulogen.dm
@@ -4,7 +4,6 @@
desc = "An odd device which produces a Gravitational Singularity when set up."
icon = 'icons/obj/singularity.dmi'
icon_state = "TheSingGen"
- anchored = FALSE
density = TRUE
power_state = NO_POWER_USE
resistance_flags = FIRE_PROOF
diff --git a/code/modules/power/engines/supermatter/supermatter.dm b/code/modules/power/engines/supermatter/supermatter.dm
index 27011dbf30c..3b3b6d90ecf 100644
--- a/code/modules/power/engines/supermatter/supermatter.dm
+++ b/code/modules/power/engines/supermatter/supermatter.dm
@@ -97,7 +97,6 @@
icon = 'icons/obj/supermatter.dmi'
icon_state = "darkmatter"
density = TRUE
- anchored = TRUE
layer = ABOVE_MOB_LAYER + 0.01
appearance_flags = PIXEL_SCALE|LONG_GLIDE
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2 | IMMUNE_TO_SHUTTLECRUSH_2 | NO_MALF_EFFECT_2 | CRITICAL_ATOM_2
@@ -1001,8 +1000,6 @@
l_color = "#ddd6cf")
/obj/effect/warp_effect/supermatter
- plane = GRAVITY_PULSE_PLANE
- appearance_flags = PIXEL_SCALE|LONG_GLIDE // no tile bound so you can see it around corners and so
icon = 'icons/effects/light_352.dmi'
icon_state = "light"
pixel_x = -176
diff --git a/code/modules/power/engines/tesla/energy_ball.dm b/code/modules/power/engines/tesla/energy_ball.dm
index 6a7a7f3b4dd..4519935ddb9 100644
--- a/code/modules/power/engines/tesla/energy_ball.dm
+++ b/code/modules/power/engines/tesla/energy_ball.dm
@@ -19,13 +19,10 @@
pixel_x = -32
pixel_y = -32
current_size = STAGE_TWO
- move_self = TRUE
grav_pull = 0
- density = TRUE
energy = 0
dissipate = FALSE
dissipate_delay = 5
- dissipate_strength = 1
warps_projectiles = FALSE
var/list/orbiting_balls = list()
var/miniball = FALSE
diff --git a/code/modules/power/engines/tesla/teslagen.dm b/code/modules/power/engines/tesla/teslagen.dm
index 260f4128bcf..f2acf0038b4 100644
--- a/code/modules/power/engines/tesla/teslagen.dm
+++ b/code/modules/power/engines/tesla/teslagen.dm
@@ -2,7 +2,6 @@
name = "energy ball generator"
desc = "Makes the wardenclyffe look like a child's plaything when shot with a particle accelerator."
icon = 'icons/obj/tesla_engine/tesla_generator.dmi'
- icon_state = "TheSingGen"
creation_type = /obj/singularity/energy_ball
/obj/machinery/the_singularitygen/tesla/zap_act(power, zap_flags)
diff --git a/code/modules/power/generators/portable generators/port_gen.dm b/code/modules/power/generators/portable generators/port_gen.dm
index aa2afd20152..db9ff636250 100644
--- a/code/modules/power/generators/portable generators/port_gen.dm
+++ b/code/modules/power/generators/portable generators/port_gen.dm
@@ -4,7 +4,6 @@
/obj/machinery/power/port_gen
name = "Placeholder Generator" //seriously, don't use this. It can't be anchored without VV magic.
desc = "A portable generator for emergency backup power."
- icon = 'icons/obj/power.dmi'
icon_state = "portgen0_0"
density = TRUE
anchored = FALSE
diff --git a/code/modules/power/generators/solar.dm b/code/modules/power/generators/solar.dm
index 3f68c097ab9..c0aed001a97 100644
--- a/code/modules/power/generators/solar.dm
+++ b/code/modules/power/generators/solar.dm
@@ -184,7 +184,6 @@
icon_state = "sp_base"
item_state = "electropack"
w_class = WEIGHT_CLASS_BULKY // Pretty big!
- anchored = FALSE
var/tracker = 0
var/glass_type = null
@@ -273,11 +272,9 @@
desc = "A controller for solar panel arrays."
icon = 'icons/obj/computer.dmi'
icon_state = "computer"
- anchored = TRUE
density = TRUE
power_state = IDLE_POWER_USE
idle_power_consumption = 250
- max_integrity = 200
integrity_failure = 100
var/icon_screen = "solar"
var/icon_keyboard = "power_key"
diff --git a/code/modules/power/generators/thermo_electric_generator.dm b/code/modules/power/generators/thermo_electric_generator.dm
index eb1f3cf806d..204993237b3 100644
--- a/code/modules/power/generators/thermo_electric_generator.dm
+++ b/code/modules/power/generators/thermo_electric_generator.dm
@@ -4,7 +4,6 @@
icon_state = "teg"
anchored = FALSE
density = TRUE
- power_state = NO_POWER_USE
var/obj/machinery/atmospherics/binary/circulator/cold_circ
var/obj/machinery/atmospherics/binary/circulator/hot_circ
diff --git a/code/modules/power/generators/treadmill.dm b/code/modules/power/generators/treadmill.dm
index b94b0fd0920..2851bfaed67 100644
--- a/code/modules/power/generators/treadmill.dm
+++ b/code/modules/power/generators/treadmill.dm
@@ -133,9 +133,7 @@
icon_state = "frame"
desc = "Monitors treadmill use."
anchored = TRUE
- density = FALSE
maptext_height = 26
- maptext_width = 32
maptext_y = -1
var/on = FALSE // if we should be metering or not
diff --git a/code/modules/power/generators/turbine.dm b/code/modules/power/generators/turbine.dm
index e8fe9d8a363..fe292686cdc 100644
--- a/code/modules/power/generators/turbine.dm
+++ b/code/modules/power/generators/turbine.dm
@@ -74,7 +74,6 @@
desc = "The compressor stage of a gas turbine generator. A data panel for linking with a to a computer can be accessed with a screwdriver."
icon = 'icons/obj/pipes.dmi'
icon_state = "compressor"
- anchored = TRUE
density = TRUE
resistance_flags = FIRE_PROOF
var/obj/machinery/power/turbine/turbine
@@ -121,7 +120,6 @@
desc = "A gas turbine used for backup power generation."
icon = 'icons/obj/pipes.dmi'
icon_state = "turbine"
- anchored = TRUE
density = TRUE
resistance_flags = FIRE_PROOF
var/opened = FALSE
diff --git a/code/modules/power/lights.dm b/code/modules/power/lights.dm
index ac003e321a0..36ce66726e6 100644
--- a/code/modules/power/lights.dm
+++ b/code/modules/power/lights.dm
@@ -26,7 +26,6 @@
icon_state = "tube-construct-stage1"
anchored = TRUE
layer = FLY_LAYER
- max_integrity = 200
armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 80, ACID = 50)
/// Construction stage
var/stage = LIGHT_CONSTRUCT_EMPTY_FRAME
@@ -174,8 +173,6 @@
name = "small light fixture frame"
desc = "A small light fixture under construction."
icon_state = "bulb-construct-stage1"
- anchored = TRUE
- layer = FLY_LAYER
fixture_type = "bulb"
sheets_refunded = 1
construct_type = /obj/machinery/light/small/built
@@ -184,7 +181,6 @@
name = "floor light fixture frame"
desc = "A floor light fixture under construction."
icon_state = "floor-construct-stage1"
- anchored = TRUE
layer = ABOVE_OPEN_TURF_LAYER
plane = FLOOR_PLANE
fixture_type = "floor"
@@ -194,11 +190,7 @@
/obj/machinery/light_construct/clockwork/small
name = "small brass light fixture frame"
desc = "A small brass light fixture under construction."
- icon = 'icons/obj/lighting.dmi'
icon_state = "clockwork_bulb-construct-stage1"
- anchored = TRUE
- layer = 5
- stage = 1
fixture_type = "clockwork_bulb"
sheets_refunded = 1
construct_type = /obj/machinery/light/clockwork/small/built
@@ -207,7 +199,6 @@
name = "brass floor light fixture frame"
desc = "A brass floor light fixture under construction."
icon_state = "clockwork_floor-construct-stage1"
- anchored = TRUE
layer = ABOVE_OPEN_TURF_LAYER
plane = FLOOR_PLANE
fixture_type = "clockwork_floor"
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index b615b49f932..ef982097928 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -457,7 +457,6 @@
charge = 0.08e6 // Engineering starts with some charge for singulo
/obj/machinery/power/smes/empty
- charge = 0
/obj/machinery/power/smes/magical
name = "magical power storage unit"
diff --git a/code/modules/procedural_mapping/mapGenerators/syndicate_mapgen.dm b/code/modules/procedural_mapping/mapGenerators/syndicate_mapgen.dm
index f1cf72d2d96..0c6dfaef3b9 100644
--- a/code/modules/procedural_mapping/mapGenerators/syndicate_mapgen.dm
+++ b/code/modules/procedural_mapping/mapGenerators/syndicate_mapgen.dm
@@ -9,7 +9,6 @@
/datum/map_generator_module/syndie_furniture
- clusterCheckFlags = MAP_GENERATOR_CLUSTER_CHECK_SAME_ATOMS
spawnableTurfs = list()
spawnableAtoms = list(/obj/structure/table = 20,/obj/structure/chair = 15,/obj/structure/chair/stool = 10, \
/obj/structure/computerframe = 15, /obj/item/storage/toolbox/syndicate = 15 ,\
diff --git a/code/modules/projectiles/ammunition/ammo_boxes.dm b/code/modules/projectiles/ammunition/ammo_boxes.dm
index 336e25b5c18..8e1247e73d2 100644
--- a/code/modules/projectiles/ammunition/ammo_boxes.dm
+++ b/code/modules/projectiles/ammunition/ammo_boxes.dm
@@ -3,7 +3,6 @@
desc = "A small device designed to quickly reload revolvers. Seven round capacity."
materials = list()
ammo_type = /obj/item/ammo_casing/a357
- max_ammo = 7
multi_sprite_step = 1 // see: /obj/item/ammo_box/update_icon()
icon_state = "357"
@@ -12,7 +11,6 @@
desc = "An ammunition box filled with .357 magnum rounds, commonly used in high-caliber revolvers."
w_class = WEIGHT_CLASS_NORMAL
ammo_type = /obj/item/ammo_casing/a357
- max_ammo = 7
multi_sprite_step = 1
icon_state = "357_box"
@@ -27,7 +25,6 @@
/obj/item/ammo_box/c10mm
name = "ammo box (10mm)"
desc = "An ammunition box filled with 10mm pistol cartridges, commonly used in Syndicate handguns."
- icon_state = "10mmbox"
origin_tech = "combat=2"
ammo_type = /obj/item/ammo_casing/c10mm
max_ammo = 20
@@ -114,7 +111,6 @@
icon_state = "slugloader"
origin_tech = "combat=2"
ammo_type = /obj/item/ammo_casing/shotgun
- max_ammo = 7
materials = list(MAT_METAL=28000)
multi_sprite_step = 1
@@ -129,7 +125,6 @@
desc = "A specialized speedloader for swiftly reloading shotguns. This one is meant for Confetti shot."
icon_state = "partyloader"
ammo_type = /obj/item/ammo_casing/shotgun/confetti
- multi_sprite_step = 1
/obj/item/ammo_box/shotgun/dragonsbreath
name = "shotgun speedloader (Dragonsbreath)"
@@ -184,10 +179,8 @@
/obj/item/ammo_box/foambox/sniper
name = "ammo box (Foam Sniper Darts)"
desc = "An ammunition box full of sniper darts for toy weapons."
- icon = 'icons/obj/guns/toy.dmi'
icon_state = "foambox_sniper"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/sniper
- max_ammo = 40
materials = list(MAT_METAL = 900)
/obj/item/ammo_box/foambox/sniper/riot
@@ -201,5 +194,4 @@
desc = "A revolver speedloader for a cap gun. Cannot chamber live ammunition."
icon_state = "357"
ammo_type = /obj/item/ammo_casing/cap
- max_ammo = 7
multi_sprite_step = 1
diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index 07c6378ed2a..351feb84db2 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -77,7 +77,6 @@
desc = "A 9mm pistol cartridge, commonly used in handguns and submachine guns."
caliber = "9mm"
projectile_type = /obj/item/projectile/bullet/weakbullet3
- muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_WEAK
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
/obj/item/ammo_casing/c9mm/ap
@@ -101,7 +100,6 @@
desc = "A 4.6x30mm PDW cartridge, commonly used in submachine guns and small-caliber rifles."
caliber = "4.6x30mm"
projectile_type = /obj/item/projectile/bullet/weakbullet3
- muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_WEAK
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
/obj/item/ammo_casing/c46x30mm/ap
@@ -239,7 +237,6 @@
projectile_type = /obj/item/projectile/bullet/incendiary/shell/dragonsbreath
pellets = 4
variance = 35
- muzzle_flash_color = LIGHT_COLOR_FIRE
/obj/item/ammo_casing/shotgun/ion
name = "ion shell"
@@ -490,7 +487,6 @@
/obj/item/ammo_casing/caseless/foam_dart/sniper/riot
name = "riot foam sniper dart"
desc = "For the bigger brother of the crowd control toy. Ages 18 and up."
- caliber = "foam_force_sniper"
projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/sniper/riot
icon_state = "foamdartsniper_riot"
@@ -518,7 +514,6 @@
caliber = "laser"
projectile_type = /obj/item/projectile/beam/laser/ik //Subtype that breaks on firing if emp'd
muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash/energy
- muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_WEAK
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
muzzle_flash_color = LIGHT_COLOR_DARKRED
icon_state = "lasercasing"
@@ -528,6 +523,4 @@
desc = "You shouldn't see this! Make an issue report on Github!"
caliber = "c_foam"
projectile_type = /obj/item/projectile/c_foam
- muzzle_flash_strength = MUZZLE_FLASH_RANGE_WEAK
- muzzle_flash_range = MUZZLE_FLASH_RANGE_WEAK
muzzle_flash_color = LIGHT_COLOR_DARKRED
diff --git a/code/modules/projectiles/ammunition/energy_lens.dm b/code/modules/projectiles/ammunition/energy_lens.dm
index 5d6dbf81a75..6f93734f386 100644
--- a/code/modules/projectiles/ammunition/energy_lens.dm
+++ b/code/modules/projectiles/ammunition/energy_lens.dm
@@ -48,7 +48,6 @@
projectile_type = /obj/item/projectile/beam/scatter/eshotgun
pellets = 6
variance = 25
- select_name = "kill"
delay = 1 SECONDS
/obj/item/ammo_casing/energy/laser/eshotgun/cyborg
@@ -91,7 +90,6 @@
/obj/item/ammo_casing/energy/xray
projectile_type = /obj/item/projectile/beam/xray
muzzle_flash_color = LIGHT_COLOR_GREEN
- e_cost = 100
fire_sound = 'sound/weapons/laser3.ogg'
/obj/item/ammo_casing/energy/immolator
@@ -101,7 +99,6 @@
/obj/item/ammo_casing/energy/immolator/strong
projectile_type = /obj/item/projectile/beam/immolator/strong
- e_cost = 125
select_name = "precise"
/obj/item/ammo_casing/energy/immolator/strong/cyborg
@@ -110,7 +107,6 @@
/obj/item/ammo_casing/energy/immolator/scatter
projectile_type = /obj/item/projectile/beam/immolator/weak
- e_cost = 125
pellets = 6
variance = 25
select_name = "scatter"
@@ -204,11 +200,7 @@
/obj/item/ammo_casing/energy/disabler/eshotgun
projectile_type = /obj/item/projectile/beam/disabler/pellet
- muzzle_flash_color = LIGHT_COLOR_LIGHTBLUE
- select_name = "disable"
e_cost = 75
- fire_sound = 'sound/weapons/taser2.ogg'
- harmful = FALSE
delay = 1 SECONDS
pellets = 6
variance = 25
@@ -237,7 +229,6 @@
projectile_type = /obj/item/projectile/beam/wormhole
muzzle_flash_color = "#33CCFF"
delay = 10
- e_cost = 100
fire_sound = 'sound/weapons/pulse3.ogg'
var/obj/item/gun/energy/wormhole_projector/gun = null
select_name = "blue"
@@ -327,7 +318,6 @@
projectile_type = /obj/item/projectile/beam/emitter
muzzle_flash_color = LIGHT_COLOR_GREEN
fire_sound = 'sound/weapons/emitter.ogg'
- e_cost = 100
delay = 2 SECONDS // Lasers fire twice every second for 40 dps, this fires every 2 seconds for 15 dps. Seems fair, since every cyborg will have this with more shots?
select_name = "emitter"
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index 130435df5eb..28a658968f7 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -14,7 +14,6 @@
name = "revolver cylinder"
ammo_type = /obj/item/ammo_casing/a357
caliber = "357"
- max_ammo = 7
/obj/item/ammo_box/magazine/internal/cylinder/ammo_count(countempties = 1)
@@ -71,18 +70,14 @@
name = "nagant revolver cylinder"
ammo_type = /obj/item/ammo_casing/n762
caliber = "n762"
- max_ammo = 7
/obj/item/ammo_box/magazine/internal/cylinder/cap
name = "cap gun revolver cylinder"
- desc = "Oh god, this shouldn't be here!"
ammo_type = /obj/item/ammo_casing/cap
caliber = "cap"
- max_ammo = 7
/obj/item/ammo_box/magazine/internal/overgrown
name = "overgrown pistol magazine"
- desc = "Oh god, this shouldn't be here!"
ammo_type = /obj/item/ammo_casing/overgrown
max_ammo = 8
@@ -107,14 +102,12 @@
/obj/item/ammo_box/magazine/internal/shot/tube
name = "dual feed shotgun internal tube"
ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
- max_ammo = 4
/obj/item/ammo_box/magazine/internal/shot/lethal
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
/obj/item/ammo_box/magazine/internal/shot/com
name = "combat shotgun internal magazine"
- ammo_type = /obj/item/ammo_casing/shotgun/beanbag
max_ammo = 6
/obj/item/ammo_box/magazine/internal/shot/malf
@@ -153,7 +146,6 @@
max_ammo = 6
/obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher/multi/fifteen
- ammo_type = /obj/item/ammo_casing/a40mm
max_ammo = 15
/obj/item/ammo_box/magazine/internal/speargun
@@ -176,11 +168,9 @@
/obj/item/ammo_box/magazine/internal/boltaction
name = "bolt action rifle internal magazine"
- desc = "Oh god, this shouldn't be here!"
ammo_type = /obj/item/ammo_casing/a762
caliber = "a762"
max_ammo = 5
- multiload = 1
/obj/item/ammo_box/magazine/internal/boltaction/enchanted
max_ammo =1
@@ -189,7 +179,6 @@
/obj/item/ammo_box/magazine/internal/shot/toy
ammo_type = /obj/item/ammo_casing/caseless/foam_dart
caliber = "foam_force"
- max_ammo = 4
/obj/item/ammo_box/magazine/internal/shot/toy/crossbow
max_ammo = 5
@@ -237,7 +226,6 @@
/obj/item/ammo_box/magazine/enforcer
name = "handgun magazine (9mm rubber)"
- icon_state = "enforcer"
ammo_type = /obj/item/ammo_casing/rubber9mm
max_ammo = 8
multi_sprite_step = 1
@@ -320,9 +308,6 @@
ammo_type = /obj/item/ammo_casing/c46x30mm/inc
/obj/item/ammo_box/magazine/wt550m9/empty
- name = "wt550 magazine (4.6x30mm)"
- icon_state = "46x30mmt"
- ammo_type = /obj/item/ammo_casing/c46x30mm
/obj/item/ammo_box/magazine/wt550m9/empty/Initialize(mapload)
. = ..()
@@ -373,25 +358,16 @@
name = "stechkin aps magazine (10mm incendiary)"
icon_state = "10mmapsI"
ammo_type = /obj/item/ammo_casing/c10mm/fire
- caliber = "10mm"
- max_ammo = 20
- multi_sprite_step = 5
/obj/item/ammo_box/magazine/apsm10mm/hp
name = "stechkin aps magazine (10mm HP)"
icon_state = "10mmapsH"
ammo_type = /obj/item/ammo_casing/c10mm/hp
- caliber = "10mm"
- max_ammo = 20
- multi_sprite_step = 5
/obj/item/ammo_box/magazine/apsm10mm/ap
name = "stechkin aps magazine (10mm AP)"
icon_state = "10mmapsA"
ammo_type = /obj/item/ammo_casing/c10mm/ap
- caliber = "10mm"
- max_ammo = 20
- multi_sprite_step = 5
/obj/item/ammo_box/magazine/smgm45
name = "\improper SMG magazine (.45)"
@@ -415,7 +391,6 @@
origin_tech = "combat=2"
ammo_type = /obj/item/ammo_casing/a50
caliber = ".50"
- max_ammo = 7
multi_sprite_step = 1
/obj/item/ammo_box/magazine/m75
@@ -501,7 +476,6 @@
desc = "An extra large drum magazine."
icon_state = "m12gXlSl"
w_class = WEIGHT_CLASS_NORMAL
- ammo_type = /obj/item/ammo_casing/shotgun
max_ammo = 16
/obj/item/ammo_box/magazine/m12g/xtr_lrg/buckshot
@@ -544,7 +518,6 @@
/obj/item/ammo_box/magazine/toy/enforcer
name = "\improper Enforcer foam magazine"
- icon_state = "enforcer"
max_ammo = 8
multi_sprite_step = 1
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
@@ -573,7 +546,6 @@
multi_sprite_step = 10
/obj/item/ammo_box/magazine/toy/m762/riot
- ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
/obj/item/ammo_box/magazine/laser
name = "laser carbine projector magazine"
@@ -604,7 +576,6 @@
multi_sprite_step = 2
/obj/item/ammo_box/magazine/toy/smgm45/riot
- ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
// yes this doesn't really belong here but nowhere else works
/obj/item/ammo_box/magazine/detective/speedcharger
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index a293c6af720..d959b2da722 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -7,7 +7,6 @@
flags = CONDUCT
slot_flags = ITEM_SLOT_BELT
materials = list(MAT_METAL=2000)
- w_class = WEIGHT_CLASS_NORMAL
throwforce = 5
throw_speed = 3
throw_range = 5
diff --git a/code/modules/projectiles/gun_attachments.dm b/code/modules/projectiles/gun_attachments.dm
index a24355285f4..f88f615d7f0 100644
--- a/code/modules/projectiles/gun_attachments.dm
+++ b/code/modules/projectiles/gun_attachments.dm
@@ -15,5 +15,3 @@
/obj/item/suppressor/specialoffer
name = "cheap suppressor"
desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits all weapons."
- icon = 'icons/obj/guns/projectile.dmi'
- icon_state = "suppressor"
diff --git a/code/modules/projectiles/guns/energy/energy.dm b/code/modules/projectiles/guns/energy/energy.dm
index 3ef14b8ccd6..ba1acdd94e8 100644
--- a/code/modules/projectiles/guns/energy/energy.dm
+++ b/code/modules/projectiles/guns/energy/energy.dm
@@ -14,7 +14,6 @@
/obj/item/gun/energy/gun
name = "\improper EG-7 energy gun"
desc = "A hybrid fire energy gun manufactured by Shellguard Munitions Co. It has a mounting point for a flashlight. The fire selector has two settings: 'disable', and 'kill'."
- icon_state = "energy"
item_state = null //so the human update icon uses the icon_state instead.
ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
origin_tech = "combat=4;magnets=3"
@@ -58,7 +57,6 @@
desc = "A pistol-sized energy gun with a built-in flashlight. The power cell is smaller too. Issued for self-defence purposes. The fire selector has two settings: 'disable', and 'kill'."
icon_state = "mini"
w_class = WEIGHT_CLASS_SMALL
- ammo_x_offset = 2
charge_sections = 3
inhand_charge_sections = 3
can_flashlight = FALSE // Can't attach or detach the flashlight, and override it's icon update
@@ -134,9 +132,7 @@
force = 7
ammo_type = list(/obj/item/ammo_casing/energy/disabler/hos, /obj/item/ammo_casing/energy/laser/hos)
ammo_x_offset = 1
- shaded_charge = TRUE
can_holster = TRUE
- execution_speed = 5 SECONDS
/obj/item/gun/energy/gun/blueshield/examine_more(mob/user)
..()
@@ -180,7 +176,6 @@
weapon_weight = WEAPON_HEAVY
can_flashlight = FALSE
trigger_guard = TRIGGER_GUARD_NONE
- ammo_x_offset = 2
shaded_charge = FALSE
execution_speed = 8 SECONDS
@@ -268,7 +263,6 @@
/obj/item/gun/energy/gun/shotgun/cyborg
name = "Energy Scatterbeam"
desc = "An energy emitter that fires spread-fire laser shells."
- icon_state = "eshotgun"
ammo_type = list(/obj/item/ammo_casing/energy/laser/eshotgun/cyborg)
/obj/item/gun/energy/gun/shotgun/newshot()
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 877c313e133..c7a29fd114b 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -7,7 +7,6 @@
cell_type = /obj/item/stock_parts/cell/emproof
needs_permit = FALSE
origin_tech = "combat=3;powerstorage=3;engineering=3"
- weapon_weight = WEAPON_LIGHT
can_flashlight = TRUE
can_be_lensed = FALSE
flight_x_offset = 15
@@ -204,7 +203,6 @@
name = "kinetic force"
icon_state = null
damage = 40
- damage_type = BRUTE
flag = BOMB
range = 3
@@ -385,7 +383,6 @@
/obj/item/borg/upgrade/modkit/range
name = "range increase"
desc = "Increases the range of a kinetic accelerator when installed."
- modifier = 1
cost = 24 //so you can fit four plus a tracer cosmetic
/obj/item/borg/upgrade/modkit/range/modify_projectile(obj/item/projectile/kinetic/K)
@@ -531,7 +528,6 @@
name = "resonator blast"
desc = "Causes kinetic accelerator shots to leave and detonate resonator blasts."
denied_type = /obj/item/borg/upgrade/modkit/resonator_blasts
- cost = 30
modifier = 0.25 //A bonus 15 damage if you burst the field on a target, 60 if you lure them into it.
/obj/item/borg/upgrade/modkit/resonator_blasts/projectile_strike(obj/item/projectile/kinetic/K, turf/target_turf, atom/target, obj/item/gun/energy/kinetic_accelerator/KA)
@@ -548,7 +544,6 @@
desc = "Killing or assisting in killing a creature permanently increases your damage against that type of creature."
denied_type = /obj/item/borg/upgrade/modkit/bounty
modifier = 1.25
- cost = 30
var/maximum_bounty = 25
var/list/bounties_reaped = list()
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 5fe61f9270e..833391963e6 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -18,7 +18,6 @@
desc = "A compact and lightweight laser carbine manufactured by Shellguard Munitions Co. Considered the most widely used laserarm in the Orion sector, it only fires lethal rounds and requires a recharger to reload."
icon_state = "laser"
item_state = "laser"
- w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=2000)
origin_tech = "combat=4;magnets=2"
ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
@@ -165,9 +164,7 @@
item_state = null
w_class = WEIGHT_CLASS_BULKY
force = 10
- flags = CONDUCT
slot_flags = ITEM_SLOT_BACK
- can_holster = FALSE
origin_tech = "combat=4;magnets=4;powerstorage=3"
ammo_type = list(/obj/item/ammo_casing/energy/laser/accelerator)
ammo_x_offset = 3
@@ -217,9 +214,7 @@
item_state = null
w_class = WEIGHT_CLASS_BULKY
force = 12
- flags = CONDUCT
slot_flags = ITEM_SLOT_BACK
- can_holster = FALSE
weapon_weight = WEAPON_HEAVY
origin_tech = "combat=6;magnets=6;powerstorage=4"
ammo_type = list(/obj/item/ammo_casing/energy/laser/sniper, /obj/item/ammo_casing/energy/laser/sniper/pierce)
@@ -392,7 +387,6 @@
item_state = "laser"
w_class = WEIGHT_CLASS_BULKY
shaded_charge = TRUE
- can_holster = FALSE
origin_tech = "combat=4;magnets=4;powerstorage=3"
ammo_type = list(/obj/item/ammo_casing/energy/emitter)
ammo_x_offset = 3
diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm
index bf5c510f9cd..130dc2650ad 100644
--- a/code/modules/projectiles/guns/energy/pulse.dm
+++ b/code/modules/projectiles/guns/energy/pulse.dm
@@ -16,10 +16,8 @@
icon_state = "pulse"
item_state = null
w_class = WEIGHT_CLASS_BULKY
- can_holster = FALSE
force = 10
modifystate = TRUE
- flags = CONDUCT
slot_flags = ITEM_SLOT_BACK
ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
cell_type = /obj/item/stock_parts/cell/pulse
@@ -137,7 +135,6 @@
desc = "A compact pulse core in a classic handgun frame for Nanotrasen officers. It's not the size of the gun that matters, it's the size of the hole it puts through people."
icon_state = "m1911"
item_state = "gun"
- can_holster = TRUE
cell_type = /obj/item/stock_parts/cell/infinite
/obj/item/gun/energy/pulse/pistol/m1911/examine(mob/user)
@@ -170,9 +167,7 @@
w_class = WEIGHT_CLASS_HUGE
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser/pulse)
weapon_weight = WEAPON_MEDIUM
- can_flashlight = FALSE
trigger_guard = TRIGGER_GUARD_NONE
- ammo_x_offset = 2
/obj/item/gun/energy/pulse/turret/examine(mob/user)
. = ..()
diff --git a/code/modules/projectiles/guns/energy/special_eguns.dm b/code/modules/projectiles/guns/energy/special_eguns.dm
index fe414fd252b..2824a8aa6b5 100644
--- a/code/modules/projectiles/guns/energy/special_eguns.dm
+++ b/code/modules/projectiles/guns/energy/special_eguns.dm
@@ -31,8 +31,6 @@
fire_sound = 'sound/weapons/ionrifle.ogg'
origin_tech = "combat=4;magnets=4"
w_class = WEIGHT_CLASS_HUGE
- can_holster = FALSE
- flags = CONDUCT
slot_flags = ITEM_SLOT_BACK
shaded_charge = TRUE
ammo_type = list(/obj/item/ammo_casing/energy/ion)
@@ -128,7 +126,6 @@
name = "floral somatoray"
desc = "A tool that discharges controlled radiation which induces mutation in plant cells."
icon_state = "flora"
- item_state = "gun"
fire_sound = 'sound/effects/stealthoff.ogg'
ammo_type = list(/obj/item/ammo_casing/energy/flora/yield, /obj/item/ammo_casing/energy/flora/mut)
origin_tech = "materials=2;biotech=4"
@@ -194,7 +191,6 @@
origin_tech = "combat=4;magnets=4;syndicate=5"
suppressed = TRUE
ammo_type = list(/obj/item/ammo_casing/energy/bolt)
- weapon_weight = WEAPON_LIGHT
unique_rename = FALSE
overheat_time = 20
holds_charge = TRUE
@@ -222,7 +218,6 @@
/obj/item/gun/energy/kinetic_accelerator/crossbow/large/cyborg
desc = "One and done!"
- icon_state = "crossbowlarge"
origin_tech = null
materials = list()
@@ -247,9 +242,7 @@
ammo_type = list(/obj/item/ammo_casing/energy/plasma)
fire_sound = 'sound/weapons/laser.ogg'
usesound = 'sound/items/welder.ogg'
- toolspeed = 1
container_type = OPENCONTAINER
- flags = CONDUCT
attack_verb = list("attacked", "slashed", "cut", "sliced")
force = 12
sharp = TRUE
@@ -475,7 +468,6 @@
icon_state = "toxgun"
item_state = "toxgun"
sprite_sheets_inhand = list("Vox" = 'icons/mob/clothing/species/vox/held.dmi', "Drask" = 'icons/mob/clothing/species/drask/held.dmi') //This apperently exists, and I have the sprites so sure.
- w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=4;magnets=4;powerstorage=3"
ammo_type = list(/obj/item/ammo_casing/energy/weak_plasma, /obj/item/ammo_casing/energy/charged_plasma)
shaded_charge = TRUE
@@ -632,7 +624,6 @@
ammo_type = list(/obj/item/ammo_casing/energy/bsg)
weapon_weight = WEAPON_HEAVY
w_class = WEIGHT_CLASS_BULKY
- can_holster = FALSE
slot_flags = ITEM_SLOT_BACK
cell_type = /obj/item/stock_parts/cell/bsg
shaded_charge = TRUE
@@ -1082,9 +1073,7 @@
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "spikethrower"
item_state = "toxgun"
- w_class = WEIGHT_CLASS_NORMAL
fire_sound_text = "a strange noise"
- can_suppress = 0
selfcharge = TRUE
charge_delay = 10
restricted_species = list(/datum/species/vox)
@@ -1098,7 +1087,6 @@
desc = "A broadhead spike made out of a weird silvery metal."
projectile_type = /obj/item/projectile/bullet/spike
muzzle_flash_effect = null
- e_cost = 100
select_name = "spike"
fire_sound = 'sound/weapons/bladeslice.ogg'
@@ -1137,7 +1125,6 @@
muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash/vortex_blast
variance = 70
pellets = 8
- e_cost = 100
delay = 1.2 SECONDS //and delay has to be stored here on energy guns
select_name = "vortex blast"
fire_sound = 'sound/weapons/wave.ogg'
@@ -1227,8 +1214,6 @@
item_state = "lever_action"
fire_sound = 'sound/weapons/gunshots/gunshot_lascarbine.ogg'
origin_tech = "combat=5;magnets=4"
- w_class = WEIGHT_CLASS_NORMAL
- flags = CONDUCT
slot_flags = ITEM_SLOT_BACK
can_charge = FALSE
ammo_type = list(/obj/item/ammo_casing/energy/lasergun/lever_action)
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index 3387a122912..4ae319fd1bd 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -39,7 +39,6 @@
icon_state = "advtaser"
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler)
origin_tech = "combat=4"
- ammo_x_offset = 2
flight_x_offset = 15
shaded_charge = FALSE
can_holster = TRUE
@@ -73,7 +72,6 @@
item_state = null
origin_tech = "combat=3"
ammo_type = list(/obj/item/ammo_casing/energy/disabler)
- ammo_x_offset = 2
can_flashlight = TRUE
flight_x_offset = 15
flight_y_offset = 10
@@ -133,7 +131,6 @@
ammo_type = list(/obj/item/ammo_casing/energy/disabler/smg)
shaded_charge = TRUE
can_holster = FALSE
- fire_delay = 0
/obj/item/gun/energy/disabler/smg/examine_more(mob/user)
..()
@@ -192,11 +189,8 @@
desc = "A high-tech revolver that fires internal, 3D printed shock cartridges in a revolving cylinder. \
The cartridges can be recharged using conventional rechargers. These shots charge whatever they hit, causing arcs of electricity to form between them."
icon_state = "stunrevolver"
- item_state = "gun"
origin_tech = "combat=4;materials=4;powerstorage=4"
ammo_type = list(/obj/item/ammo_casing/energy/arc_revolver)
- can_flashlight = FALSE
- shaded_charge = FALSE
can_holster = TRUE
/obj/item/gun/energy/arc_revolver/examine_more(mob/user)
diff --git a/code/modules/projectiles/guns/grenade_launcher.dm b/code/modules/projectiles/guns/grenade_launcher.dm
index 1dfaf4d6327..4543c92d44f 100644
--- a/code/modules/projectiles/guns/grenade_launcher.dm
+++ b/code/modules/projectiles/guns/grenade_launcher.dm
@@ -1,13 +1,11 @@
/obj/item/gun/grenadelauncher
name = "grenade launcher"
desc = "a terrible, terrible thing. it's really awful!"
- icon = 'icons/obj/guns/projectile.dmi'
icon_state = "riotgun"
item_state = "riotgun"
w_class = WEIGHT_CLASS_BULKY
throw_speed = 2
throw_range = 10
- force = 5
var/list/grenades = list()
var/max_grenades = 3
diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm
index 795e3176086..a692aaa35d9 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -6,7 +6,6 @@
item_state = "staff"
fire_sound = 'sound/weapons/emitter.ogg'
fire_sound_text = "energy blast"
- flags = CONDUCT
w_class = WEIGHT_CLASS_HUGE
var/max_charges = 6
var/charges = 0
@@ -19,7 +18,6 @@
origin_tech = null
clumsy_check = FALSE
trigger_guard = TRIGGER_GUARD_ALLOW_ALL // Has no trigger at all, uses magic instead
- can_holster = FALSE // Nothing here is a gun, and therefore shouldn't really fit into a holster
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' //not really a gun and some toys use these inhands
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm
index 08950eab8d8..bcaebb3fd1b 100644
--- a/code/modules/projectiles/guns/medbeam.dm
+++ b/code/modules/projectiles/guns/medbeam.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/chronos.dmi'
icon_state = "chronogun"
item_state = "chronogun"
- w_class = WEIGHT_CLASS_NORMAL
var/mob/living/current_target
var/last_check = 0
@@ -145,7 +144,6 @@
/obj/item/gun/medbeam/damaged
name = "damaged beamgun"
- desc = "Delivers volatile medical nanites in a focused beam. Don't cross the beams!"
///How hot the beamgun is, if it hits max heat it will break
var/current_heat = 0
///How much heat the beamgun needs to break
diff --git a/code/modules/projectiles/guns/misc/blastcannon.dm b/code/modules/projectiles/guns/misc/blastcannon.dm
index 5dcf9c661ea..b3c4375d6fd 100644
--- a/code/modules/projectiles/guns/misc/blastcannon.dm
+++ b/code/modules/projectiles/guns/misc/blastcannon.dm
@@ -4,7 +4,6 @@
icon_state = "empty_blastcannon"
var/icon_state_loaded = "loaded_blastcannon"
item_state = "blastcannon_empty"
- w_class = WEIGHT_CLASS_NORMAL
force = 10
fire_sound = 'sound/weapons/blastcannon.ogg'
needs_permit = FALSE
@@ -99,7 +98,6 @@
name = "blast wave"
icon_state = "blastwave"
damage = 0
- nodamage = FALSE
forcedodge = -1
range = 150
var/heavyr = 0
diff --git a/code/modules/projectiles/guns/mounted.dm b/code/modules/projectiles/guns/mounted.dm
index 8c7b9103549..6dbb7f3b5a8 100644
--- a/code/modules/projectiles/guns/mounted.dm
+++ b/code/modules/projectiles/guns/mounted.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/items_cyborg.dmi'
icon_state = "taser"
item_state = "armcannonstun4"
- force = 5
selfcharge = TRUE
can_flashlight = FALSE
trigger_guard = TRIGGER_GUARD_ALLOW_ALL // Has no trigger at all, uses neural signals instead
@@ -13,8 +12,6 @@
name = "mounted laser"
desc = "An arm mounted cannon that fires lethal lasers."
icon = 'icons/obj/items_cyborg.dmi'
- icon_state = "laser"
item_state = "armcannonlase"
- force = 5
selfcharge = TRUE
trigger_guard = TRIGGER_GUARD_ALLOW_ALL
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 4685fdded2d..1129c89fb22 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -13,7 +13,6 @@
*/
/obj/item/gun/projectile/automatic
- w_class = WEIGHT_CLASS_NORMAL
var/alarmed = 0
var/select = 1
can_tactical = TRUE
@@ -109,7 +108,6 @@
origin_tech = "combat=5;materials=2;syndicate=6"
mag_type = /obj/item/ammo_box/magazine/smgm45
fire_sound = 'sound/weapons/gunshots/gunshot_smg.ogg'
- fire_delay = 2
burst_size = 2
can_bayonet = TRUE
knife_x_offset = 26
@@ -139,7 +137,6 @@
fire_sound = 'sound/weapons/gunshots/gunshot_rifle.ogg'
magin_sound = 'sound/weapons/gun_interactions/batrifle_magin.ogg'
magout_sound = 'sound/weapons/gun_interactions/batrifle_magout.ogg'
- fire_delay = 2
can_suppress = FALSE
burst_size = 1
actions_types = list()
@@ -179,8 +176,6 @@
magout_sound = 'sound/weapons/gun_interactions/batrifle_magout.ogg'
can_suppress = FALSE
var/obj/item/gun/projectile/revolver/grenadelauncher/underbarrel
- burst_size = 3
- fire_delay = 2
/obj/item/gun/projectile/automatic/m90/Initialize(mapload)
. = ..()
@@ -276,7 +271,6 @@
magin_sound = 'sound/weapons/gun_interactions/batrifle_magin.ogg'
magout_sound = 'sound/weapons/gun_interactions/batrifle_magout.ogg'
can_suppress = FALSE
- burst_size = 3
fire_delay = 1
//////////////////////////////
@@ -307,7 +301,6 @@
desc = "A compact semi-automatic shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
icon_state = "bulldog"
item_state = "bulldog"
- w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=6;materials=4;syndicate=6"
mag_type = /obj/item/ammo_box/magazine/m12g
fire_sound = 'sound/weapons/gunshots/gunshot_shotgun.ogg'
@@ -362,7 +355,6 @@
desc = "A compact Warp-Tac Industries fully automatic laser carbine that uses disposable laser cartridges rather than an internal power cell. Utilized by Nanotrasen's response teams for combat operations."
icon_state = "lasercarbine"
item_state = "lasercarbine"
- w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=4;materials=2"
mag_type = /obj/item/ammo_box/magazine/laser
fire_sound = 'sound/weapons/gunshots/gunshot_lascarbine.ogg'
diff --git a/code/modules/projectiles/guns/projectile/bow.dm b/code/modules/projectiles/guns/projectile/bow.dm
index b65b06a202f..66d120f0366 100644
--- a/code/modules/projectiles/guns/projectile/bow.dm
+++ b/code/modules/projectiles/guns/projectile/bow.dm
@@ -71,7 +71,6 @@
ammo_type = /obj/item/ammo_casing/caseless/arrow
range = 10
damage = 25
- damage_type = BRUTE
/obj/item/ammo_casing/caseless/arrow
name = "arrow"
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index 30bcc48fbe8..f16578d32e6 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -2,15 +2,12 @@
/obj/item/gun/projectile/automatic/pistol
name = "stechkin pistol"
desc = "A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors."
- icon_state = "pistol"
w_class = WEIGHT_CLASS_SMALL
origin_tech = "combat=3;materials=2;syndicate=3"
can_holster = TRUE
- mag_type = /obj/item/ammo_box/magazine/m10mm
fire_sound = 'sound/weapons/gunshots/gunshot_pistol.ogg'
magin_sound = 'sound/weapons/gun_interactions/pistol_magin.ogg'
magout_sound = 'sound/weapons/gun_interactions/pistol_magout.ogg'
- can_suppress = TRUE
burst_size = 1
fire_delay = 0
execution_speed = 4 SECONDS
@@ -35,7 +32,6 @@
icon_state = "enforcer_grey"
force = 10
mag_type = /obj/item/ammo_box/magazine/enforcer
- can_suppress = TRUE
unique_reskin = TRUE
can_flashlight = TRUE
@@ -100,7 +96,6 @@
desc = "A deadly automatic pistol produced by the USSP's State Armory. Uses 10mm ammo."
icon_state = "aps"
w_class = WEIGHT_CLASS_NORMAL
- origin_tech = "combat=3;materials=2;syndicate=3"
mag_type = /obj/item/ammo_box/magazine/apsm10mm
can_suppress = FALSE
burst_size = 3
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index ff3ef65d932..c04384e9603 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -191,8 +191,6 @@
desc = "A bulky revolver that seems to be made out of a plant."
icon_state = "pea_shooter"
item_state = "peashooter"
- lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
w_class = WEIGHT_CLASS_BULKY
origin_tech = "combat=3;biotech=5"
mag_type = /obj/item/ammo_box/magazine/internal/overgrown
@@ -227,7 +225,6 @@
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_HEAVY
force = 10
- flags = CONDUCT
slot_flags = ITEM_SLOT_BACK
mag_type = /obj/item/ammo_box/magazine/internal/shot/dual
fire_sound = 'sound/weapons/gunshots/gunshot_shotgun.ogg'
@@ -317,15 +314,8 @@
desc = "Essentially a tube that aims shotgun shells."
icon_state = "ishotgun"
item_state = "ishotgun"
- lefthand_file = 'icons/mob/inhands/64x64_guns_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/64x64_guns_righthand.dmi'
- inhand_x_dimension = 64
- inhand_y_dimension = 64
- w_class = WEIGHT_CLASS_BULKY
- force = 10
slot_flags = null
mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised
- fire_sound = 'sound/weapons/gunshots/gunshot_shotgun.ogg'
sawn_desc = "I'm just here for the gasoline."
unique_reskin = FALSE
var/sling = FALSE
@@ -369,7 +359,6 @@
item_state = "stick"
sawn_state = SAWN_OFF
w_class = WEIGHT_CLASS_SMALL
- force = 10
can_unsuppress = FALSE
slot_flags = null
origin_tech = "" // NO GIVAWAYS
diff --git a/code/modules/projectiles/guns/projectile/saw.dm b/code/modules/projectiles/guns/projectile/saw.dm
index 27caa125d26..a5d76432f3a 100644
--- a/code/modules/projectiles/guns/projectile/saw.dm
+++ b/code/modules/projectiles/guns/projectile/saw.dm
@@ -148,7 +148,6 @@
/obj/item/ammo_casing/mm762x51/bleeding
name = "7.62x51mm 'Shredder' round"
desc = "A 7.62x51mm 'Shredder' cartridge, with a heavily serrated tip intended to cause massive bleeding."
- icon_state = "762-casing"
projectile_type = /obj/item/projectile/bullet/saw/bleeding
/obj/item/ammo_casing/mm762x51/hollow
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 969ac8d4e42..859fbbc92fe 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -9,8 +9,6 @@
inhand_y_dimension = 64
w_class = WEIGHT_CLASS_BULKY
force = 10
- flags = CONDUCT
- can_holster = FALSE
slot_flags = ITEM_SLOT_BACK
origin_tech = "combat=4;materials=2"
mag_type = /obj/item/ammo_box/magazine/internal/shot
@@ -89,7 +87,6 @@
item_state = "riotshotgun"
mag_type = /obj/item/ammo_box/magazine/internal/shot/riot
sawn_desc = "Come with me if you want to live."
- sawn_state = SAWN_INTACT
/obj/item/gun/projectile/shotgun/riot/attackby__legacy__attackchain(obj/item/A, mob/user, params)
if(istype(A, /obj/item/circular_saw) || istype(A, /obj/item/gun/energy/plasmacutter))
@@ -316,7 +313,6 @@
item_state = "shotgun_combat"
origin_tech = "combat=6"
mag_type = /obj/item/ammo_box/magazine/internal/shot/com
- w_class = WEIGHT_CLASS_BULKY
execution_speed = 5 SECONDS
/// Service Malfunction Borg Combat Shotgun Variant
@@ -340,7 +336,6 @@
lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
item_state = "bulldog"
- origin_tech = "combat=4;materials=2"
mag_type = /obj/item/ammo_box/magazine/internal/shot/tube
w_class = WEIGHT_CLASS_HUGE
var/toggled = 0
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index e3faa00a0c7..b826a07ec51 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -12,9 +12,6 @@
fire_delay = 40
burst_size = 1
origin_tech = "combat=7"
- can_unsuppress = TRUE
- can_suppress = TRUE
- w_class = WEIGHT_CLASS_NORMAL
slot_flags = ITEM_SLOT_BACK
actions_types = list()
execution_speed = 4 SECONDS
diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm
index fda9c8b4587..c85627692f4 100644
--- a/code/modules/projectiles/guns/projectile/toy.dm
+++ b/code/modules/projectiles/guns/projectile/toy.dm
@@ -9,7 +9,6 @@
suppressed_sound = 'sound/weapons/gunshots/gunshot_smg.ogg'
force = 0
throwforce = 0
- burst_size = 3
clumsy_check = FALSE
needs_permit = FALSE
@@ -111,7 +110,6 @@
name = "donksoft LMG"
desc = "A heavily modified toy light machine gun, designated 'L6 SAW'. Ages 8 and up."
icon = 'icons/obj/guns/toy.dmi'
- can_suppress = FALSE
needs_permit = FALSE
mag_type = /obj/item/ammo_box/magazine/toy/m762
origin_tech = "combat=5;engineering=3;syndicate=3"
@@ -125,9 +123,7 @@
/obj/item/gun/projectile/shotgun/toy/tommygun
name = "tommy gun"
desc = "Looks almost like the real thing! Great for practicing Drive-bys. Ages 8 and up."
- icon = 'icons/obj/guns/toy.dmi'
icon_state = "tommygun"
- item_state = "shotgun"
lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
inhand_x_dimension = 32
diff --git a/code/modules/projectiles/guns/projectile_gun.dm b/code/modules/projectiles/guns/projectile_gun.dm
index 15598f32a2e..c5a408d68ec 100644
--- a/code/modules/projectiles/guns/projectile_gun.dm
+++ b/code/modules/projectiles/guns/projectile_gun.dm
@@ -3,7 +3,6 @@
name = "projectile gun"
icon_state = "pistol"
origin_tech = "combat=2;materials=2"
- w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=1000)
var/mag_type = /obj/item/ammo_box/magazine/m10mm //Removes the need for max_ammo and caliber info
diff --git a/code/modules/projectiles/guns/rocket.dm b/code/modules/projectiles/guns/rocket.dm
index 25af9683562..f4aab3c3ef4 100644
--- a/code/modules/projectiles/guns/rocket.dm
+++ b/code/modules/projectiles/guns/rocket.dm
@@ -8,7 +8,6 @@
throw_speed = 2
throw_range = 3
force = 15
- flags = CONDUCT
origin_tech = "combat=6;syndicate=7"
fire_sound = 'sound/weapons/blastcannon.ogg'
fire_delay = 40
diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm
index 9378ba49626..a7a1df0c7d4 100644
--- a/code/modules/projectiles/guns/syringe_gun.dm
+++ b/code/modules/projectiles/guns/syringe_gun.dm
@@ -3,9 +3,7 @@
desc = "A spring loaded rifle designed to fit syringes, used to incapacitate unruly patients from a distance. Not compatible with DNA-Injectors."
icon_state = "syringegun"
item_state = "syringegun"
- w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=2;biotech=3"
- throw_speed = 3
throw_range = 7
force = 4
materials = list(MAT_METAL=2000)
diff --git a/code/modules/projectiles/guns/throw/crossbow.dm b/code/modules/projectiles/guns/throw/crossbow.dm
index d2e3093fe60..764fcd50f7d 100644
--- a/code/modules/projectiles/guns/throw/crossbow.dm
+++ b/code/modules/projectiles/guns/throw/crossbow.dm
@@ -168,7 +168,6 @@
icon_state = "bolt"
item_state = "bolt"
throwforce = 20
- w_class = WEIGHT_CLASS_NORMAL
sharp = TRUE
/obj/item/arrow/proc/removed() //Helper for metal rods falling apart.
diff --git a/code/modules/projectiles/guns/throw/pielauncher.dm b/code/modules/projectiles/guns/throw/pielauncher.dm
index fcb7c08a4f5..651f7800ec0 100644
--- a/code/modules/projectiles/guns/throw/pielauncher.dm
+++ b/code/modules/projectiles/guns/throw/pielauncher.dm
@@ -5,7 +5,6 @@
w_class = WEIGHT_CLASS_HUGE
throw_speed = 2
throw_range = 3
- force = 5
clumsy_check = FALSE
valid_projectile_type = /obj/item/food/pie
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index b3c6bb5d289..6ab564a1a17 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -42,7 +42,6 @@
impact_type = /obj/effect/projectile/impact/laser
impact_effect_type = null
hitscan_light_intensity = 3
- hitscan_light_range = 0.75
hitscan_light_color_override = LIGHT_COLOR_DARKRED
muzzle_flash_intensity = 6
muzzle_flash_range = 2
@@ -140,7 +139,6 @@
tracer_type = /obj/effect/projectile/tracer/pulse
impact_type = /obj/effect/projectile/impact/pulse
hitscan_light_intensity = 3
- hitscan_light_range = 0.75
hitscan_light_color_override = LIGHT_COLOR_DARKBLUE
muzzle_flash_intensity = 6
muzzle_flash_range = 2
@@ -175,7 +173,6 @@
impact_type = /obj/effect/projectile/impact/laser/emitter
impact_effect_type = null
hitscan_light_intensity = 3
- hitscan_light_range = 0.75
hitscan_light_color_override = LIGHT_COLOR_GREEN
muzzle_flash_intensity = 6
muzzle_flash_range = 2
@@ -194,7 +191,6 @@
nodamage = 1
damage = 0
damage_type = STAMINA
- flag = "laser"
var/suit_types = list(/obj/item/clothing/suit/redtag, /obj/item/clothing/suit/bluetag)
log_override = TRUE
impact_effect_type = /obj/effect/temp_visual/impact_effect/blue_laser
@@ -210,8 +206,6 @@
return 1
/obj/item/projectile/beam/lasertag/omni
- name = "laser tag beam"
- icon_state = "omnilaser"
/obj/item/projectile/beam/lasertag/redtag
icon_state = "laser"
@@ -246,7 +240,6 @@
impact_type = /obj/effect/projectile/impact/laser
impact_effect_type = null
hitscan_light_intensity = 3
- hitscan_light_range = 0.75
hitscan_light_color_override = LIGHT_COLOR_FIRE
muzzle_flash_intensity = 6
muzzle_flash_range = 2
@@ -260,7 +253,6 @@
icon_state = "purple_laser"
damage = 200
armour_penetration_percentage = 100
- damage_type = BURN
impact_effect_type = /obj/effect/temp_visual/impact_effect/purple_laser
light_color = LIGHT_COLOR_PURPLE
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 3c49efc0c1b..8e80757205a 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -1,9 +1,6 @@
/obj/item/projectile/bullet
name = "bullet"
- icon_state = "bullet"
damage = 60
- damage_type = BRUTE
- flag = "bullet"
hitsound_wall = "ricochet"
impact_effect_type = /obj/effect/temp_visual/impact_effect
@@ -102,9 +99,6 @@
/obj/item/projectile/bullet/pellet/rubber/stinger
name = "stingball"
damage = 1
- stamina = 12.5
- icon_state = "bullet-r"
- armour_penetration_flat = -10
/obj/item/projectile/bullet/pellet/assassination
damage = 12
diff --git a/code/modules/projectiles/projectile/energy_projectiles.dm b/code/modules/projectiles/projectile/energy_projectiles.dm
index c619e429076..9b38afb19e2 100644
--- a/code/modules/projectiles/projectile/energy_projectiles.dm
+++ b/code/modules/projectiles/projectile/energy_projectiles.dm
@@ -8,7 +8,6 @@
/obj/item/projectile/energy/electrode
name = "electrode"
- icon_state = "spark"
color = "#FFFF00"
nodamage = 1
weaken = 10 SECONDS
@@ -48,7 +47,6 @@
icon_state = "cbbolt"
damage = 15
damage_type = TOX
- nodamage = FALSE
stamina = 60
eyeblur = 20 SECONDS
knockdown = 2 SECONDS
@@ -64,7 +62,6 @@
icon_state = "bluespace"
impact_effect_type = /obj/effect/temp_visual/bsg_kaboom
damage = BSG_BASE_DAMAGE
- damage_type = BURN
armour_penetration_flat = 50
range = 9
knockdown = 4 SECONDS //This is going to knock you off your feet
@@ -129,7 +126,6 @@
name = "plasma bolt"
icon_state = "plasma_light"
damage = 12.5
- damage_type = BURN
/obj/item/projectile/homing/charged_plasma
name = "charged plasma bolt"
@@ -139,7 +135,6 @@
flag = "energy"
armour_penetration_flat = 10 // It can have a little armor pen, as a treat. Bigger than it looks, energy armor is often low.
shield_buster = TRUE
- reflectability = REFLECTABILITY_PHYSICAL //I will let eswords block it like a normal projectile, but it's not getting reflected, and eshields will take the hit hard. Carp still can reflect though, screw you.
var/reached_target = FALSE
/obj/item/projectile/homing/charged_plasma/pixel_move(trajectory_multiplier)
@@ -164,7 +159,6 @@
name = "arc emitter"
icon_state = "plasma_light"
damage = ARC_REVOLVER_BASE_DAMAGE
- damage_type = BURN
var/charge_number = null
/obj/item/projectile/energy/arc_revolver/on_hit(atom/target)
diff --git a/code/modules/projectiles/projectile/force.dm b/code/modules/projectiles/projectile/force.dm
index 37d567eb0ab..919d65797b8 100644
--- a/code/modules/projectiles/projectile/force.dm
+++ b/code/modules/projectiles/projectile/force.dm
@@ -1,12 +1,10 @@
/obj/item/projectile/forcebolt
name = "force bolt"
- icon = 'icons/obj/projectiles.dmi'
icon_state = "ice_1"
damage = 20
flag = "energy"
/obj/item/projectile/forcebolt/strong
- name = "force bolt"
/obj/item/projectile/forcebolt/on_hit(atom/movable/target, blocked = 0)
. = ..()
diff --git a/code/modules/projectiles/projectile/homing_projectiles.dm b/code/modules/projectiles/projectile/homing_projectiles.dm
index b5bcee7ddc6..fbcf8481825 100644
--- a/code/modules/projectiles/projectile/homing_projectiles.dm
+++ b/code/modules/projectiles/projectile/homing_projectiles.dm
@@ -1,6 +1,5 @@
/obj/item/projectile/homing
name = "smart bullet"
- icon_state = "bullet"
var/homing_active = TRUE
/obj/item/projectile/homing/pixel_move(trajectory_multiplier)
diff --git a/code/modules/projectiles/projectile/magic_projectiles.dm b/code/modules/projectiles/projectile/magic_projectiles.dm
index a52638b9649..67761587981 100644
--- a/code/modules/projectiles/projectile/magic_projectiles.dm
+++ b/code/modules/projectiles/projectile/magic_projectiles.dm
@@ -17,7 +17,6 @@
tracer_type = /obj/effect/projectile/tracer/death
impact_type = /obj/effect/projectile/impact/death
hitscan_light_intensity = 3
- hitscan_light_range = 0.75
hitscan_light_color_override = LIGHT_COLOR_PURPLE
muzzle_flash_intensity = 6
muzzle_flash_range = 2
@@ -145,7 +144,6 @@
/obj/item/projectile/magic/door
name = "bolt of door creation"
- icon_state = "energy"
var/list/door_types = list(/obj/structure/mineral_door/wood,/obj/structure/mineral_door/iron,/obj/structure/mineral_door/silver,\
/obj/structure/mineral_door/gold,/obj/structure/mineral_door/uranium,/obj/structure/mineral_door/sandstone,/obj/structure/mineral_door/transparent/plasma,\
/obj/structure/mineral_door/transparent/diamond)
@@ -416,6 +414,4 @@ GLOBAL_LIST_INIT(wabbajack_docile_animals, list(
damage = 20
damage_type = BURN
nodamage = FALSE
- armour_penetration_flat = 0
- flag = MAGIC
hitsound = 'sound/weapons/barragespellhit.ogg'
diff --git a/code/modules/projectiles/projectile/special_projectiles.dm b/code/modules/projectiles/projectile/special_projectiles.dm
index e546319f663..45e42f80bc4 100644
--- a/code/modules/projectiles/projectile/special_projectiles.dm
+++ b/code/modules/projectiles/projectile/special_projectiles.dm
@@ -24,7 +24,6 @@
icon_state= "bolter"
damage = 50
alwayslog = TRUE
- flag = "bullet"
/obj/item/projectile/bullet/gyro/on_hit(atom/target, blocked = 0)
..()
@@ -36,8 +35,6 @@
desc = "USE A WEEL GUN."
icon_state= "bolter"
alwayslog = TRUE
- damage = 60
- flag = "bullet"
/obj/item/projectile/bullet/a40mm/on_hit(atom/target, blocked = 0)
..()
@@ -107,9 +104,7 @@
icon = 'icons/obj/meteor.dmi'
icon_state = "small"
damage = 0
- damage_type = BRUTE
nodamage = 1
- flag = "bullet"
/obj/item/projectile/meteor/Bump(atom/A)
if(A == firer)
@@ -143,20 +138,16 @@
/obj/item/projectile/energy/floramut
name = "alpha somatoray"
icon_state = "energy"
- damage = 0
damage_type = TOX
nodamage = TRUE
impact_effect_type = /obj/effect/temp_visual/impact_effect/green_laser
- flag = "energy"
/obj/item/projectile/energy/florayield
name = "beta somatoray"
icon_state = "energy2"
- damage = 0
damage_type = TOX
nodamage = TRUE
impact_effect_type = /obj/effect/temp_visual/impact_effect/green_laser
- flag = "energy"
/obj/item/projectile/energy/mindflayer
name = "flayer ray"
@@ -234,7 +225,6 @@
/obj/item/projectile/plasma
name = "plasma blast"
icon_state = "plasmacutter"
- damage_type = BRUTE
damage = 5
range = 3
dismemberment = 20
@@ -245,7 +235,6 @@
impact_type = /obj/effect/projectile/impact/plasma_cutter
impact_effect_type = null
hitscan_light_intensity = 3
- hitscan_light_range = 0.75
hitscan_light_color_override = LIGHT_COLOR_CYAN
muzzle_flash_intensity = 6
muzzle_flash_range = 2
@@ -285,7 +274,6 @@
/obj/item/projectile/energy/teleport
name = "teleportation burst"
icon_state = "bluespace"
- damage = 0
nodamage = 1
alwayslog = TRUE
var/obj/item/beacon/teleport_target
@@ -308,10 +296,7 @@
/obj/item/projectile/energy/demonic_grappler
name = "demonic grappler"
icon_state = "bluespace"
- damage = 0
- damage_type = BURN
nodamage = 1
- flag = "energy"
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
/obj/item/projectile/energy/demonic_grappler/on_hit(atom/target, blocked = 0)
@@ -342,7 +327,6 @@
icon_state = "ornament-1"
hitsound = 'sound/effects/glasshit.ogg'
damage = 7
- damage_type = BRUTE
/obj/item/projectile/ornament/New()
icon_state = pick("ornament-1", "ornament-2")
diff --git a/code/modules/projectiles/projectile_base.dm b/code/modules/projectiles/projectile_base.dm
index 538383ac87e..ab5b752181f 100644
--- a/code/modules/projectiles/projectile_base.dm
+++ b/code/modules/projectiles/projectile_base.dm
@@ -7,11 +7,9 @@
name = "projectile"
icon = 'icons/obj/projectiles.dmi'
icon_state = "bullet"
- density = FALSE
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
anchored = TRUE //There's a reason this is here, Mport. God fucking damn it -Agouri. Find&Fix by Pete. The reason this is here is to stop the curving of emitter shots.
flags = ABSTRACT
- pass_flags = PASSTABLE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
hitsound = 'sound/weapons/pierce.ogg'
var/hitsound_wall = ""
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 1151e4e2464..12f45d2ceeb 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -1,8 +1,6 @@
/obj/machinery/computer/pandemic
name = "PanD.E.M.I.C 2200"
desc = "Used to work with viruses."
- density = TRUE
- anchored = TRUE
icon = 'icons/obj/chemical.dmi'
icon_state = "pandemic0"
circuit = /obj/item/circuitboard/pandemic
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index 01b0834315d..62001cc6503 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -3,7 +3,6 @@
desc = "A chef's 9th most powerful weapon, right after the grill. Used for grinding items into reagents."
icon = 'icons/obj/kitchen.dmi'
icon_state = "juicer1"
- layer = 2.9
anchored = TRUE
idle_power_consumption = 5
active_power_consumption = 100
diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm
index 061e0a82471..d138f3bb548 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol.dm
@@ -84,7 +84,6 @@
id = "gin"
description = "It's gin. In space. I say, good sir."
color = "#664300" // rgb: 102, 67, 0
- dizzy_adj = 6 SECONDS
alcohol_perc = 0.5
drink_icon = "ginvodkaglass"
drink_name = "Glass of gin"
@@ -121,7 +120,6 @@
description = "Either someone's failure at cocktail making or attempt in alcohol production. In any case, do you really want to drink that?"
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 14 SECONDS
- alcohol_perc = 1
drink_icon = "glass_brown2"
drink_name = "Hooch"
drink_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
@@ -240,7 +238,6 @@
description = "An unbelievably strong and potent variety of Cider."
color = "#CF3811"
dizzy_adj = 40 SECONDS
- alcohol_perc = 1 //because that's a thing it's supposed to do, I guess
drink_icon = "suicider"
drink_name = "Suicider"
drink_desc = "You've really hit rock bottom now... your liver packed its bags and left last night."
@@ -262,7 +259,6 @@
name = "Thirteen Loko"
id = "thirteenloko"
description = "A potent mixture of caffeine and alcohol."
- reagent_state = LIQUID
color = "#102000" // rgb: 16, 32, 0
nutriment_factor = 1 * REAGENTS_METABOLISM
alcohol_perc = 0.3
@@ -287,7 +283,6 @@
name = "Bilk"
id = "bilk"
description = "This appears to be beer mixed with milk. Disgusting."
- reagent_state = LIQUID
color = "#895C4C" // rgb: 137, 92, 76
nutriment_factor = 2 * REAGENTS_METABOLISM
alcohol_perc = 0.2
@@ -301,7 +296,6 @@
name = "Atomic Bomb"
id = "atomicbomb"
description = "Nuclear proliferation never tasted so good."
- reagent_state = LIQUID
color = "#666300" // rgb: 102, 99, 0
alcohol_perc = 0.2
drink_icon = "atomicbombglass"
@@ -314,7 +308,6 @@
name = "Three Mile Island Iced Tea"
id = "threemileisland"
description = "Made for a woman, strong enough for a man."
- reagent_state = LIQUID
color = "#666340" // rgb: 102, 99, 64
alcohol_perc = 0.2
drink_icon = "threemileislandglass"
@@ -327,7 +320,6 @@
name = "Goldschlager"
id = "goldschlager"
description = "100 proof cinnamon schnapps, made for alcoholic teen girls on spring break."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
drink_icon = "ginvodkaglass"
@@ -339,7 +331,6 @@
name = "Patron"
id = "patron"
description = "Tequila with silver in it, a favorite of alcoholic women in the club scene."
- reagent_state = LIQUID
color = "#585840" // rgb: 88, 88, 64
alcohol_perc = 0.4
drink_icon = "patronglass"
@@ -351,7 +342,6 @@
name = "Gin and Tonic"
id = "gintonic"
description = "An all time classic, mild cocktail."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
drink_icon = "gintonicglass"
@@ -364,7 +354,6 @@
name = "Cuba Libre"
id = "cubalibre"
description = "Rum, mixed with cola. Viva la revolution."
- reagent_state = LIQUID
color = "#3E1B00" // rgb: 62, 27, 0
alcohol_perc = 0.2
drink_icon = "cubalibreglass"
@@ -377,7 +366,6 @@
name = "Whiskey Cola"
id = "whiskeycola"
description = "Whiskey, mixed with cola. Surprisingly refreshing."
- reagent_state = LIQUID
color = "#3E1B00" // rgb: 62, 27, 0
alcohol_perc = 0.3
drink_icon = "whiskeycolaglass"
@@ -390,7 +378,6 @@
name = "Daiquiri"
id = "daiquiri"
description = "Lime juice and sugar mixed with rum. A sweet and refreshing mix."
- reagent_state = LIQUID
color = "#61d961" // rgb: 38, 85, 38
alcohol_perc = 0.4
drink_icon = "daiquiriglass"
@@ -403,7 +390,6 @@
name = "Classic Martini"
id = "martini"
description = "Vermouth with Gin. Not quite how 007 enjoyed it, but still delicious."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
drink_icon = "martiniglass"
@@ -416,7 +402,6 @@
name = "Vodka Martini"
id = "vodkamartini"
description = "Vodka with Gin. Not quite how 007 enjoyed it, but still delicious."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
drink_icon = "martiniglass"
@@ -429,7 +414,6 @@
name = "White Russian"
id = "whiterussian"
description = "That's just, like, your opinion, man..."
- reagent_state = LIQUID
color = "#A68340" // rgb: 166, 131, 64
alcohol_perc = 0.3
drink_icon = "whiterussianglass"
@@ -442,7 +426,6 @@
name = "Screwdriver"
id = "screwdrivercocktail"
description = "Vodka, mixed with plain ol' orange juice. The result is surprisingly delicious."
- reagent_state = LIQUID
color = "#A68310" // rgb: 166, 131, 16
alcohol_perc = 0.3
drink_icon = "screwdriverglass"
@@ -455,7 +438,6 @@
name = "Booger"
id = "booger"
description = "Eww..."
- reagent_state = LIQUID
color = "#A68310" // rgb: 166, 131, 16
alcohol_perc = 0.2
drink_icon = "booger"
@@ -468,7 +450,6 @@
name = "Bloody Mary"
id = "bloodymary"
description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "bloodymaryglass"
@@ -481,7 +462,6 @@
name = "Pan-Galactic Gargle Blaster"
id = "gargleblaster"
description = "Whoah, this stuff looks volatile!"
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.7 //ouch
drink_icon = "gargleblasterglass"
@@ -494,7 +474,6 @@
name = "Flaming Moe"
id = "flamingmoe"
description = "This appears to be a mixture of various alcohols blended with prescription medicine. It is lightly toasted..."
- reagent_state = LIQUID
color = "#58447f" //rgb: 88, 66, 127
alcohol_perc = 0.5
drink_icon = "flamingmoeglass"
@@ -507,7 +486,6 @@
name = "Brave Bull"
id = "bravebull"
description = "A strange yet pleasurable mixture made of vodka, tomato and lime juice. Or at least you THINK the red stuff is tomato juice."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
drink_icon = "bravebullglass"
@@ -519,7 +497,6 @@
name = "Tequila Sunrise"
id = "tequilasunrise"
description = "Tequila and orange juice. Much like a Screwdriver, only Mexican~"
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
drink_icon = "tequilasunriseglass"
@@ -532,7 +509,6 @@
name = "Toxins Special"
id = "toxinsspecial"
description = "This thing is FLAMING!. CALL THE DAMN SHUTTLE!"
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
drink_icon = "toxinsspecialglass"
@@ -550,7 +526,6 @@
name = "Beepsky Smash"
id = "beepskysmash"
description = "Deny drinking this and prepare for THE LAW."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
drink_icon = "beepskysmashglass"
@@ -563,7 +538,6 @@
name = "Irish Cream"
id = "irishcream"
description = "Whiskey-imbued cream, what else would you expect from the Irish."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
drink_icon = "irishcreamglass"
@@ -575,7 +549,6 @@
name = "The Manly Dorf"
id = "manlydorf"
description = "Beer and Ale, brought together in a delicious mix. Intended for true men only."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "manlydorfglass"
@@ -588,7 +561,6 @@
name = "Long Island Iced Tea"
id = "longislandicedtea"
description = "The liquor cabinet, brought together in a delicious mix. Intended for middle-aged alcoholic women only."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
drink_icon = "longislandicedteaglass"
@@ -601,7 +573,6 @@
name = "Moonshine"
id = "moonshine"
description = "You've really hit rock bottom now... your liver packed its bags and left last night."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.8 //yeeehaw
drink_icon = "glass_clear"
@@ -614,7 +585,6 @@
name = "B-52"
id = "b52"
description = "Coffee, Irish Cream, and congac. You will get bombed."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
drink_icon = "b52glass"
@@ -627,7 +597,6 @@
name = "Irish Coffee"
id = "irishcoffee"
description = "Coffee, and alcohol. More fun than a Mimosa to drink in the morning."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "irishcoffeeglass"
@@ -640,7 +609,6 @@
name = "Margarita"
id = "margarita"
description = "On the rocks with salt on the rim. Arriba~!"
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
drink_icon = "margaritaglass"
@@ -653,7 +621,6 @@
name = "Black Russian"
id = "blackrussian"
description = "For the lactose-intolerant. Still as classy as a White Russian."
- reagent_state = LIQUID
color = "#360000" // rgb: 54, 0, 0
alcohol_perc = 0.4
drink_icon = "blackrussianglass"
@@ -666,7 +633,6 @@
name = "Manhattan"
id = "manhattan"
description = "The Detective's undercover drink of choice. He never could stomach gin..."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
drink_icon = "manhattanglass"
@@ -678,7 +644,6 @@
name = "Manhattan Project"
id = "manhattan_proj"
description = "A scientist's drink of choice, for pondering ways to blow up the station."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
drink_icon = "proj_manhattanglass"
@@ -691,7 +656,6 @@
name = "Whiskey Soda"
id = "whiskeysoda"
description = "Ultimate refreshment."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
drink_icon = "whiskeysodaglass2"
@@ -704,7 +668,6 @@
name = "Anti-freeze"
id = "antifreeze"
description = "Ultimate refreshment."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "antifreeze"
@@ -722,7 +685,6 @@
name = "Admin Freeze"
id = "adminfreeze"
description = "Ultimate Punishment."
- reagent_state = LIQUID
color = "#30F0FF" // rgb: 048, 240, 255
dizzy_adj = 8 SECONDS
alcohol_perc = 1.5 // oof
@@ -742,7 +704,6 @@
name = "Barefoot"
id = "barefoot"
description = "Barefoot and pregnant"
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "b&p"
@@ -755,7 +716,6 @@
name = "Snow White"
id = "snowwhite"
description = "A cold refreshment"
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "snowwhite"
@@ -768,7 +728,6 @@
name = "Demons Blood"
id = "demonsblood"
description = "AHHHH!!!!"
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 20 SECONDS
alcohol_perc = 0.4
@@ -782,7 +741,6 @@
name = "Vodka and Tonic"
id = "vodkatonic"
description = "For when a gin and tonic isn't russian enough."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 8 SECONDS
alcohol_perc = 0.3
@@ -796,7 +754,6 @@
name = "Gin Fizz"
id = "ginfizz"
description = "Refreshingly lemony, deliciously dry."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
dizzy_adj = 8 SECONDS
alcohol_perc = 0.4
@@ -810,7 +767,6 @@
name = "Bahama mama"
id = "bahama_mama"
description = "Tropic cocktail."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "bahama_mama"
@@ -823,7 +779,6 @@
name = "Singulo"
id = "singulo"
description = "The edge of eternity, contained in a glass."
- reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
dizzy_adj = 30 SECONDS
alcohol_perc = 0.7
@@ -837,7 +792,6 @@
name = "Sbiten"
id = "sbiten"
description = "A spicy Vodka! Might be a little hot for the little guys!"
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
drink_icon = "sbitenglass"
@@ -855,7 +809,6 @@
name = "Devils Kiss"
id = "devilskiss"
description = "Creepy time!"
- reagent_state = LIQUID
color = "#A68310" // rgb: 166, 131, 16
alcohol_perc = 0.3
drink_icon = "devilskiss"
@@ -868,7 +821,6 @@
name = "Red Mead"
id = "red_mead"
description = "The true Viking drink! Even though it has a strange red color."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "red_meadglass"
@@ -881,7 +833,6 @@
name = "Mead"
id = "mead"
description = "A Vikings drink, though a cheap one."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
nutriment_factor = 1 * REAGENTS_METABOLISM
alcohol_perc = 0.2
@@ -894,7 +845,6 @@
name = "Iced Beer"
id = "iced_beer"
description = "A beer which is so cold the air around it freezes."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "iced_beerglass"
@@ -911,7 +861,6 @@
name = "Grog"
id = "grog"
description = "Watered down rum, Nanotrasen approves!"
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "grogglass"
@@ -924,7 +873,6 @@
name = "Aloe"
id = "aloe"
description = "So very, very, very good."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.2
drink_icon = "aloe"
@@ -937,7 +885,6 @@
name = "Andalusia"
id = "andalusia"
description = "A nice, strange named drink."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.4
drink_icon = "andalusia"
@@ -950,7 +897,6 @@
name = "Allies Cocktail"
id = "alliescocktail"
description = "A drink made from your allies."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.5
drink_icon = "alliescocktail"
@@ -963,7 +909,6 @@
name = "Acid Spit"
id = "acidspit"
description = "A drink by Nanotrasen. Made from live aliens."
- reagent_state = LIQUID
color = "#365000" // rgb: 54, 80, 0
alcohol_perc = 0.3
drink_icon = "acidspitglass"
@@ -976,7 +921,6 @@
name = "Amasec"
id = "amasec"
description = "Official drink of the Imperium."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
alcohol_perc = 0.3
drink_icon = "amasecglass"
@@ -989,7 +933,6 @@
name = "Neuro-toxin"
id = "neurotoxin"
description = "A strong neurotoxin that puts the subject into a death-like state."
- reagent_state = LIQUID
color = "#2E2E61" // rgb: 46, 46, 97
dizzy_adj = 12 SECONDS
alcohol_perc = 0.7
@@ -1014,7 +957,6 @@
name = "Hippie's Delight"
id = "hippiesdelight"
description = "You just don't get it maaaan."
- reagent_state = LIQUID
color = "#664300" // rgb: 102, 67, 0
metabolization_rate = 0.2 * REAGENTS_METABOLISM
drink_icon = "hippiesdelightglass"
@@ -1052,7 +994,6 @@
name = "Changeling Sting"
id = "changelingsting"
description = "A stingy drink."
- reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.7
dizzy_adj = 10 SECONDS
@@ -1066,7 +1007,6 @@
name = "Dublin Drop"
id = "dublindrop"
description = "Mmm, tastes like chocolate cake..."
- reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.3
dizzy_adj = 10 SECONDS
@@ -1080,7 +1020,6 @@
name = "Syndicate Bomb"
id = "syndicatebomb"
description = "A Syndicate bomb"
- reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.2
drink_icon = "syndicatebomb"
@@ -1093,7 +1032,6 @@
name = "Erika Surprise"
id = "erikasurprise"
description = "The surprise is, it's green!"
- reagent_state = LIQUID
color = "#2E6671" // rgb: 46, 102, 113
alcohol_perc = 0.2
drink_icon = "erikasurprise"
@@ -1222,9 +1160,7 @@
name = "Dragon's Breath"
id = "dragonsbreath"
description = "Possessing this stuff probably breaks the Geneva convention."
- reagent_state = LIQUID
color = "#DC0000"
- alcohol_perc = 1
taste_description = "LIQUID FUCKING DEATH OH GOD WHAT THE FUCK"
/datum/reagent/consumable/ethanol/dragons_breath/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
@@ -1270,7 +1206,6 @@
name = "Synthanol"
id = "synthanol"
description = "A runny liquid with conductive capacities. Its effects on synthetics are similar to those of alcohol on organics."
- reagent_state = LIQUID
color = "#1BB1FF"
process_flags = ORGANIC | SYNTHETIC
alcohol_perc = 0.5
@@ -1298,7 +1233,6 @@
name = "Robot Tears"
id = "robottears"
description = "An oily substance that an IPC could technically consider a 'drink'."
- reagent_state = LIQUID
color = "#363636"
alcohol_perc = 0.25
drink_icon = "robottearsglass"
@@ -1310,7 +1244,6 @@
name = "Trinary"
id = "trinary"
description = "A fruit drink meant only for synthetics, however that works."
- reagent_state = LIQUID
color = "#adb21f"
alcohol_perc = 0.2
drink_icon = "trinaryglass"
@@ -1323,7 +1256,6 @@
name = "Servo"
id = "servo"
description = "A drink containing some organic ingredients, but meant only for synthetics."
- reagent_state = LIQUID
color = "#5b3210"
alcohol_perc = 0.25
drink_icon = "servoglass"
@@ -1336,7 +1268,6 @@
name = "Uplink"
id = "uplink"
description = "A potent mix of alcohol and synthanol. Will only work on synthetics."
- reagent_state = LIQUID
color = "#e7ae04"
alcohol_perc = 0.15
drink_icon = "uplinkglass"
@@ -1349,7 +1280,6 @@
name = "Synth 'n Soda"
id = "synthnsoda"
description = "The classic drink adjusted for a robot's tastes."
- reagent_state = LIQUID
color = "#7204e7"
alcohol_perc = 0.25
drink_icon = "synthnsodaglass"
@@ -1362,7 +1292,6 @@
name = "Synthignon"
id = "synthignon"
description = "Someone mixed wine and alcohol for robots. Hope you're proud of yourself."
- reagent_state = LIQUID
color = "#d004e7"
alcohol_perc = 0.25
drink_icon = "synthignonglass"
diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
index 8a321717e4f..c5f33da350a 100644
--- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
@@ -1,7 +1,6 @@
// These can only be applied by blobs. They are what blobs are made out of.
// The 4 damage
/datum/reagent/blob
- description = ""
var/complementary_color = COLOR_BLACK
var/message = "The blob strikes you" //message sent to any mob hit by the blob
var/message_living = null //extension to first mob sent to only living mobs i.e. silicons have no skin to be burnt
diff --git a/code/modules/reagents/chemistry/reagents/disease.dm b/code/modules/reagents/chemistry/reagents/disease.dm
index 335af8f37b1..8bfd678d0dd 100644
--- a/code/modules/reagents/chemistry/reagents/disease.dm
+++ b/code/modules/reagents/chemistry/reagents/disease.dm
@@ -2,7 +2,6 @@
name = "Spider eggs"
id = "spidereggs"
description = "A fine dust containing spider eggs. Oh gosh."
- reagent_state = SOLID
color = "#FFFFFF"
taste_mult = 0
@@ -53,7 +52,6 @@
name = "Jagged Crystals"
id = "jagged_crystals"
description = "Rapid chemical decomposition has warped these crystals into twisted spikes."
- reagent_state = SOLID
color = "#FA0000" // rgb: 250, 0, 0
taste_mult = 0
@@ -116,7 +114,6 @@
name = "Space heartworms"
id = "heartworms"
description = "Aww, gross! These things can't be good for your heart. They're gunna eat it!"
- reagent_state = SOLID
color = "#925D6C"
taste_mult = 0
diff --git a/code/modules/reagents/chemistry/reagents/drink_base.dm b/code/modules/reagents/chemistry/reagents/drink_base.dm
index 5766bd9260c..49795cfa3c3 100644
--- a/code/modules/reagents/chemistry/reagents/drink_base.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_base.dm
@@ -4,7 +4,6 @@
description = "Uh, some kind of drink."
reagent_state = LIQUID
color = "#E78108" // rgb: 231, 129, 8
- harmless = TRUE
taste_description = "something which should not exist"
var/adj_dizzy = 0
var/adj_drowsy = 0
diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
index 51de206ac26..f980bfe36ac 100644
--- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm
@@ -2,7 +2,6 @@
name = "Orange juice"
id = "orangejuice"
description = "Both delicious AND rich in Vitamin C, what more do you need?"
- color = "#E78108" // rgb: 231, 129, 8
drink_icon = "glass_orange"
drink_name = "Glass of Orange juice"
drink_desc = "Vitamins! Yay!"
@@ -78,7 +77,6 @@
name = "The Doctor's Delight"
id = "doctorsdelight"
description = "A gulp a day keeps the MediBot away. That's probably for the best."
- reagent_state = LIQUID
color = "#FF8CFF" // rgb: 255, 140, 255
drink_icon = "doctorsdelightglass"
drink_name = "Doctor's Delight"
@@ -95,7 +93,6 @@
name = "Triple Citrus"
id = "triple_citrus"
description = "A refreshing mixed drink of orange, lemon and lime juice."
- reagent_state = LIQUID
color = "#B5FF00"
drink_icon = "triplecitrus"
drink_name = "Glass of Triplecitrus Juice"
@@ -256,7 +253,6 @@
name = "Cream"
id = "cream"
description = "The fatty, still liquid part of milk. Why don't you mix this with some scotch, eh?"
- color = "#F1F1F1"
drink_name = "Glass of cream"
drink_desc = "Ewwww..."
taste_description = "cream"
@@ -592,7 +588,6 @@
name = "Cola"
id = "cola"
description = "A refreshing beverage."
- reagent_state = LIQUID
color = "#100800" // rgb: 16, 8, 0
adj_drowsy = -10 SECONDS
drink_icon = "glass_brown"
diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm
index c6e5c4b417b..a76bbcfb184 100644
--- a/code/modules/reagents/chemistry/reagents/drugs.dm
+++ b/code/modules/reagents/chemistry/reagents/drugs.dm
@@ -9,7 +9,6 @@
name = "Lithium"
id = "lithium"
description = "A chemical element."
- reagent_state = SOLID
color = "#808080" // rgb: 128, 128, 128
taste_description = "metal"
@@ -248,7 +247,6 @@
name = "Pump Up"
id = "pump_up"
description = "An awful smelling mixture which acts as a makeshift stimulant"
- reagent_state = SOLID
color = COLOR_HALF_TRANSPARENT_BLACK
taste_description = "poorly mixed coffee"
metabolization_rate = 1
@@ -443,7 +441,6 @@
name = "Bath Salts"
id = "bath_salts"
description = "Sometimes packaged as a refreshing bathwater additive, these crystals are definitely not for human consumption."
- reagent_state = SOLID
color = "#FAFAFA"
overdose_threshold = 20
addiction_chance = 15
@@ -1134,7 +1131,6 @@
name = "Ultra-Lube"
id = "ultralube"
description = "Ultra-Lube is an enhanced lubricant which induces effect similar to Methamphetamine in synthetic users by drastically reducing internal friction and increasing cooling capabilities."
- reagent_state = LIQUID
color = "#1BB1FF"
process_flags = SYNTHETIC
overdose_threshold = 20
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index e9acabc3877..caf3601f251 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -23,7 +23,6 @@
name = "Nutriment"
id = "nutriment"
description = "A questionable mixture of various pure nutrients commonly found in processed foods."
- reagent_state = SOLID
nutriment_factor = 15 * REAGENTS_METABOLISM
color = "#664330" // rgb: 102, 67, 48
var/brute_heal = 1
@@ -79,9 +78,6 @@
name = "Vitamin"
id = "vitamin"
description = "All the best vitamins, minerals, and carbohydrates the body needs in pure form."
- reagent_state = SOLID
- color = "#664330" // rgb: 102, 67, 48
- brute_heal = 1
burn_heal = 1
/datum/reagent/consumable/nutriment/vitamin/on_mob_life(mob/living/M)
@@ -93,7 +89,6 @@
name = "Sugar"
id = "sugar"
description = "The organic compound commonly known as table sugar and sometimes called saccharose. This white, odorless, crystalline powder has a pleasing, sweet taste."
- reagent_state = SOLID
color = "#FFFFFF" // rgb: 255, 255, 255
nutriment_factor = 5 * REAGENTS_METABOLISM
overdose_threshold = 200 // Hyperglycaemic shock
@@ -282,7 +277,6 @@
name = "Salt"
id = "sodiumchloride"
description = "Sodium chloride, common table salt."
- reagent_state = SOLID
color = "#B1B0B0"
harmless = FALSE
overdose_threshold = 100
@@ -299,14 +293,12 @@
name = "Black Pepper"
id = "blackpepper"
description = "A powder ground from peppercorns. *AAAACHOOO*"
- reagent_state = SOLID
taste_description = "pepper"
/datum/reagent/consumable/cocoa
name = "Cocoa Powder"
id = "cocoa"
description = "A fatty, bitter paste made from cocoa beans."
- reagent_state = SOLID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#5F3A13"
taste_description = "bitter cocoa"
@@ -315,7 +307,6 @@
name = "Vanilla"
id = "vanilla"
description = "A fatty, bitter paste made from vanilla pods."
- reagent_state = SOLID
nutriment_factor = 5 * REAGENTS_METABOLISM
color = "#FEFEFE"
taste_description = "bitter vanilla"
@@ -400,7 +391,6 @@
name = "Dry Ramen"
id = "dry_ramen"
description = "Space age food, since August 25, 1958. Contains dried noodles, vegetables, and chemicals that boil in contact with water."
- reagent_state = SOLID
color = "#302000" // rgb: 48, 32, 0
taste_description = "dry ramen coated with what might just be your tears"
@@ -435,7 +425,6 @@
name = "Flour"
id = "flour"
description = "This is what you rub all over yourself to pretend to be a ghost."
- reagent_state = SOLID
color = "#FFFFFF" // rgb: 0, 0, 0
taste_description = "flour"
@@ -447,7 +436,6 @@
name = "Rice"
id = "rice"
description = "Enjoy the great taste of nothing."
- reagent_state = SOLID
nutriment_factor = 3 * REAGENTS_METABOLISM
color = "#FFFFFF" // rgb: 0, 0, 0
taste_description = "rice"
@@ -577,7 +565,6 @@
color = "#21170E"
process_flags = ORGANIC | SYNTHETIC
taste_description = "tea"
- harmless = TRUE
/datum/reagent/consumable/mugwort/on_mob_life(mob/living/M)
var/update_flags = STATUS_UPDATE_NONE
@@ -624,7 +611,6 @@
name = "Cheese"
id = "cheese"
description = "Some cheese. Pour it out to make it solid."
- reagent_state = SOLID
color = "#FFFF00"
taste_description = "cheese"
@@ -662,7 +648,6 @@
name = "Weird cheese"
id = "weird_cheese"
description = "Hell, I don't even know if this IS cheese. Whatever it is, it ain't normal. If you want to, pour it out to make it solid."
- reagent_state = SOLID
color = "#50FF00"
addiction_chance = 1
addiction_chance_additional = 10
@@ -683,7 +668,6 @@
name = "Cheese Curds"
id = "cheese_curds"
description = "Some mushed up cheese curds. You're not quite sure why you did this."
- reagent_state = SOLID
color = "#FFFF00"
taste_description = "salty cheese"
@@ -707,7 +691,6 @@
name = "Bread"
id = "bread"
description = "Bread! Yep, bread."
- reagent_state = SOLID
color = "#9C5013"
taste_description = "bread"
@@ -785,7 +768,6 @@
name = "Mashed potatoes"
id = "mashedpotatoes"
description = "A starchy food paste made from boiled potatoes."
- reagent_state = SOLID
color = "#D6D9C1"
taste_description = "potatoes"
@@ -932,7 +914,6 @@
name = "Soap"
id = "soapreagent"
description = "Soap, fit to clean the mouth of a sailor."
- reagent_state = SOLID
color = "#FFFFFF"
taste_description = "soap"
diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm
index de15877cc4f..dc3ed2953b5 100644
--- a/code/modules/reagents/chemistry/reagents/medicine.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine.dm
@@ -103,10 +103,7 @@
id = "recal"
description = "An oily insulating liquid that passively regulates electrical activity on sensitive electronic components, allowing them to recover from decalibrating events faster. \
Overdosing will cause under-voltage errors and hamper component heat dissipation, potentially causing heat damage."
- reagent_state = LIQUID
color = "#85845d"
- overdose_threshold = 40
- harmless = FALSE
taste_description = "mineral oil and toothpaste"
process_flags = SYNTHETIC
@@ -179,7 +176,6 @@
name = "Rezadone"
id = "rezadone"
description = "A powder derived from fish toxin, Rezadone can effectively treat genetic damage as well as restoring minor wounds. Overdose will cause intense nausea and minor toxin damage."
- reagent_state = SOLID
color = "#669900" // rgb: 102, 153, 0
overdose_threshold = 30
harmless = FALSE
@@ -422,7 +418,6 @@
id = "charcoal"
description = "Activated charcoal helps to absorb toxins."
reagent_state = LIQUID
- color = "#000000"
taste_description = "dust"
goal_difficulty = REAGENT_GOAL_EASY
@@ -836,7 +831,6 @@
id = "atropine"
description = "Atropine is a potent cardiac resuscitant but it can causes confusion, dizzyness and hyperthermia."
reagent_state = LIQUID
- color = "#000000"
metabolization_rate = 0.2
overdose_threshold = 25
harmless = FALSE
@@ -1362,7 +1356,6 @@
name = "Restorative Nanites"
id = "syndicate_nanites"
description = "Miniature medical robots that swiftly restore bodily damage. May begin to attack their host's cells in high amounts."
- reagent_state = SOLID
color = "#555555"
taste_description = "bodily perfection"
diff --git a/code/modules/reagents/chemistry/reagents/misc_reagents.dm b/code/modules/reagents/chemistry/reagents/misc_reagents.dm
index fe73c7a60b4..71a936a0649 100644
--- a/code/modules/reagents/chemistry/reagents/misc_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/misc_reagents.dm
@@ -26,7 +26,6 @@
name = "Potassium"
id = "potassium"
description = "A soft, low-melting solid that can easily be cut with a knife. Reacts violently with water."
- reagent_state = SOLID
color = "#A0A0A0" // rgb: 160, 160, 160
taste_description = "bad ideas"
@@ -34,7 +33,6 @@
name = "Sulfur"
id = "sulfur"
description = "A chemical element."
- reagent_state = SOLID
color = "#BF8C00" // rgb: 191, 140, 0
taste_description = "impulsive decisions"
@@ -42,7 +40,6 @@
name = "Sodium"
id = "sodium"
description = "A chemical element."
- reagent_state = SOLID
color = "#808080" // rgb: 128, 128, 128
taste_description = "horrible misjudgement"
@@ -50,7 +47,6 @@
name = "Phosphorus"
id = "phosphorus"
description = "A chemical element."
- reagent_state = SOLID
color = "#832828" // rgb: 131, 40, 40
taste_description = "misguided choices"
@@ -58,7 +54,6 @@
name = "Carbon"
id = "carbon"
description = "A chemical element."
- reagent_state = SOLID
color = "#1C1300" // rgb: 30, 20, 0
taste_description = "like a pencil or something"
@@ -70,7 +65,6 @@
name = "Gold"
id = "gold"
description = "Gold is a dense, soft, shiny metal and the most malleable and ductile metal known."
- reagent_state = SOLID
color = "#F7C430" // rgb: 247, 196, 48
taste_description = "bling"
@@ -79,7 +73,6 @@
name = "Silver"
id = "silver"
description = "A lustrous metallic element regarded as one of the precious metals."
- reagent_state = SOLID
color = "#D0D0D0" // rgb: 208, 208, 208
taste_description = "sub-par bling"
@@ -87,7 +80,6 @@
name = "Aluminum"
id = "aluminum"
description = "A silvery white and ductile member of the boron group of chemical elements."
- reagent_state = SOLID
color = "#A8A8A8" // rgb: 168, 168, 168
taste_description = "metal"
@@ -95,7 +87,6 @@
name = "Silicon"
id = "silicon"
description = "A tetravalent metalloid, silicon is less reactive than its chemical analog carbon."
- reagent_state = SOLID
color = "#A8A8A8" // rgb: 168, 168, 168
taste_description = "a CPU"
@@ -124,7 +115,6 @@
name = "Iron"
id = "iron"
description = "Pure iron is a metal."
- reagent_state = SOLID
color = "#525152" // rgb: 200, 165, 220
taste_description = "metal"
@@ -675,7 +665,6 @@
name = "Generic nutrient"
id = "plantnutrient"
description = "Some kind of nutrient. You can't really tell what it is. You should probably report it, along with how you obtained it."
- color = "#000000" // RBG: 0, 0, 0
var/tox_prob = 0
var/mutation_level = 0
taste_description = "puke"
diff --git a/code/modules/reagents/chemistry/reagents/paradise_pop.dm b/code/modules/reagents/chemistry/reagents/paradise_pop.dm
index 8dfc3935360..969b1432db0 100644
--- a/code/modules/reagents/chemistry/reagents/paradise_pop.dm
+++ b/code/modules/reagents/chemistry/reagents/paradise_pop.dm
@@ -13,7 +13,6 @@
name = "Paradise Punch"
id = "paradise_punch"
description = "Tastes just how you'd think Paradise would if you could bottle it."
- reagent_state = LIQUID
color = "#cc0044"
taste_description = "paradise"
@@ -22,7 +21,6 @@
name = "Apple-pocalypse"
id = "apple-pocalypse"
description = "If doomsday came in fruit form, it'd probably be apples."
- reagent_state = LIQUID
color = "#44FF44"
taste_description = "doomsday"
@@ -38,7 +36,6 @@
name = "Berry Banned"
id = "berry_banned"
description = "Reason for ban: Excessive Flavor."
- reagent_state = LIQUID
color = "#FF44FF"
taste_description = "a permaban"
@@ -67,7 +64,6 @@
name = "Berry Banned"
id = "berry_banned2"
description = "Reason for ban: Excessive Flavor."
- reagent_state = LIQUID
color = "#FF44FF"
taste_description = "a permaban"
@@ -89,7 +85,6 @@
name = "Blackeye Brew"
id = "blackeye_brew"
description = "Creamy, smooth flavor, just like the bald heads of the masses. Supposedly aged for 30 years."
- reagent_state = LIQUID
color = "#4d2600"
taste_description = "greytide"
@@ -113,7 +108,6 @@
name = "Grape Granade"
id = "grape_granade"
description = "Exploding with grape flavor and a favorite among ERT members system-wide."
- reagent_state = LIQUID
color = "#9933ff"
taste_description = "old people"
@@ -132,7 +126,6 @@
name = "Meteor Malt"
id = "meteor_malt"
description = "Soft drinks have been detected on collision course with your tastebuds."
- reagent_state = LIQUID
color = "#cc9900"
taste_description = "flying space rocks"
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
index 4a362f04797..b2e68977c9b 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
@@ -47,7 +47,6 @@
size_divisor = 80
mob_burning = 3 // 15
burn_temperature = T0C + 700
- burn_color = "white"
/datum/reagent/napalm
name = "Napalm"
@@ -194,7 +193,6 @@
name = "Thermite"
id = "thermite"
description = "Thermite produces an aluminothermic reaction known as a thermite reaction. Can be used to melt walls."
- reagent_state = SOLID
color = "#673910" // rgb: 103, 57, 16
process_flags = ORGANIC | SYNTHETIC
taste_description = "rust"
@@ -317,7 +315,6 @@
id = "blackpowder"
description = "Explodes. Violently."
reagent_state = LIQUID
- color = "#000000"
metabolization_rate = 0.05
penetrates_skin = TRUE
taste_description = "explosions"
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index b9b684746e9..13f56965ca1 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -159,7 +159,6 @@
id = "radium"
description = "Radium is an alkaline earth metal. It is extremely radioactive."
process_flags = ORGANIC | SYNTHETIC
- reagent_state = SOLID
color = "#C7C7C7" // rgb: 199,199,199
penetrates_skin = TRUE
taste_description = "the colour blue and regret"
@@ -241,7 +240,6 @@
name = "Uranium"
id = "uranium"
description = "A silvery-white metallic chemical element in the actinide series, weakly radioactive."
- reagent_state = SOLID
color = "#B8B8C0" // rgb: 184, 184, 192
taste_mult = 0
taste_description = "the inside of a reactor"
@@ -340,7 +338,6 @@
description = "Fluorosulfuric acid is a an extremely corrosive super-acid."
color = "#5050FF"
acidpwr = 42
- goal_department = "Science"
goal_difficulty = REAGENT_GOAL_NORMAL
/datum/reagent/acid/facid/on_mob_life(mob/living/M)
@@ -916,7 +913,6 @@
name = "Lipolicide"
id = "lipolicide"
description = "A compound found in many seedy dollar stores in the form of a weight-loss tonic."
- reagent_state = SOLID
color = "#D1DED1"
metabolization_rate = 0.2
taste_description = "battery acid"
@@ -1104,7 +1100,6 @@
name = "Atrazine"
id = "atrazine"
description = "A herbicidal compound used for destroying unwanted plants."
- reagent_state = LIQUID
color = "#773E73" //RGB: 47 24 45
lethality = 2 //Atrazine, however, is definitely toxic
goal_department = "Science"
@@ -1254,7 +1249,6 @@
name = "Ants"
id = "ants"
description = "A sample of a lost breed of Space Ants (formicidae bastardium tyrannus), they are well-known for ravaging the living shit out of pretty much anything."
- reagent_state = SOLID
color = "#993333"
process_flags = ORGANIC | SYNTHETIC
taste_description = "ANTS OH GOD"
diff --git a/code/modules/reagents/chemistry/reagents/water.dm b/code/modules/reagents/chemistry/reagents/water.dm
index e2875a301fe..724e60f84ce 100644
--- a/code/modules/reagents/chemistry/reagents/water.dm
+++ b/code/modules/reagents/chemistry/reagents/water.dm
@@ -213,7 +213,6 @@
reagent_state = LIQUID
color = "#757547"
taste_description = "puke"
- harmless = FALSE
/datum/reagent/fishwater/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume)
if(method == REAGENT_INGEST)
@@ -233,8 +232,6 @@
name = "Toilet Water"
id = "toiletwater"
description = "Filthy water scoured from a nasty toilet bowl. Absolutely disgusting."
- reagent_state = LIQUID
- color = "#757547"
taste_description = "the inside of a toilet... or worse"
/datum/reagent/fishwater/toiletwater/reaction_mob(mob/living/M, method=REAGENT_TOUCH, volume) //For shennanigans
@@ -370,7 +367,6 @@
name = "Unholy Water"
id = "unholywater"
description = "Something that shouldn't exist on this plane of existence."
- process_flags = ORGANIC | SYNTHETIC //ethereal means everything processes it.
metabolization_rate = 1
taste_description = "sulfur"
@@ -466,7 +462,6 @@
description = "A sticky compound that creates tar on contact with surfaces."
reagent_state = LIQUID
color = "#4B4B4B"
- harmless = FALSE
taste_description = "processed sludge"
/datum/reagent/tar_compound/reaction_turf(turf/simulated/T, volume)
diff --git a/code/modules/reagents/chemistry/recipes/drinks_reactions.dm b/code/modules/reagents/chemistry/recipes/drinks_reactions.dm
index 1a4b503b8b6..4fac050c2f3 100644
--- a/code/modules/reagents/chemistry/recipes/drinks_reactions.dm
+++ b/code/modules/reagents/chemistry/recipes/drinks_reactions.dm
@@ -745,7 +745,6 @@
id = "robottears"
result = "robottears"
required_reagents = list("synthanol" = 1, "oil" = 1, "sodawater" = 1)
- result_amount = 3
mix_message = "The ingredients combine into a stiff, dark goo."
/datum/chemical_reaction/synthanol/trinary
@@ -753,7 +752,6 @@
id = "trinary"
result = "trinary"
required_reagents = list("synthanol" = 1, "limejuice" = 1, "orangejuice" = 1)
- result_amount = 3
mix_message = "The ingredients mix into a colorful substance."
/datum/chemical_reaction/synthanol/servo
diff --git a/code/modules/reagents/chemistry/recipes/drugs_reactions.dm b/code/modules/reagents/chemistry/recipes/drugs_reactions.dm
index 8a73079bde5..1805b10e49e 100644
--- a/code/modules/reagents/chemistry/recipes/drugs_reactions.dm
+++ b/code/modules/reagents/chemistry/recipes/drugs_reactions.dm
@@ -143,7 +143,6 @@
id = "conductivelube"
result = "conductivelube"
required_reagents = list("teslium" = 1, "lube" = 1, "aluminum" = 1)
- result_amount = 3
mix_message = "The mixture darkens and starts sparking."
/datum/chemical_reaction/surge
diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
index 52e3e83378d..41e8658f2f4 100644
--- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
+++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm
@@ -284,7 +284,6 @@
id = "smoke_powder_smoke"
required_reagents = list("smoke_powder" = 1)
min_temp = T0C + 100
- result_amount = 1
mix_sound = null
/datum/chemical_reaction/sonic_powder
diff --git a/code/modules/reagents/reagent_containers/chemical_bottle.dm b/code/modules/reagents/reagent_containers/chemical_bottle.dm
index 22c72441c28..0a3cd6f40e0 100644
--- a/code/modules/reagents/reagent_containers/chemical_bottle.dm
+++ b/code/modules/reagents/reagent_containers/chemical_bottle.dm
@@ -4,13 +4,9 @@
/obj/item/reagent_containers/glass/bottle
name = "bottle"
desc = "A small bottle."
- icon = 'icons/obj/chemical.dmi'
icon_state = "bottle"
item_state = "atoxinbottle"
- amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5, 10, 15, 25, 30, 40, 50)
- container_type = OPENCONTAINER
- volume = 50
/obj/item/reagent_containers/glass/bottle/on_reagent_change()
update_icon(UPDATE_OVERLAYS)
@@ -250,7 +246,6 @@
/obj/item/reagent_containers/glass/bottle/thermite
name = "thermite bottle"
desc = "A small bottle of thermite, a substance that burns extremely hot."
- icon_state = "bottle"
list_reagents = list("thermite" = 50)
////////////////////Traitor Poison Bottle//////////////////////////////
diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm
index 015c52008d9..6bcd97afdee 100644
--- a/code/modules/reagents/reagent_containers/glass_containers.dm
+++ b/code/modules/reagents/reagent_containers/glass_containers.dm
@@ -5,7 +5,6 @@
name = " "
var/base_name = " "
desc = " "
- icon = 'icons/obj/chemical.dmi'
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,50)
volume = 50
@@ -121,7 +120,6 @@
/obj/item/reagent_containers/glass/beaker
name = "beaker"
desc = "A simple glass beaker, nothing special."
- icon = 'icons/obj/chemical.dmi'
icon_state = "beaker"
item_state = "beaker"
belt_icon = "beaker"
@@ -227,9 +225,7 @@
icon_state = "beakerlarge"
materials = list(MAT_GLASS=2500)
volume = 100
- amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,50,100)
- container_type = OPENCONTAINER
/obj/item/reagent_containers/glass/beaker/vial
name = "vial"
@@ -238,9 +234,7 @@
belt_icon = "vial"
materials = list(MAT_GLASS=250)
volume = 25
- amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25)
- container_type = OPENCONTAINER
can_assembly = 0
/obj/item/reagent_containers/glass/beaker/drugs
@@ -250,7 +244,6 @@
amount_per_transfer_from_this = 2
possible_transfer_amounts = null
volume = 10
- container_type = OPENCONTAINER
can_assembly = 0
/obj/item/reagent_containers/glass/beaker/noreact
@@ -258,10 +251,7 @@
desc = "A cryostasis beaker that allows for chemical storage without reactions."
icon_state = "beakernoreact"
materials = list(MAT_METAL=3000)
- volume = 50
- amount_per_transfer_from_this = 10
origin_tech = "materials=2;engineering=3;plasmatech=3"
- container_type = OPENCONTAINER
blocks_emissive = EMISSIVE_BLOCK_GENERIC
/obj/item/reagent_containers/glass/beaker/noreact/Initialize(mapload)
@@ -274,9 +264,7 @@
icon_state = "beakerbluespace"
materials = list(MAT_GLASS=3000)
volume = 300
- amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,50,100,300)
- container_type = OPENCONTAINER
blocks_emissive = EMISSIVE_BLOCK_GENERIC
origin_tech = "bluespace=5;materials=4;plasmatech=4"
@@ -309,7 +297,6 @@
prefered_slot_flags = ITEM_SLOT_IN_BACKPACK
resistance_flags = NONE
blocks_emissive = EMISSIVE_BLOCK_GENERIC
- container_type = OPENCONTAINER
dog_fashion = /datum/dog_fashion/head/bucket
/obj/item/reagent_containers/glass/bucket/update_overlays()
@@ -354,8 +341,6 @@
item_state = "bottle"
list_reagents = list("water" = 49.5, "fluorine" = 0.5) //see desc, don't think about it too hard
materials = list(MAT_GLASS = 0)
- volume = 50
- amount_per_transfer_from_this = 10
/obj/item/reagent_containers/glass/beaker/waterbottle/empty
list_reagents = list()
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 122d8016986..827291fa0ac 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -8,8 +8,6 @@
item_state = "hypo"
icon_state = "hypo"
belt_icon = "hypospray"
- amount_per_transfer_from_this = 5
- volume = 30
possible_transfer_amounts = list(1,2,3,4,5,10,15,20,25,30)
resistance_flags = ACID_PROOF
container_type = OPENCONTAINER
diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm
index 8807f19874f..b284148097e 100644
--- a/code/modules/reagents/reagent_containers/patch.dm
+++ b/code/modules/reagents/reagent_containers/patch.dm
@@ -1,11 +1,9 @@
/obj/item/reagent_containers/patch
name = "chemical patch"
desc = "A chemical patch for touch based applications."
- icon = 'icons/obj/chemical.dmi'
icon_state = "bandaid1"
possible_transfer_amounts = null
visible_transfer_rate = FALSE
- volume = 30
temperature_min = 270
temperature_max = 350
var/instant_application = FALSE
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 39e768046d9..c5f5fb3c38a 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -6,7 +6,6 @@
/obj/item/reagent_containers/pill
name = "pill"
desc = "A pill."
- icon = 'icons/obj/chemical.dmi'
icon_state = null
item_state = "pill"
possible_transfer_amounts = null
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index d16799f11a4..69fe911ee56 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -8,13 +8,10 @@
flags = NOBLUDGEON
container_type = OPENCONTAINER
slot_flags = ITEM_SLOT_BELT
- throwforce = 0
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
- throw_range = 7
var/spray_maxrange = 3 //what the sprayer will set spray_currentrange to in the attack_self.
var/spray_currentrange = 3 //the range of tiles the sprayer will reach when in fixed mode.
- amount_per_transfer_from_this = 5
volume = 250
possible_transfer_amounts = null
var/delay = CLICK_CD_RANGE * 2
@@ -156,7 +153,6 @@
visible_message("[src] identifies and removes a filthy substance.")
/obj/item/reagent_containers/spray/cleaner/drone
- name = "space cleaner"
desc = "BLAM!-brand non-foaming space cleaner!"
spray_maxrange = 3
spray_currentrange = 3
@@ -192,7 +188,6 @@
belt_icon = null
volume = 40
spray_maxrange = 4
- amount_per_transfer_from_this = 5
list_reagents = list("condensedcapsaicin" = 40)
//water flower
@@ -219,7 +214,6 @@
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "chemsprayer"
item_state = "chemsprayer"
- throwforce = 0
w_class = WEIGHT_CLASS_NORMAL
spray_maxrange = 7
spray_currentrange = 7
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index f5c738f1c1c..84b8aa51b11 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -5,7 +5,6 @@
item_state = "syringe_0"
icon_state = "0"
belt_icon = "syringe"
- amount_per_transfer_from_this = 5
possible_transfer_amounts = null
volume = 15
var/busy = FALSE
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index e142f3bc673..7b1f2911ccc 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -6,7 +6,6 @@
density = TRUE
pressure_resistance = 2*ONE_ATMOSPHERE
container_type = DRAINABLE | AMOUNT_VISIBLE
- max_integrity = 300
cares_about_temperature = TRUE
/// How much this dispenser can hold (In units)
var/tank_volume = 1000
@@ -85,7 +84,6 @@
/obj/structure/reagent_dispensers/watertank
name = "water tank"
desc = "A water tank."
- icon_state = "water"
/obj/structure/reagent_dispensers/watertank/high
name = "high-capacity water tank"
@@ -262,7 +260,6 @@
icon = 'icons/obj/vending.dmi'
icon_state = "water_cooler"
tank_volume = 500
- reagent_id = "water"
anchored = TRUE
var/paper_cups = 25 //Paper cups left from the cooler
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index d7b27718888..cbb27f18702 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -18,7 +18,6 @@ GLOBAL_LIST_EMPTY(conveyor_switches)
Use a crowbar on the belt to dislodge it."
layer = CONVEYOR_LAYER // so they appear under stuff but not below stuff like vents
anchored = TRUE
- move_force = MOVE_FORCE_DEFAULT
var/operating = FALSE //NB: this can be TRUE while the belt doesn't go
var/forwards // The direction the conveyor sends you in
var/backwards // hopefully self-explanatory
@@ -535,7 +534,6 @@ GLOBAL_LIST_EMPTY(conveyor_switches)
dir = SOUTHEAST
/obj/machinery/conveyor/south
- dir = SOUTH
/obj/machinery/conveyor/southwest
dir = SOUTHWEST
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
index 81882d2d730..1877794ac40 100644
--- a/code/modules/recycling/disposal-construction.dm
+++ b/code/modules/recycling/disposal-construction.dm
@@ -7,10 +7,7 @@
desc = "A huge pipe segment used for constructing disposal systems."
icon = 'icons/obj/pipes/disposal.dmi'
icon_state = "conpipe-s"
- anchored = FALSE
- density = FALSE
pressure_resistance = 5*ONE_ATMOSPHERE
- level = 2
max_integrity = 200
var/ptype = PIPE_DISPOSALS_STRAIGHT //Use the defines
var/base_state
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index cb979e959a1..d28f83a6de5 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -24,7 +24,6 @@
density = TRUE
on_blueprints = TRUE
armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 100, BOMB = 0, RAD = 100, FIRE = 90, ACID = 30)
- max_integrity = 200
flags_2 = RAD_PROTECT_CONTENTS_2 | RAD_NO_CONTAMINATE_2
resistance_flags = FIRE_PROOF
active_power_consumption = 600
@@ -825,7 +824,6 @@
name = "disposal pipe"
desc = "An underfloor disposal pipe."
anchored = TRUE
- density = FALSE
on_blueprints = TRUE
level = 1 // underfloor only
@@ -1476,7 +1474,6 @@
////////////////////////////////////////
/obj/structure/disposalpipe/broken
icon_state = "pipe-b"
- dpdir = 0 // broken pipes have dpdir=0 so they're not found as 'real' pipes
// i.e. will be treated as an empty turf
desc = "A broken piece of disposal pipe."
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 00a8ed58fa6..61a3d521535 100644
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -280,7 +280,6 @@
/obj/machinery/disposal/delivery_chute
name = "delivery chute"
desc = "A chute for big and small packages alike!"
- density = TRUE
icon_state = "intake"
required_mode_to_deconstruct = 1
deconstructs_to = PIPE_DISPOSALS_CHUTE
diff --git a/code/modules/research/anomaly/anomaly.dm b/code/modules/research/anomaly/anomaly.dm
index d4564b3e2f2..35d72f565aa 100644
--- a/code/modules/research/anomaly/anomaly.dm
+++ b/code/modules/research/anomaly/anomaly.dm
@@ -48,7 +48,6 @@
/obj/item/assembly/signaler/anomaly/bluespace
name = "bluespace anomaly core"
desc = "The neutralized core of a bluespace anomaly. It keeps phasing in and out of view. It'd probably be valuable for research."
- icon_state = "anomaly_core"
anomaly_type = /obj/effect/anomaly/bluespace
origin_tech = "bluespace=7"
@@ -74,7 +73,6 @@
desc = "An experimental suit of armour, awaiting installation of an anomaly core."
icon_state = "reactiveoff"
icon = 'icons/obj/clothing/suits.dmi'
- w_class = WEIGHT_CLASS_NORMAL
/obj/item/reactive_armour_shell/attackby__legacy__attackchain(obj/item/I, mob/user, params)
var/static/list/anomaly_armour_types = list(
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index af00d87af4c..0f4b4802a62 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -107,7 +107,6 @@
desc = "The circuit board for an Industrial Suit Storage Unit."
id = "issu"
req_tech = list("engineering" = 5, "materials" = 4)
- build_type = IMPRINTER
materials = list(MAT_GLASS = 1000)
build_path = /obj/item/circuitboard/suit_storage_unit/industrial
category = list("Engineering Machinery")
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index ff891388001..1215dbf51be 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -382,7 +382,6 @@
desc = "A large chemical canister, designed for use with a chemical flamethrower."
id = "chemical_canister_extended"
req_tech = list("materials" = 5, "plasmatech" = 4)
- build_type = PROTOLATHE
materials = list(MAT_METAL = 10000)
reagents_list = list("fuel" = 40)
build_path = /obj/item/chemical_canister/extended
@@ -393,7 +392,6 @@
desc = "A chemical canister designed to accept pyrotechnics."
id = "chemical_canister_pyro"
req_tech = list("materials" = 4, "plasmatech" = 6)
- build_type = PROTOLATHE
materials = list(MAT_METAL = 7500)
reagents_list = list("fuel" = 30)
build_path = /obj/item/chemical_canister/pyrotechnics
diff --git a/code/modules/research/message_server.dm b/code/modules/research/message_server.dm
index da7d4845ae9..0857b3acd1d 100644
--- a/code/modules/research/message_server.dm
+++ b/code/modules/research/message_server.dm
@@ -106,7 +106,6 @@ GLOBAL_LIST_EMPTY(message_servers)
icon_state = "[initial(icon_state)][panel_open ? "_o" : null][active ? null : "_off"]"
/obj/machinery/blackbox_recorder
- icon = 'icons/obj/stationobjs.dmi'
icon_state = "blackbox"
name = "Blackbox Recorder"
density = TRUE
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index bf0a268eabb..a0dfa0fada7 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -3,7 +3,6 @@
/obj/machinery/r_n_d/server
name = "\improper R&D Server"
- icon = 'icons/obj/machines/research.dmi'
icon_state = "RD-server-off"
/// ID to autolink to, used in mapload
var/autolink_id = null
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 4deb8970408..7f4678a9123 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -9,7 +9,6 @@
force = 1
w_class = WEIGHT_CLASS_TINY
container_type = INJECTABLE | DRAWABLE
- throwforce = 0
throw_speed = 3
throw_range = 6
origin_tech = "biotech=3"
@@ -38,7 +37,6 @@
/obj/item/slime_extract/grey
name = "grey slime extract"
- icon_state = "grey slime extract"
/obj/item/slime_extract/gold
name = "gold slime extract"
@@ -410,7 +408,6 @@
/obj/item/slimepotion/slime/mutator
name = "slime mutator"
desc = "A potent chemical mix that will increase the chance of a slime mutating."
- icon_state = "bottle3"
/obj/item/slimepotion/slime/mutator/is_valid_potion_receiver(atom/target, mob/user)
if(!..())
@@ -501,7 +498,6 @@
/obj/item/slimepotion/oil_slick
name = "slime oil potion"
desc = "A potent chemical mix that will remove the slowdown from any item by reducing friction. Doesn't mix well with water."
- icon = 'icons/obj/chemical.dmi'
icon_state = "bottle4"
origin_tech = "biotech=5"
@@ -567,7 +563,6 @@
apply_potion(over_object, usr)
/obj/effect/timestop
- anchored = TRUE
name = "chronofield"
desc = "ZA WARUDO!"
icon = 'icons/effects/160x160.dmi'
@@ -643,14 +638,11 @@
singular_name = "floor tile"
desc = "Through a series of micro-teleports, these tiles allow you to move things that would otherwise slow you down."
icon_state = "tile-bluespace"
- w_class = WEIGHT_CLASS_NORMAL
force = 6
materials = list(MAT_METAL=500)
throwforce = 10
throw_speed = 3
throw_range = 7
- flags = CONDUCT
- max_amount = 60
turf_type = /turf/simulated/floor/bluespace
@@ -669,14 +661,11 @@
singular_name = "floor tile"
desc = "Time seems to flow very slowly around these tiles."
icon_state = "tile-sepia"
- w_class = WEIGHT_CLASS_NORMAL
force = 6
materials = list(MAT_METAL=500)
throwforce = 10
throw_speed = 3
throw_range = 7
- flags = CONDUCT
- max_amount = 60
turf_type = /turf/simulated/floor/sepia
/obj/item/areaeditor/blueprints/slime
diff --git a/code/modules/research/xenobiology/xenobiology_organs.dm b/code/modules/research/xenobiology/xenobiology_organs.dm
index c6c7618d643..0cabc01c86e 100644
--- a/code/modules/research/xenobiology/xenobiology_organs.dm
+++ b/code/modules/research/xenobiology/xenobiology_organs.dm
@@ -130,7 +130,6 @@
icon_state = "organ4"
dead_icon = null
origin_tech = null
- tough = TRUE
is_xeno_organ = TRUE
/obj/item/organ/internal/eyes/cybernetic/xenobiology
@@ -234,11 +233,8 @@
desc = "Draw from special glands in your body to produce a small but dazzling flame!"
base_cooldown = 3 MINUTES
clothes_req = FALSE
- stat_allowed = CONSCIOUS
- invocation_type = "none"
action_icon_state = "fireball0"
sound = 'sound/magic/fireball.ogg'
- active = FALSE
antimagic_flags = NONE
selection_activated_message = "You take in a deep breath, readying to breathe fire!"
@@ -293,9 +289,7 @@
desc = "Detach some of your sinew-ous bands to create a durable restraint"
action_icon = 'icons/obj/mining.dmi'
action_icon_state = "sinewcuff"
- invocation_type = "none"
clothes_req = FALSE
- stat_allowed = CONSCIOUS
base_cooldown = 5 MINUTES
var/quality = ORGAN_NORMAL
var/cooldown = 0
@@ -455,9 +449,7 @@
desc = "Silently sting an unsuspecting victim with a mild cocktail of poisons"
action_icon_state = "sting_blind"
action_background_icon_state = "bg_changeling"
- invocation_type = "none"
clothes_req = FALSE
- stat_allowed = CONSCIOUS
base_cooldown = 5 MINUTES
antimagic_flags = NONE
var/quality = ORGAN_NORMAL
@@ -531,7 +523,6 @@
desc = "Bend your bones an ligaments in unnatural ways to slip under things you would normally never be able to."
base_cooldown = 5 MINUTES
clothes_req = FALSE
- stat_allowed = CONSCIOUS
invocation_type = null
action_icon_state = "contort_body"
action_background_icon_state = "bg_changeling"
@@ -539,7 +530,6 @@
sound = null
antimagic_flags = NONE
var/duration_time = 30 SECONDS
- active = FALSE
var/quality
/datum/spell/contort/create_new_targeting()
@@ -598,12 +588,9 @@
name = "Call to Blood"
desc = "Draw upon dark energies to absorb nearby blood, healing you in the process."
clothes_req = FALSE
- stat_allowed = CONSCIOUS
- invocation_type = "none"
action_icon = 'icons/mob/actions/actions_cult.dmi'
action_icon_state = "blood_charge"
sound = null
- active = FALSE
base_cooldown = 30 SECONDS
antimagic_flags = NONE
var/quality
@@ -698,13 +685,10 @@
desc = "Dig a tendril though the floor to grab at an item, throwing it towards you."
base_cooldown = 30 SECONDS
clothes_req = FALSE
- stat_allowed = CONSCIOUS
- invocation_type = "none"
action_icon = 'icons/mob/lavaland/lavaland_monsters.dmi'
action_icon_state = "Goliath_tentacle_stationary"
action_background_icon_state = "bg_default"
sound = null
- active = FALSE
antimagic_flags = NONE
var/quality
@@ -760,7 +744,6 @@
analyzer_price = 40
hidden_origin_tech = TECH_BLUESPACE
hidden_tech_level = 6
- status = ORGAN_ROBOT
/obj/item/organ/internal/eyes/cybernetic/xenobiology/glowing/Initialize(mapload)
. = ..()
@@ -787,11 +770,8 @@
desc = "Touch someone to destabilize their location in bluespace for a moment."
base_cooldown = 2 MINUTES
clothes_req = FALSE
- stat_allowed = CONSCIOUS
- invocation_type = "none"
action_icon_state = "spell_teleport"
sound = null
- active = FALSE
sound1 = 'sound/magic/blink.ogg'
sound2 = 'sound/magic/blink.ogg'
antimagic_flags = NONE
@@ -904,7 +884,6 @@
desc = "This organ holds a deceptive stinger tucked inside of itself, dripping with potent venom."
analyzer_price = 60
terror = TRUE
- hidden_origin_tech = TECH_COMBAT
hidden_tech_level = 7
/obj/item/organ/internal/lungs/xenobiology/mirror
@@ -928,13 +907,10 @@
name = "create mirror"
desc = "Regurgitate a slick, mirrored surface where you are standing. Disgusting."
clothes_req = FALSE
- stat_allowed = CONSCIOUS
- invocation_type = "none"
action_icon = 'icons/mob/actions/actions_elites.dmi'
action_icon_state = "herald_mirror"
action_background_icon_state = "bg_default"
sound = 'sound/effects/splat.ogg'
- active = FALSE
base_cooldown = 3 MINUTES
antimagic_flags = NONE
var/quality
@@ -1279,8 +1255,6 @@
name = "Detonate"
desc = "Build up energy in your core, allowing for a fiery detonation!"
clothes_req = FALSE
- stat_allowed = CONSCIOUS
- invocation_type = "none"
action_icon_state = "genetic_incendiary"
action_background_icon_state = "bg_flayer"
max_charge_time = 10 SECONDS
@@ -1504,14 +1478,12 @@
desc = "Grow and detach a new head from yourself to send towards your enemies. Cast again to destroy any existing heads."
base_cooldown = 5 MINUTES
clothes_req = FALSE
- stat_allowed = CONSCIOUS
invocation_type = "*scream"
action_icon = 'icons/mob/actions/actions_elites.dmi'
action_icon_state = "head_detach"
action_background_icon_state = "bg_default"
sound = 'sound/effects/blood1.ogg'
sound = null
- active = FALSE
antimagic_flags = NONE
var/quality
var/mob/living/simple_animal/hostile/asteroid/elite/legionnairehead/xenobiology/newhead
diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm
index 134415ac136..9ee806c8877 100644
--- a/code/modules/response_team/ert_outfits.dm
+++ b/code/modules/response_team/ert_outfits.dm
@@ -340,7 +340,6 @@
/datum/outfit/job/response_team/medic/red
name = "RT Medic (Red)"
- rt_mob_job = "ERT Medical"
shoes = /obj/item/clothing/shoes/magboots
suit = /obj/item/clothing/suit/space/hardsuit/ert/medical
glasses = /obj/item/clothing/glasses/hud/health/sunglasses
@@ -416,7 +415,6 @@
uniform = /obj/item/clothing/under/rank/centcom/ert/chaplain
back = /obj/item/storage/backpack/ert/security
shoes = /obj/item/clothing/shoes/combat
- l_ear = /obj/item/radio/headset/ert/alt
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
mask = /obj/item/clothing/mask/gas/sechailer/swat
belt = /obj/item/storage/belt/security/response_team
@@ -502,7 +500,6 @@
back = /obj/item/storage/backpack/ert/janitor
belt = /obj/item/storage/belt/janitor/full
shoes = /obj/item/clothing/shoes/galoshes/dry
- l_ear = /obj/item/radio/headset/ert/alt
id = /obj/item/card/id/ert/janitorial
pda = /obj/item/pda/heads/ert/janitor
l_pocket = /obj/item/melee/classic_baton/telescopic
diff --git a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm
index b27c2b60d45..7e790749bfe 100644
--- a/code/modules/ruins/lavalandruin_code/dead_ratvar.dm
+++ b/code/modules/ruins/lavalandruin_code/dead_ratvar.dm
@@ -15,7 +15,6 @@
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
/obj/effect/clockwork
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF | FREEZE_PROOF
// An "overlay" used by clockwork walls and floors to appear normal to mesons.
/obj/effect/clockwork/overlay
@@ -168,7 +167,6 @@
randomsinglesprite = TRUE
icon_state = "shard_large"
base_icon_state = "shard_large"
- scatter_distance = 9
/obj/item/clockwork/alloy_shards/medium
w_class = WEIGHT_CLASS_TINY
@@ -224,7 +222,6 @@
name = "blind eye"
desc = "A heavy brass eye, its red iris fallen dark."
icon_state = "blind_eye"
- w_class = WEIGHT_CLASS_NORMAL
/obj/item/clockwork/component/belligerent_eye/lens_gem
name = "lens gem"
@@ -244,7 +241,6 @@
name = "onyx prism"
desc = "An onyx prism with a small aperture. It's very heavy."
icon_state = "onyx_prism"
- w_class = WEIGHT_CLASS_NORMAL
/obj/item/clockwork/component/geis_capacitor
name = "geis capacitor"
@@ -255,7 +251,6 @@
name = "fallen armor"
desc = "Lifeless chunks of armor. They're designed in a strange way and won't fit on you."
icon_state = "fallen_armor"
- w_class = WEIGHT_CLASS_NORMAL
/obj/item/clockwork/component/geis_capacitor/antennae
name = "mania motor antennae"
@@ -271,13 +266,11 @@
name = "smashed anima fragment"
desc = "Shattered chunks of metal. Damaged beyond repair and completely unusable."
icon_state = "smashed_anime_fragment"
- w_class = WEIGHT_CLASS_NORMAL
/obj/item/clockwork/component/replicant_alloy/replication_plate
name = "replication plate"
desc = "A flat, heavy disc of metal with a triangular formation on its surface."
icon_state = "replication_plate"
- w_class = WEIGHT_CLASS_NORMAL
/obj/item/clockwork/component/hierophant_ansible
name = "hierophant ansible"
@@ -288,7 +281,6 @@
name = "obelisk prism"
desc = "A prism that occasionally glows brightly. It seems not-quite there."
icon_state = "obelisk_prism"
- w_class = WEIGHT_CLASS_NORMAL
//Ratvarian spear
/obj/item/spear/ratvarian_spear
diff --git a/code/modules/ruins/lavalandruin_code/fountain_hall.dm b/code/modules/ruins/lavalandruin_code/fountain_hall.dm
index e62effb28c9..e5a8d57d4bf 100644
--- a/code/modules/ruins/lavalandruin_code/fountain_hall.dm
+++ b/code/modules/ruins/lavalandruin_code/fountain_hall.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/hand_of_god_structures.dmi'
icon_state = "sacrificealtar"
anchored = TRUE
- density = FALSE
can_buckle = TRUE
/obj/structure/sacrificealtar/attack_hand(mob/living/user)
diff --git a/code/modules/ruins/lavalandruin_code/pizzaparty.dm b/code/modules/ruins/lavalandruin_code/pizzaparty.dm
index 824cca61d5a..e72fe6c0c48 100644
--- a/code/modules/ruins/lavalandruin_code/pizzaparty.dm
+++ b/code/modules/ruins/lavalandruin_code/pizzaparty.dm
@@ -1,6 +1,5 @@
/obj/effect/spawner/random/pizzaparty
name = "pizza bomb spawner"
- icon = 'icons/effects/random_spawners.dmi'
icon_state = "pizzabox"
loot = list(
/obj/item/pizzabox/margherita = 2,
@@ -11,7 +10,6 @@
/obj/item/pizzabox/firecracker = 1,
/obj/item/pizzabox/pizza_bomb = 1
)
- spawn_loot_double = TRUE
/obj/structure/reagent_dispensers/water_cooler/pizzaparty
name = "punch cooler"
diff --git a/code/modules/ruins/lavalandruin_code/puzzle.dm b/code/modules/ruins/lavalandruin_code/puzzle.dm
index 3986eaa8130..3371293e59e 100644
--- a/code/modules/ruins/lavalandruin_code/puzzle.dm
+++ b/code/modules/ruins/lavalandruin_code/puzzle.dm
@@ -3,7 +3,6 @@
icon = 'icons/obj/items.dmi' //mapping
icon_state = "syndballoon"
invisibility = INVISIBILITY_ABSTRACT
- anchored = TRUE
var/list/elements
var/floor_type = /turf/simulated/floor/vault/lavaland_air
var/finished = FALSE
@@ -197,7 +196,6 @@
desc = "Puzzling..."
icon = 'icons/obj/lavaland/artefacts.dmi'
icon_state = "puzzle_pillar"
- anchored = FALSE
density = TRUE
var/id = 0
var/obj/effect/sliding_puzzle/source
diff --git a/code/modules/ruins/lavalandruin_code/seed_vault.dm b/code/modules/ruins/lavalandruin_code/seed_vault.dm
index bde7ca88cdc..03586e92ee7 100644
--- a/code/modules/ruins/lavalandruin_code/seed_vault.dm
+++ b/code/modules/ruins/lavalandruin_code/seed_vault.dm
@@ -13,9 +13,6 @@
role_name = "lifebringer"
icon = 'icons/obj/lavaland/spawners.dmi'
icon_state = "terrarium"
- density = TRUE
- roundstart = FALSE
- death = FALSE
mob_species = /datum/species/diona/pod
description = "You are a diona on Lavaland with access to a full botany setup. Perfect to mess around with plants in peace."
flavour_text = "You are a sentient ecosystem, an example of the mastery over life that your creators possessed. Your masters, benevolent as they were, created uncounted \
diff --git a/code/modules/ruins/lavalandruin_code/sin_ruins.dm b/code/modules/ruins/lavalandruin_code/sin_ruins.dm
index 40fb2ee0d57..ce13fcd6aa7 100644
--- a/code/modules/ruins/lavalandruin_code/sin_ruins.dm
+++ b/code/modules/ruins/lavalandruin_code/sin_ruins.dm
@@ -102,7 +102,6 @@
desc = "RICH! YES! YOU KNEW IT WAS WORTH IT! YOU'RE RICH! RICH! RICH!"
icon = 'icons/obj/storage.dmi'
icon_state = "moneybag"
- anchored = FALSE
density = TRUE
/obj/structure/cursed_money/Initialize(mapload)
@@ -134,7 +133,6 @@
/obj/effect/gluttony
name = "gluttony's wall"
desc = "Only those who truly indulge may pass."
- anchored = TRUE
density = TRUE
icon_state = "blob"
icon = 'icons/mob/blob.dmi'
@@ -158,7 +156,6 @@
/obj/structure/mirror/magic/pride
name = "pride's mirror"
desc = "Pride cometh before the..."
- icon_state = "magic_mirror"
/obj/structure/mirror/magic/pride/curse(mob/user)
user.visible_message("The ground splits beneath [user] as [user.p_their()] hand leaves the mirror!", \
@@ -187,9 +184,7 @@
icon_state = "render"
item_state = "knife"
force = 18
- throwforce = 10
w_class = WEIGHT_CLASS_NORMAL
- hitsound = 'sound/weapons/bladeslice.ogg'
new_attack_chain = TRUE
/obj/item/kitchen/knife/envy/after_attack(atom/target, mob/user, proximity_flag, click_parameters)
diff --git a/code/modules/ruins/ruin_areas.dm b/code/modules/ruins/ruin_areas.dm
index d1cc859aaa2..be8323edd9f 100644
--- a/code/modules/ruins/ruin_areas.dm
+++ b/code/modules/ruins/ruin_areas.dm
@@ -11,14 +11,12 @@ GLOBAL_LIST_INIT(ruin_prototypes, list(/area/ruin,
/area/ruin
name = "\improper Unexplored Location"
icon_state = "away"
- has_gravity = TRUE
there_can_be_many = TRUE
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
ambientsounds = RUINS_SOUNDS
sound_environment = SOUND_ENVIRONMENT_STONEROOM
/area/ruin/unpowered
- always_unpowered = FALSE
/area/ruin/powered
requires_power = FALSE
diff --git a/code/modules/ruins/syndicate_space_base.dm b/code/modules/ruins/syndicate_space_base.dm
index ed93a141da1..a4ef8307708 100644
--- a/code/modules/ruins/syndicate_space_base.dm
+++ b/code/modules/ruins/syndicate_space_base.dm
@@ -25,7 +25,6 @@
/obj/effect/mob_spawn/human/alive/spacebase_syndicate
name = "Syndicate Researcher sleeper"
role_name = "syndicate researcher"
- icon = 'icons/obj/cryogenic2.dmi'
icon_state = "sleeper_s"
important_info = "Do not work against traitors or nukies. Do not leave the base."
description = "Experiment with deadly chems, plants, viruses, etc in peace."
diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm
index 09542fb50db..aa8709d884a 100644
--- a/code/modules/shuttle/emergency.dm
+++ b/code/modules/shuttle/emergency.dm
@@ -636,7 +636,6 @@
dwidth = 2
width = 8
height = 8
- dir = 4
/obj/docking_port/mobile/emergency/backup/register()
var/current_emergency = SSshuttle.emergency
diff --git a/code/modules/shuttle/ert_shuttle.dm b/code/modules/shuttle/ert_shuttle.dm
index b32f4b480a3..8dd3094b6a7 100644
--- a/code/modules/shuttle/ert_shuttle.dm
+++ b/code/modules/shuttle/ert_shuttle.dm
@@ -16,13 +16,9 @@
/obj/machinery/computer/camera_advanced/shuttle_docker/ert
name = "specops navigation computer"
desc = "Used to designate a precise transit location for the specops shuttle."
- icon_screen = "navigation"
- icon_keyboard = "med_key"
shuttleId = "specops"
shuttlePortId = "specops_custom"
view_range = 13
- x_offset = 0
- y_offset = 0
resistance_flags = INDESTRUCTIBLE
flags = NODECONSTRUCT
access_mining = FALSE
diff --git a/code/modules/shuttle/lance_docking_targeter.dm b/code/modules/shuttle/lance_docking_targeter.dm
index 78b237dc433..3dcfc28bfe2 100644
--- a/code/modules/shuttle/lance_docking_targeter.dm
+++ b/code/modules/shuttle/lance_docking_targeter.dm
@@ -107,7 +107,6 @@
name = "lance docking port"
id = "emergency_home"
height = 50
- dheight = 0
width = 19
dwidth = 9
@@ -115,4 +114,3 @@
icon_state = null
gpstag = "Lance Docking Beacon"
desc = "It is not reccomended to stand here."
- invisibility = 100
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index 91167373968..3111600bd47 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -283,7 +283,6 @@
/datum/action/innate/camera_jump/shuttle_docker
name = "Jump to Location"
- button_overlay_icon_state = "camera_jump"
/datum/action/innate/camera_jump/shuttle_docker/Activate()
if(QDELETED(target) || !isliving(target))
diff --git a/code/modules/shuttle/ripple.dm b/code/modules/shuttle/ripple.dm
index bc7ba0e05ed..17343517d6a 100644
--- a/code/modules/shuttle/ripple.dm
+++ b/code/modules/shuttle/ripple.dm
@@ -6,8 +6,6 @@
icon = 'icons/turf/floors/ripple.dmi'
icon_state = "ripple-0"
base_icon_state = "ripple"
- anchored = TRUE
- density = FALSE
smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_RIPPLE)
canSmoothWith = list(SMOOTH_GROUP_RIPPLE)
@@ -28,7 +26,6 @@
icon = 'icons/turf/walls/hierophant_wall_temp.dmi'
icon_state = "hierophant_wall_temp-0"
base_icon_state = "hierophant_wall_temp"
- smoothing_flags = SMOOTH_BITMASK
smoothing_groups = list(SMOOTH_GROUP_HIERO_WALL)
canSmoothWith = list(SMOOTH_GROUP_HIERO_WALL)
color = rgb(255, 0, 0)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 924c92a488a..5cd0b43bef0 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -1102,15 +1102,10 @@
/obj/machinery/computer/camera_advanced/shuttle_docker/admin
name = "Admin shuttle navigation computer"
desc = "Used to designate a precise transit location for the admin shuttle."
- icon_screen = "navigation"
- icon_keyboard = "med_key"
shuttleId = "admin"
shuttlePortId = "admin_custom"
view_range = 14
- x_offset = 0
- y_offset = 0
resistance_flags = INDESTRUCTIBLE
- access_mining = TRUE
/obj/machinery/computer/shuttle/trade
name = "Freighter Console"
diff --git a/code/modules/shuttle/syndicate_shuttles.dm b/code/modules/shuttle/syndicate_shuttles.dm
index 697819a586a..f5eb52e912e 100644
--- a/code/modules/shuttle/syndicate_shuttles.dm
+++ b/code/modules/shuttle/syndicate_shuttles.dm
@@ -84,8 +84,6 @@
desc = "Used to designate a precise transit location for the SST shuttle."
shuttleId = "sst"
shuttlePortId = "sst_custom"
- bubble_icon = "syndibot"
- view_range = 13
x_offset = 0
y_offset = 0
@@ -94,8 +92,6 @@
desc = "Used to designate a precise transit location for the SIT shuttle."
shuttleId = "sit"
shuttlePortId = "sit_custom"
- bubble_icon = "syndibot"
- view_range = 13
x_offset = 0
y_offset = 0
diff --git a/code/modules/smithing/machinery/casting_basin.dm b/code/modules/smithing/machinery/casting_basin.dm
index c19d23bd01f..a9a155b02cb 100644
--- a/code/modules/smithing/machinery/casting_basin.dm
+++ b/code/modules/smithing/machinery/casting_basin.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/machines/smithing_machines.dmi'
icon_state = "casting_open"
max_integrity = 100
- pixel_x = 0 // 1x1
pixel_y = 0
bound_height = 32
bound_width = 32
diff --git a/code/modules/smithing/machinery/kinetic_assembler.dm b/code/modules/smithing/machinery/kinetic_assembler.dm
index 9711104df68..851deb05ab2 100644
--- a/code/modules/smithing/machinery/kinetic_assembler.dm
+++ b/code/modules/smithing/machinery/kinetic_assembler.dm
@@ -4,7 +4,6 @@
icon = 'icons/obj/machines/smithing_machines.dmi'
icon_state = "assembler"
max_integrity = 100
- pixel_x = 0 // 1x1
pixel_y = 0
bound_height = 32
bound_width = 32
@@ -257,7 +256,6 @@
icon = 'icons/obj/machines/smithing_machines.dmi'
icon_state = "assembler"
max_integrity = 100
- pixel_x = 0 // 1x1
pixel_y = 0
bound_height = 32
bound_width = 32
diff --git a/code/modules/smithing/machinery/lava_furnace.dm b/code/modules/smithing/machinery/lava_furnace.dm
index edbcd8c7798..f55acf60071 100644
--- a/code/modules/smithing/machinery/lava_furnace.dm
+++ b/code/modules/smithing/machinery/lava_furnace.dm
@@ -1,7 +1,6 @@
/obj/machinery/smithing/lava_furnace
name = "lava furnace"
desc = "A furnace that uses the innate heat of lavaland to reheat metal that has not been fully reshaped."
- icon = 'icons/obj/machines/large_smithing_machines.dmi'
icon_state = "furnace_off"
operation_sound = 'sound/surgery/cautery1.ogg'
/// How much the device heats the component
diff --git a/code/modules/smithing/machinery/power_hammer.dm b/code/modules/smithing/machinery/power_hammer.dm
index ee1f81a9cea..28314b1aa80 100644
--- a/code/modules/smithing/machinery/power_hammer.dm
+++ b/code/modules/smithing/machinery/power_hammer.dm
@@ -1,8 +1,6 @@
/obj/machinery/smithing/power_hammer
name = "power hammer"
desc = "A heavy-duty pneumatic hammer designed to shape and mold molten metal."
- icon = 'icons/obj/machines/large_smithing_machines.dmi'
- icon_state = "power_hammer"
operation_sound = 'sound/magic/fellowship_armory.ogg'
/obj/machinery/smithing/power_hammer/Initialize(mapload)
diff --git a/code/modules/smithing/smith_component.dm b/code/modules/smithing/smith_component.dm
index 19c362556b8..c31c89f53a7 100644
--- a/code/modules/smithing/smith_component.dm
+++ b/code/modules/smithing/smith_component.dm
@@ -1,7 +1,5 @@
/obj/item/smithed_item/component
name = "Debug smithed component"
- icon = 'icons/obj/smithing.dmi'
- icon_state = "debug"
desc = "Debug smithed component part. If you see this, notify the development team."
/// What type of part is it
var/part_type
diff --git a/code/modules/smithing/smith_machinery.dm b/code/modules/smithing/smith_machinery.dm
index 67647c142e8..b3f417b4908 100644
--- a/code/modules/smithing/smith_machinery.dm
+++ b/code/modules/smithing/smith_machinery.dm
@@ -3,8 +3,6 @@
desc = "A large unknown smithing machine. If you see this, there's a problem and you should notify the development team."
icon = 'icons/obj/machines/large_smithing_machines.dmi'
icon_state = "power_hammer"
- max_integrity = 200
- pixel_x = 0 // 2x2
pixel_y = -32
bound_height = 64
bound_width = 64
diff --git a/code/modules/smithing/smithed_items/tool_bits.dm b/code/modules/smithing/smithed_items/tool_bits.dm
index e3d428ca619..e7dc5853088 100644
--- a/code/modules/smithing/smithed_items/tool_bits.dm
+++ b/code/modules/smithing/smithed_items/tool_bits.dm
@@ -145,7 +145,6 @@
name = "adminium bit"
desc = "A hyper-advanced bit restricted to central command officials."
speed_mod = -1
- efficiency_mod = 1
failure_rate = -20
durability = 300
quality = /datum/smith_quality/masterwork
diff --git a/code/modules/station_goals/bluespace_tap.dm b/code/modules/station_goals/bluespace_tap.dm
index 7b153f42cae..0033226e62e 100644
--- a/code/modules/station_goals/bluespace_tap.dm
+++ b/code/modules/station_goals/bluespace_tap.dm
@@ -82,7 +82,6 @@
max_integrity = 300
pixel_x = -32 //shamelessly stolen from dna vault
pixel_y = -32
- power_state = NO_POWER_USE // power usage is handelled manually
density = TRUE
interact_offline = TRUE
luminosity = 1
diff --git a/code/modules/station_goals/secondary/bar/variety_drinks.dm b/code/modules/station_goals/secondary/bar/variety_drinks.dm
index 778d1055282..31582df2d4d 100644
--- a/code/modules/station_goals/secondary/bar/variety_drinks.dm
+++ b/code/modules/station_goals/secondary/bar/variety_drinks.dm
@@ -1,6 +1,5 @@
/datum/station_goal/secondary/variety_reagent/bar
name = "Variety of Drinks"
- progress_type = /datum/secondary_goal_progress/variety_reagent
department = "Bar"
generic_name_plural = "alcoholic drinks"
weight = 1
diff --git a/code/modules/station_goals/secondary/medical/variety_medicine.dm b/code/modules/station_goals/secondary/medical/variety_medicine.dm
index 37f3543bdb7..5ee4093e3cb 100644
--- a/code/modules/station_goals/secondary/medical/variety_medicine.dm
+++ b/code/modules/station_goals/secondary/medical/variety_medicine.dm
@@ -1,6 +1,5 @@
/datum/station_goal/secondary/variety_reagent/medchem
name = "Variety of Medicine"
- progress_type = /datum/secondary_goal_progress/variety_reagent
department = "Chemistry"
generic_name_plural = "medicines"
weight = 1
diff --git a/code/modules/station_goals/secondary/science/variety_chemicals.dm b/code/modules/station_goals/secondary/science/variety_chemicals.dm
index de3a1bfdd01..a660d467258 100644
--- a/code/modules/station_goals/secondary/science/variety_chemicals.dm
+++ b/code/modules/station_goals/secondary/science/variety_chemicals.dm
@@ -1,6 +1,5 @@
/datum/station_goal/secondary/variety_reagent/scichem
name = "Variety of Chemicals"
- progress_type = /datum/secondary_goal_progress/variety_reagent
different_types = 5
department = "Science"
generic_name_plural = "chemicals"
diff --git a/code/modules/supply/supply_console.dm b/code/modules/supply/supply_console.dm
index ffd009a052c..7c974eeee25 100644
--- a/code/modules/supply/supply_console.dm
+++ b/code/modules/supply/supply_console.dm
@@ -529,7 +529,6 @@
/obj/machinery/computer/supplycomp/public
name = "Supply Ordering Console"
desc = "Used to order supplies from cargo staff."
- icon = 'icons/obj/computer.dmi'
icon_screen = "request"
circuit = /obj/item/circuitboard/ordercomp
req_access = list()
diff --git a/code/modules/supply/supply_packs/pack_emergency.dm b/code/modules/supply/supply_packs/pack_emergency.dm
index fc056a9d854..0fa71fdb5a3 100644
--- a/code/modules/supply/supply_packs/pack_emergency.dm
+++ b/code/modules/supply/supply_packs/pack_emergency.dm
@@ -23,9 +23,7 @@
/obj/item/storage/box/oxygen_grenades,
/obj/item/storage/box/oxygen_grenades)
cost = 400
- containertype = /obj/structure/closet/crate/internals
containername = "emergency crate"
- group = SUPPLY_EMERGENCY
/datum/supply_packs/emergency/glowstick/emergency
name = "Emergency Glowstick Crate"
diff --git a/code/modules/supply/supply_packs/pack_engineering.dm b/code/modules/supply/supply_packs/pack_engineering.dm
index 96db9d966b7..ab1c60fcfc0 100644
--- a/code/modules/supply/supply_packs/pack_engineering.dm
+++ b/code/modules/supply/supply_packs/pack_engineering.dm
@@ -33,7 +33,6 @@
/datum/supply_packs/vending/engivend
name = "Engineering Vendor Supply Crate"
- cost = 50
contains = list(/obj/item/vending_refill/engivend,
/obj/item/vending_refill/youtool)
containername = "engineering supply crate"
@@ -125,7 +124,6 @@
name = "Field Generator Crate"
contains = list(/obj/machinery/field/generator,
/obj/machinery/field/generator)
- cost = 100
containername = "field generator crate"
/datum/supply_packs/engineering/engine/sing_gen
@@ -145,14 +143,12 @@
contains = list(/obj/machinery/power/tesla_coil,
/obj/machinery/power/tesla_coil,
/obj/machinery/power/tesla_coil)
- cost = 100
containername = "tesla coil crate"
/datum/supply_packs/engineering/engine/grounding
name = "Grounding Rod Crate"
contains = list(/obj/machinery/power/grounding_rod,
/obj/machinery/power/grounding_rod)
- cost = 100
containername = "grounding rod crate"
/datum/supply_packs/engineering/engine/collector
@@ -160,7 +156,6 @@
contains = list(/obj/machinery/power/rad_collector,
/obj/machinery/power/rad_collector,
/obj/machinery/power/rad_collector)
- cost = 100
containername = "collector crate"
/datum/supply_packs/engineering/engine/particle_accelerator
@@ -219,9 +214,7 @@
name = "Supermatter Shard Crate"
contains = list(/obj/machinery/atmospherics/supermatter_crystal/shard)
cost = 750 //So cargo thinks twice before killing themselves with it
- containertype = /obj/structure/closet/crate/secure/engineering
containername = "supermatter shard crate"
- access = ACCESS_CE
/* Commented out as the TEG is fully problematic. If the syndie base is changed to be dependant on another powersource, we can look at a rework.
/datum/supply_packs/engineering/engine/teg
diff --git a/code/modules/supply/supply_packs/pack_medical.dm b/code/modules/supply/supply_packs/pack_medical.dm
index 41a868dc078..6c35eed849b 100644
--- a/code/modules/supply/supply_packs/pack_medical.dm
+++ b/code/modules/supply/supply_packs/pack_medical.dm
@@ -26,7 +26,6 @@
/obj/item/storage/box/iv_bags,
/obj/item/vending_refill/medical)
cost = 400
- containertype = /obj/structure/closet/crate/medical
containername = "medical supplies crate"
/datum/supply_packs/medical/firstaid
@@ -119,7 +118,6 @@
/datum/supply_packs/medical/vending/clothingvendor
name = "Medical Clothing Vendors Crate"
- cost = 100
contains = list(/obj/item/vending_refill/medidrobe,
/obj/item/vending_refill/chemdrobe,
/obj/item/vending_refill/virodrobe)
diff --git a/code/modules/supply/supply_packs/pack_miscellaneous.dm b/code/modules/supply/supply_packs/pack_miscellaneous.dm
index 53ac05230bf..86c4638f164 100644
--- a/code/modules/supply/supply_packs/pack_miscellaneous.dm
+++ b/code/modules/supply/supply_packs/pack_miscellaneous.dm
@@ -1,6 +1,5 @@
/datum/supply_packs/misc
name = "HEADER"
- group = SUPPLY_MISC
/datum/supply_packs/misc/mule
name = "MULEbot Crate"
@@ -526,7 +525,6 @@
/datum/supply_packs/misc/vending/clothingvendor/cargo
name = "Cargo Clothing Vendors Crate"
- cost = 50
contains = list(/obj/item/vending_refill/cargodrobe,
/obj/item/vending_refill/exploredrobe,
/obj/item/vending_refill/minedrobe)
diff --git a/code/modules/supply/supply_packs/pack_organic.dm b/code/modules/supply/supply_packs/pack_organic.dm
index 7ef91a8444f..5b3278a6cba 100644
--- a/code/modules/supply/supply_packs/pack_organic.dm
+++ b/code/modules/supply/supply_packs/pack_organic.dm
@@ -421,7 +421,6 @@
/obj/item/seeds/eggplant/eggy,
/obj/item/seeds/random,
/obj/item/seeds/random)
- cost = 200
containername = "exotic seeds crate"
/datum/supply_packs/organic/hydroponics/beekeeping_fullkit
diff --git a/code/modules/supply/supply_packs/pack_science.dm b/code/modules/supply/supply_packs/pack_science.dm
index 1fedd7947d7..0f6149c2753 100644
--- a/code/modules/supply/supply_packs/pack_science.dm
+++ b/code/modules/supply/supply_packs/pack_science.dm
@@ -91,7 +91,6 @@
containertype = /obj/structure/closet/crate/secure/plasma
containername = "plasma assembly crate"
access = ACCESS_TOX_STORAGE
- group = SUPPLY_SCIENCE
/datum/supply_packs/science/shieldwalls
name = "Shield Generators Crate"
diff --git a/code/modules/supply/supply_packs/pack_security.dm b/code/modules/supply/supply_packs/pack_security.dm
index a4e19f7ae2a..456fcd55c2d 100644
--- a/code/modules/supply/supply_packs/pack_security.dm
+++ b/code/modules/supply/supply_packs/pack_security.dm
@@ -106,7 +106,6 @@
///// Armory stuff
/datum/supply_packs/security/armory
- name = "HEADER"
containertype = /obj/structure/closet/crate/secure/weapon
access = ACCESS_ARMORY
announce_beacons = list("Security" = list("Warden", "Head of Security's Desk"))
diff --git a/code/modules/supply/supply_packs/pack_shuttle.dm b/code/modules/supply/supply_packs/pack_shuttle.dm
index 87e2ae3d4a3..8bada7b78fd 100644
--- a/code/modules/supply/supply_packs/pack_shuttle.dm
+++ b/code/modules/supply/supply_packs/pack_shuttle.dm
@@ -63,7 +63,6 @@
/datum/supply_packs/abstract/admin_notify/donations
name = "Donation to Lonely Corgi Foundation"
special = TRUE
- special_enabled = FALSE
manifest = "1% of every donation goes towards supporting corgis in need."
cost = 500
diff --git a/code/modules/supply/supply_packs/pack_vendor.dm b/code/modules/supply/supply_packs/pack_vendor.dm
index 96937875683..ad097a6af70 100644
--- a/code/modules/supply/supply_packs/pack_vendor.dm
+++ b/code/modules/supply/supply_packs/pack_vendor.dm
@@ -44,7 +44,6 @@
name = "Cigarette Supply Crate"
contains = list(/obj/item/vending_refill/cigarette)
containername = "cigarette supply crate"
- containertype = /obj/structure/closet/crate
/datum/supply_packs/vending/dinnerware
name = "Dinnerware Supply Crate"
diff --git a/code/modules/surgery/bio_chip_removal.dm b/code/modules/surgery/bio_chip_removal.dm
index c447c3dfe95..c2541971d9a 100644
--- a/code/modules/surgery/bio_chip_removal.dm
+++ b/code/modules/surgery/bio_chip_removal.dm
@@ -13,10 +13,8 @@
/datum/surgery_step/generic/cauterize
)
possible_locs = list(BODY_ZONE_CHEST)
- requires_organic_bodypart = TRUE
/datum/surgery/implant_removal/synth
- name = "Bio-chip Removal"
steps = list(
/datum/surgery_step/robotics/external/unscrew_hatch,
/datum/surgery_step/robotics/external/open_hatch,
diff --git a/code/modules/surgery/cavity_implant.dm b/code/modules/surgery/cavity_implant.dm
index 37a0ee5b56f..3d7e012a50b 100644
--- a/code/modules/surgery/cavity_implant.dm
+++ b/code/modules/surgery/cavity_implant.dm
@@ -67,7 +67,6 @@
/datum/surgery/intermediate/bleeding
)
- insert_self_after = TRUE
/datum/surgery_step/proxy/cavity_manipulation/robotic
name = "Robotic Cavity Manipulation (proxy)"
diff --git a/code/modules/surgery/limb_reattach.dm b/code/modules/surgery/limb_reattach.dm
index 4e6cbc6f4fa..ee4582c34b4 100644
--- a/code/modules/surgery/limb_reattach.dm
+++ b/code/modules/surgery/limb_reattach.dm
@@ -7,7 +7,6 @@
name = "Amputation"
steps = list(/datum/surgery_step/generic/amputate)
possible_locs = list(BODY_ZONE_HEAD, BODY_ZONE_L_ARM, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_R_ARM, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_R_LEG, BODY_ZONE_PRECISE_R_FOOT, BODY_ZONE_L_LEG, BODY_ZONE_PRECISE_L_FOOT, BODY_ZONE_PRECISE_GROIN)
- requires_organic_bodypart = TRUE
cancel_on_organ_change = FALSE // don't stop the surgery when removing limbs
/datum/surgery/amputation/can_start(mob/user, mob/living/carbon/target)
@@ -81,7 +80,6 @@
/datum/surgery_step/limb
- can_infect = FALSE
/datum/surgery_step/limb/attach
name = "attach limb"
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 64aa4c7691e..23191f787ee 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -590,9 +590,7 @@
inhand_x_dimension = 32
inhand_y_dimension = 32
item_state = "shell_cannon"
- w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_LIGHT
- force = 10
mag_type = /obj/item/ammo_box/magazine/internal/shot/shell_cannon
unique_reskin = FALSE
can_sawoff = FALSE
@@ -619,7 +617,6 @@
name = "shell launch system internal magazine"
ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
max_ammo = 1
- multiload = FALSE
/obj/item/organ/internal/cyberimp/arm/shell_launcher
name = "shell launch system implant"
@@ -719,7 +716,6 @@
attack_verb = list("slamed", "punched", "parried", "judged", "styled on", "disrespected", "interrupted", "gored")
hitsound = 'sound/effects/bang.ogg'
light_power = 3
- light_range = 0
light_color = "#9933ff"
hit_reaction_chance = -1
flags = ABSTRACT
@@ -844,7 +840,6 @@
name = "mantis blade"
desc = "A blade designed to be hidden just beneath the skin. The brain is directly linked to this bad boy, allowing it to spring into action. \
When both blades are equipped, they enable the user to perform double attacks."
- icon = 'icons/obj/weapons/melee.dmi'
lefthand_file = 'icons/mob/inhands/implants_lefthand.dmi'
righthand_file = 'icons/mob/inhands/implants_righthand.dmi'
hitsound = 'sound/weapons/bladeslice.ogg'
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index 4b14d50ae79..e4c8a70d684 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -225,10 +225,8 @@
emp_proof = TRUE
/obj/item/organ/internal/cyberimp/brain/anti_sleep/hardened/compatible
- name = "Hardened Neural Jumpstarter implant"
desc = "A military-grade version of the standard implant, for NT's more elite forces. This one is compatible with the CNS Rebooter implant."
slot = "brain_antisleep"
- emp_proof = TRUE
/obj/item/organ/internal/cyberimp/brain/clown_voice
name = "Comical implant"
@@ -384,7 +382,6 @@
desc = "Activates your Qani-Laaca computer and grants you its powers. LMB: Short, safer activation. ALT/MIDDLE: Longer, more powerful, more dangerous activation."
button_overlay_icon = 'icons/obj/surgery.dmi'
button_overlay_icon_state = "sandy"
- check_flags = AB_CHECK_CONSCIOUS
/// Keeps track of how much mephedrone we inject into people on activation
var/injection_amount = 10
@@ -452,7 +449,6 @@
implant_overlay = null
implant_color = null
slot = "brain_antistun"
- w_class = WEIGHT_CLASS_SMALL
origin_tech = "materials=4;combat=6;biotech=6;powerstorage=2;syndicate=3"
stealth_level = 4 //Only surgery or a body scanner with the highest tier of stock parts can detect this.
@@ -502,10 +498,8 @@
/datum/spell/hackerman_deck
name = "Activate Ranged Hacking"
desc = "Click on any machine to hack them. Has a short range of only three tiles."
- base_cooldown = 10 SECONDS
clothes_req = FALSE
invocation = "none"
- invocation_type = "none"
antimagic_flags = NONE
selection_activated_message = "You warm up your Binyat deck, there's an idle buzzing at the back of your mind as it awaits a target."
selection_deactivated_message = "Your hacking deck makes an almost disappointed sounding buzz at the back of your mind as it powers down."
@@ -594,7 +588,6 @@
desc = "implants for the organs in your torso."
icon_state = "chest_implant"
implant_overlay = "chest_implant_overlay"
- parent_organ = "chest"
/obj/item/organ/internal/cyberimp/chest/nutriment
name = "Nutriment pump implant"
diff --git a/code/modules/surgery/organs/body_egg.dm b/code/modules/surgery/organs/body_egg.dm
index 83bea083f36..0affe9474bc 100644
--- a/code/modules/surgery/organs/body_egg.dm
+++ b/code/modules/surgery/organs/body_egg.dm
@@ -3,7 +3,6 @@
desc = "All slimy and yuck."
icon_state = "innards"
origin_tech = "biotech=5"
- parent_organ = "chest"
slot = "parasite_egg"
/obj/item/organ/internal/body_egg/on_find(mob/living/finder)
diff --git a/code/modules/surgery/organs/brain.dm b/code/modules/surgery/organs/brain.dm
index c1e52871a9b..9880d58bbba 100644
--- a/code/modules/surgery/organs/brain.dm
+++ b/code/modules/surgery/organs/brain.dm
@@ -2,8 +2,6 @@
name = "brain"
max_damage = 120
icon_state = "brain2"
- force = 1.0
- w_class = WEIGHT_CLASS_SMALL
throwforce = 1.0
throw_speed = 3
throw_range = 5
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index d2c5426fc3d..dfaa539e7c6 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -2,7 +2,6 @@
name = "heart"
icon_state = "heart-on"
organ_tag = "heart"
- parent_organ = "chest"
slot = "heart"
origin_tech = "biotech=5"
dead_icon = "heart-off"
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index d7da39f086e..a42d9bd963d 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -1,7 +1,6 @@
/obj/item/organ/internal/lungs
name = "lungs"
icon_state = "lungs"
- parent_organ = "chest"
slot = "lungs"
organ_tag = "lungs"
gender = PLURAL
@@ -13,7 +12,6 @@
name = "plasma filter"
desc = "A spongy rib-shaped mass for filtering plasma from the air."
icon = 'icons/obj/species_organs/plasmaman.dmi'
- icon_state = "lungs"
organ_datums = list(/datum/organ/lungs/plasmamen)
@@ -21,7 +19,6 @@
name = "vox lungs"
desc = "They're filled with dust....wow."
icon = 'icons/obj/species_organs/vox.dmi'
- icon_state = "lungs"
sterile = TRUE
organ_datums = list(/datum/organ/lungs/vox)
diff --git a/code/modules/surgery/organs/organ_external.dm b/code/modules/surgery/organs/organ_external.dm
index 7b9b06cfdd5..c56d4271cb6 100644
--- a/code/modules/surgery/organs/organ_external.dm
+++ b/code/modules/surgery/organs/organ_external.dm
@@ -3,9 +3,7 @@
****************************************************/
/obj/item/organ/external
name = "external"
- min_broken_damage = 30
max_damage = 0
- dir = SOUTH
organ_tag = "limb"
blocks_emissive = FALSE
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index a97ef8daecf..d74273d7a7d 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -2,7 +2,6 @@
origin_tech = "biotech=3"
force = 1
w_class = WEIGHT_CLASS_SMALL
- throwforce = 0
var/slot
// DO NOT add slots with matching names to different zones - it will break internal_organs_slot list!
var/non_primary = 0
diff --git a/code/modules/surgery/organs/robolimbs.dm b/code/modules/surgery/organs/robolimbs.dm
index 6866578b0ef..aa54a73e473 100644
--- a/code/modules/surgery/organs/robolimbs.dm
+++ b/code/modules/surgery/organs/robolimbs.dm
@@ -126,7 +126,6 @@ GLOBAL_DATUM(basic_robolimb, /datum/robolimb)
desc = "This limb has a rubbery fleshtone covering with visible seams."
icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_main.dmi'
sprite_sheets = list("Vox" = 'icons/mob/human_races/vox/cyberlimbs/wardtakahashi.dmi')
- has_subtypes = 2
/datum/robolimb/shellguard
company = "Shellguard Munitions Standard Series"
diff --git a/code/modules/surgery/organs/subtypes/diona_organs.dm b/code/modules/surgery/organs/subtypes/diona_organs.dm
index a90a96de28a..03814e5204b 100644
--- a/code/modules/surgery/organs/subtypes/diona_organs.dm
+++ b/code/modules/surgery/organs/subtypes/diona_organs.dm
@@ -42,13 +42,11 @@
convertable_children = list(/obj/item/organ/external/foot/right/diona)
/obj/item/organ/external/foot/diona
- name = "left foot"
max_damage = 20
min_broken_damage = 10
amputation_point = "branch"
/obj/item/organ/external/foot/right/diona
- name = "right foot"
max_damage = 20
min_broken_damage = 10
amputation_point = "branch"
diff --git a/code/modules/surgery/organs/subtypes/drask_organs.dm b/code/modules/surgery/organs/subtypes/drask_organs.dm
index 4d94b9e84d8..f0fbf6a40b7 100644
--- a/code/modules/surgery/organs/subtypes/drask_organs.dm
+++ b/code/modules/surgery/organs/subtypes/drask_organs.dm
@@ -18,9 +18,7 @@
/obj/item/organ/internal/brain/drask
icon = 'icons/obj/species_organs/drask.dmi'
- icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/drask.dmi'
- mmi_icon_state = "mmi_full"
/obj/item/organ/internal/eyes/drask
name = "drask eyeballs"
diff --git a/code/modules/surgery/organs/subtypes/grey_organs.dm b/code/modules/surgery/organs/subtypes/grey_organs.dm
index 132a79faae0..eb7e40ced9c 100644
--- a/code/modules/surgery/organs/subtypes/grey_organs.dm
+++ b/code/modules/surgery/organs/subtypes/grey_organs.dm
@@ -7,9 +7,7 @@
/obj/item/organ/internal/brain/grey
desc = "A large brain."
icon = 'icons/obj/species_organs/grey.dmi'
- icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/grey.dmi'
- mmi_icon_state = "mmi_full"
/obj/item/organ/internal/brain/grey/insert(mob/living/carbon/M, special = 0)
..()
diff --git a/code/modules/surgery/organs/subtypes/kidan_organs.dm b/code/modules/surgery/organs/subtypes/kidan_organs.dm
index 58d360e6d4e..63b2996cee6 100644
--- a/code/modules/surgery/organs/subtypes/kidan_organs.dm
+++ b/code/modules/surgery/organs/subtypes/kidan_organs.dm
@@ -118,9 +118,7 @@
/obj/item/organ/internal/brain/kidan
icon = 'icons/obj/species_organs/kidan.dmi'
- icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/kidan.dmi'
- mmi_icon_state = "mmi_full"
/obj/item/organ/internal/lungs/kidan
name = "kidan lungs"
diff --git a/code/modules/surgery/organs/subtypes/machine_organs.dm b/code/modules/surgery/organs/subtypes/machine_organs.dm
index c5b60e33263..4dab9d25e46 100644
--- a/code/modules/surgery/organs/subtypes/machine_organs.dm
+++ b/code/modules/surgery/organs/subtypes/machine_organs.dm
@@ -106,7 +106,6 @@
desc = "A small, powerful cell for use in fully prosthetic bodies."
icon_state = "cell"
organ_tag = "heart"
- parent_organ = "chest"
dead_icon = "cell_bork"
slot = "heart"
vital = TRUE
diff --git a/code/modules/surgery/organs/subtypes/moth_organs.dm b/code/modules/surgery/organs/subtypes/moth_organs.dm
index 5d5af05b8a8..c7b47bfaf7a 100644
--- a/code/modules/surgery/organs/subtypes/moth_organs.dm
+++ b/code/modules/surgery/organs/subtypes/moth_organs.dm
@@ -14,9 +14,7 @@
/obj/item/organ/internal/brain/nian
icon = 'icons/obj/species_organs/nian.dmi'
- icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/nian.dmi'
- mmi_icon_state = "mmi_full"
/obj/item/organ/internal/lungs/nian
name = "nian lungs"
diff --git a/code/modules/surgery/organs/subtypes/plasmaman_organs.dm b/code/modules/surgery/organs/subtypes/plasmaman_organs.dm
index 4de19d0950e..97512e3a1c5 100644
--- a/code/modules/surgery/organs/subtypes/plasmaman_organs.dm
+++ b/code/modules/surgery/organs/subtypes/plasmaman_organs.dm
@@ -12,9 +12,7 @@
/obj/item/organ/internal/brain/plasmaman
icon = 'icons/obj/species_organs/plasmaman.dmi'
- icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/plasmaman.dmi'
- mmi_icon_state = "mmi_full"
/obj/item/organ/internal/kidneys/plasmaman
name = "plasmaman kidneys"
diff --git a/code/modules/surgery/organs/subtypes/skrell_organs.dm b/code/modules/surgery/organs/subtypes/skrell_organs.dm
index e5e0fd4bcd7..aaf6dd9390a 100644
--- a/code/modules/surgery/organs/subtypes/skrell_organs.dm
+++ b/code/modules/surgery/organs/subtypes/skrell_organs.dm
@@ -9,7 +9,6 @@
icon = 'icons/obj/species_organs/skrell.dmi'
icon_state = "skrell_headpocket"
origin_tech = "biotech=2"
- w_class = WEIGHT_CLASS_SMALL
parent_organ = "head"
slot = "headpocket"
actions_types = list(/datum/action/item_action/organ_action/toggle/headpocket)
@@ -93,9 +92,7 @@
/obj/item/organ/internal/brain/skrell
icon = 'icons/obj/species_organs/skrell.dmi'
desc = "A brain with a odd division in the middle."
- icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/skrell.dmi'
- mmi_icon_state = "mmi_full"
/obj/item/organ/internal/lungs/skrell
name = "skrell lungs"
diff --git a/code/modules/surgery/organs/subtypes/standard_organs.dm b/code/modules/surgery/organs/subtypes/standard_organs.dm
index 91a1ae4424c..fd7ff2720e1 100644
--- a/code/modules/surgery/organs/subtypes/standard_organs.dm
+++ b/code/modules/surgery/organs/subtypes/standard_organs.dm
@@ -37,7 +37,6 @@
w_class = WEIGHT_CLASS_BULKY // if you know what I mean ;)
body_part = LOWER_TORSO
vital = TRUE
- parent_organ = "chest"
amputation_point = "lumbar"
gendered_icon = TRUE
@@ -46,10 +45,7 @@
name = "left arm"
icon_name = "l_arm"
max_damage = 50
- min_broken_damage = 30
- w_class = WEIGHT_CLASS_NORMAL
body_part = ARM_LEFT
- parent_organ = "chest"
amputation_point = "left shoulder"
can_grasp = 1
convertable_children = list(/obj/item/organ/external/hand)
@@ -78,8 +74,6 @@
name = "left leg"
icon_name = "l_leg"
max_damage = 50
- min_broken_damage = 30
- w_class = WEIGHT_CLASS_NORMAL
body_part = LEG_LEFT
icon_position = LEFT
parent_organ = "groin"
@@ -228,9 +222,7 @@
name = "head"
max_damage = 75
min_broken_damage = 35
- w_class = WEIGHT_CLASS_NORMAL
body_part = HEAD
- parent_organ = "chest"
amputation_point = "neck"
gendered_icon = TRUE
encased = "skull"
diff --git a/code/modules/surgery/organs/subtypes/tajaran_organs.dm b/code/modules/surgery/organs/subtypes/tajaran_organs.dm
index fed68d9798c..7c30a3c2d41 100644
--- a/code/modules/surgery/organs/subtypes/tajaran_organs.dm
+++ b/code/modules/surgery/organs/subtypes/tajaran_organs.dm
@@ -14,7 +14,6 @@
/obj/item/organ/internal/eyes/tajaran/farwa
name = "farwa eyeballs"
colormatrix = MATRIX_TAJ_CBLIND
- see_in_dark = 3
replace_colours = TRITANOPIA_COLOR_REPLACE
/obj/item/organ/internal/heart/tajaran
@@ -23,9 +22,7 @@
/obj/item/organ/internal/brain/tajaran
icon = 'icons/obj/species_organs/tajaran.dmi'
- icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/tajaran.dmi'
- mmi_icon_state = "mmi_full"
/obj/item/organ/internal/kidneys/tajaran
name = "tajaran kidneys"
diff --git a/code/modules/surgery/organs/subtypes/unathi_organs.dm b/code/modules/surgery/organs/subtypes/unathi_organs.dm
index 180f8a5cad8..c7626013d07 100644
--- a/code/modules/surgery/organs/subtypes/unathi_organs.dm
+++ b/code/modules/surgery/organs/subtypes/unathi_organs.dm
@@ -17,9 +17,7 @@
/obj/item/organ/internal/brain/unathi
icon = 'icons/obj/species_organs/unathi.dmi'
desc = "A smallish looking brain."
- icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/unathi.dmi'
- mmi_icon_state = "mmi_full"
/obj/item/organ/internal/kidneys/unathi
name = "unathi kidneys"
diff --git a/code/modules/surgery/organs/subtypes/vox_organs.dm b/code/modules/surgery/organs/subtypes/vox_organs.dm
index 1ab1eef7238..59596cfc8ad 100644
--- a/code/modules/surgery/organs/subtypes/vox_organs.dm
+++ b/code/modules/surgery/organs/subtypes/vox_organs.dm
@@ -20,7 +20,6 @@
icon = 'icons/obj/species_organs/vox.dmi'
icon_state = "cortical-stack"
mmi_icon = 'icons/obj/species_organs/vox.dmi'
- mmi_icon_state = "mmi_full"
sterile = TRUE
/obj/item/organ/internal/kidneys/vox
diff --git a/code/modules/surgery/organs/subtypes/vulpkanin_organs.dm b/code/modules/surgery/organs/subtypes/vulpkanin_organs.dm
index 1d5ed9a36e7..a8fdef541b3 100644
--- a/code/modules/surgery/organs/subtypes/vulpkanin_organs.dm
+++ b/code/modules/surgery/organs/subtypes/vulpkanin_organs.dm
@@ -14,7 +14,6 @@
/obj/item/organ/internal/eyes/vulpkanin/wolpin
name = "wolpin eyeballs"
colormatrix = MATRIX_VULP_CBLIND
- see_in_dark = 3
replace_colours = PROTANOPIA_COLOR_REPLACE
/obj/item/organ/internal/heart/vulpkanin
@@ -23,9 +22,7 @@
/obj/item/organ/internal/brain/vulpkanin
icon = 'icons/obj/species_organs/vulpkanin.dmi'
- icon_state = "brain2"
mmi_icon = 'icons/obj/species_organs/vulpkanin.dmi'
- mmi_icon_state = "mmi_full"
/obj/item/organ/internal/lungs/vulpkanin
name = "vulpkanin lungs"
diff --git a/code/modules/surgery/organs/subtypes/xenos.dm b/code/modules/surgery/organs/subtypes/xenos.dm
index e061cd328b7..72e6a955421 100644
--- a/code/modules/surgery/organs/subtypes/xenos.dm
+++ b/code/modules/surgery/organs/subtypes/xenos.dm
@@ -94,7 +94,6 @@
stored_plasma = 200
/obj/item/organ/internal/alien/plasmavessel/sentinel
- stored_plasma = 100
max_plasma = 250
/obj/item/organ/internal/alien/plasmavessel/hunter
diff --git a/code/modules/surgery/organs_internal.dm b/code/modules/surgery/organs_internal.dm
index 985bcb06377..7f3881ecfc1 100644
--- a/code/modules/surgery/organs_internal.dm
+++ b/code/modules/surgery/organs_internal.dm
@@ -23,8 +23,6 @@
/datum/surgery_step/generic/cauterize
)
possible_locs = list(BODY_ZONE_CHEST, BODY_ZONE_HEAD)
- requires_organic_bodypart = TRUE
- requires_bodypart = TRUE
/datum/surgery/organ_manipulation/soft
possible_locs = list(BODY_ZONE_PRECISE_GROIN, BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH)
@@ -46,7 +44,6 @@
/datum/surgery_step/proxy/manipulate_organs,
/datum/surgery_step/generic/cauterize
)
- requires_organic_bodypart = TRUE
/datum/surgery/organ_manipulation/can_start(mob/user, mob/living/carbon/target)
. = ..()
@@ -76,7 +73,6 @@
// Intermediate steps for branching organ manipulation.
/datum/surgery/intermediate/manipulate
- requires_bodypart = TRUE
possible_locs = list(BODY_ZONE_CHEST, BODY_ZONE_HEAD, BODY_ZONE_PRECISE_GROIN, BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM)
diff --git a/code/modules/surgery/other.dm b/code/modules/surgery/other.dm
index fd417d291b9..d03d577fcc4 100644
--- a/code/modules/surgery/other.dm
+++ b/code/modules/surgery/other.dm
@@ -26,7 +26,6 @@
/datum/surgery_step/generic/cauterize
)
possible_locs = list(BODY_ZONE_CHEST, BODY_ZONE_HEAD, BODY_ZONE_PRECISE_GROIN, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_FOOT, BODY_ZONE_PRECISE_L_FOOT)
- requires_organic_bodypart = TRUE
/datum/surgery/treat_burns
name = "Treat Severe Burns"
@@ -239,8 +238,6 @@
/obj/item/reagent_containers/glass/bucket = 50
)
- can_infect = FALSE
- blood_level = SURGERY_BLOODSPREAD_NONE
time = 2.4 SECONDS
diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm
index a4941cb7bda..d3f3ff3a739 100644
--- a/code/modules/surgery/plastic_surgery.dm
+++ b/code/modules/surgery/plastic_surgery.dm
@@ -8,7 +8,6 @@
/datum/surgery_step/generic/cauterize
)
possible_locs = list(BODY_ZONE_HEAD)
- requires_organic_bodypart = TRUE
/datum/surgery_step/reshape_face
name = "reshape face"
diff --git a/code/modules/surgery/robotics.dm b/code/modules/surgery/robotics.dm
index edfbbea6afe..ab54b133b99 100644
--- a/code/modules/surgery/robotics.dm
+++ b/code/modules/surgery/robotics.dm
@@ -18,7 +18,6 @@
/datum/surgery_step/robotics/external/close_hatch
)
possible_locs = list(BODY_ZONE_CHEST, BODY_ZONE_HEAD, BODY_ZONE_L_ARM, BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_R_ARM, BODY_ZONE_PRECISE_R_HAND, BODY_ZONE_R_LEG, BODY_ZONE_PRECISE_R_FOOT, BODY_ZONE_L_LEG, BODY_ZONE_PRECISE_L_FOOT, BODY_ZONE_PRECISE_GROIN)
- requires_organic_bodypart = FALSE
/datum/surgery/robotics/cybernetic_repair/internal
name = "Internal Component Manipulation"
@@ -68,7 +67,6 @@
// Intermediate repair surgeries, for fixing up internal maladies mid-surgery.
/datum/surgery/intermediate/robotics
- requires_bodypart = TRUE
requires_organic_bodypart = FALSE
/datum/surgery/intermediate/robotics/repair
@@ -98,7 +96,6 @@
possible_locs = list(BODY_ZONE_CHEST)
/datum/surgery_step/robotics
- can_infect = FALSE
/datum/surgery_step/robotics/begin_step(mob/living/user, mob/living/carbon/human/target, target_zone, obj/item/tool, datum/surgery/surgery)
. = ..()
diff --git a/code/modules/surgery/tending.dm b/code/modules/surgery/tending.dm
index 7215010364c..20778106db1 100644
--- a/code/modules/surgery/tending.dm
+++ b/code/modules/surgery/tending.dm
@@ -23,7 +23,6 @@
/datum/surgery/heal
abstract = TRUE // don't need this popping up
- requires_organic_bodypart = TRUE
/// A subtype of /datum/surgery_step/heal that this will invoke.
var/healing_step_type
possible_locs = list(BODY_ZONE_CHEST)
@@ -180,7 +179,6 @@
/datum/surgery_step/heal/brute
name = "tend wounds"
- damage_name_pretty = "wounds"
brute_damage_healed = 5
brute_damage_healmod = 0.07
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 9a0804f4827..058dd556b08 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -108,7 +108,6 @@
flags = CONDUCT
force = 15.0
sharp = TRUE
- w_class = WEIGHT_CLASS_NORMAL
origin_tech = "materials=1;biotech=1"
attack_verb = list("drilled")
tool_behaviour = TOOL_DRILL
@@ -206,19 +205,15 @@
/// lasers also count as catuarys
/obj/item/scalpel/laser/laser1
- name = "laser scalpel"
desc = "A basic low-power laser emitter for creating and cauterizing precise surgical incisions."
- icon_state = "scalpel_laser1_on"
toolspeed = 0.8
/obj/item/scalpel/laser/laser2
- name = "laser scalpel"
desc = "An improved laser emitter for rapidly creating and cauterizing precise surgical incisions."
icon_state = "scalpel_laser2_on"
toolspeed = 0.6
/obj/item/scalpel/laser/laser3
- name = "laser scalpel"
desc = "An advanced laser emitter for creating and cauterizing precise surgical incisions with extreme speed."
icon_state = "scalpel_laser3_on"
toolspeed = 0.4
@@ -247,7 +242,6 @@
flags = CONDUCT
force = 15.0
sharp = TRUE
- w_class = WEIGHT_CLASS_NORMAL
throwforce = 9.0
throw_speed = 3
throw_range = 5
@@ -276,7 +270,6 @@
icon_state = "bone-gel"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
- force = 0
w_class = WEIGHT_CLASS_SMALL
throwforce = 1.0
origin_tech = "materials=1;biotech=1"
@@ -298,7 +291,6 @@
icon_state = "fixovein"
lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
- force = 0
throwforce = 1.0
origin_tech = "materials=1;biotech=1"
w_class = WEIGHT_CLASS_SMALL
diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm
index 456a40c6a79..c40efc00b41 100644
--- a/code/modules/telesci/bscrystal.dm
+++ b/code/modules/telesci/bscrystal.dm
@@ -11,7 +11,6 @@
points = 50
var/blink_range = 8 // The teleport range when crushed/thrown at someone.
refined_type = /obj/item/stack/ore/bluespace_crystal/refined
- toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
dynamic_icon_state = TRUE
diff --git a/code/modules/telesci/rcs.dm b/code/modules/telesci/rcs.dm
index 694e872ab34..54dec6d0356 100644
--- a/code/modules/telesci/rcs.dm
+++ b/code/modules/telesci/rcs.dm
@@ -14,9 +14,7 @@
flags = CONDUCT
force = 10.0
throwforce = 10.0
- throw_speed = 2
throw_range = 5
- toolspeed = 1
usesound = 'sound/weapons/flash.ogg'
origin_tech = "bluespace=3"
/// Power cell (10000W)
diff --git a/code/modules/vehicle/ambulance.dm b/code/modules/vehicle/ambulance.dm
index 1238a0de208..ef230e2b67e 100644
--- a/code/modules/vehicle/ambulance.dm
+++ b/code/modules/vehicle/ambulance.dm
@@ -55,7 +55,6 @@
start_length = 0
mid_sounds = list('sound/items/weeoo1.ogg' = 1)
mid_length = 14
- volume = 100
/obj/vehicle/ambulance/post_buckle_mob(mob/living/M)
diff --git a/code/modules/vehicle/atv.dm b/code/modules/vehicle/atv.dm
index a9f5806dfe0..588f0750000 100644
--- a/code/modules/vehicle/atv.dm
+++ b/code/modules/vehicle/atv.dm
@@ -7,7 +7,6 @@
armor = list(MELEE = 50, BULLET = 25, LASER = 20, ENERGY = 0, BOMB = 50, RAD = 0, FIRE = 60, ACID = 60)
key_type = /obj/item/key
integrity_failure = 70
- generic_pixel_x = 0
generic_pixel_y = 4
vehicle_move_delay = 1
var/static/mutable_appearance/atvcover
@@ -39,7 +38,6 @@
name = "mounted turret"
scan_range = 7
emp_vulnerable = 1
- density = FALSE
/obj/vehicle/atv/turret/Initialize(mapload)
. = ..()
diff --git a/code/modules/vehicle/bicycle.dm b/code/modules/vehicle/bicycle.dm
index eebb2e03645..6fd01b62bd6 100644
--- a/code/modules/vehicle/bicycle.dm
+++ b/code/modules/vehicle/bicycle.dm
@@ -1,7 +1,6 @@
/obj/vehicle/bike
name = "bicycle"
desc = "Two wheels of FURY!"
- icon = 'icons/obj/vehicles.dmi'
icon_state = "bicycle"
vehicle_move_delay = 1
var/mutable_appearance/bicycle_overlay
diff --git a/code/modules/vehicle/motorcycle.dm b/code/modules/vehicle/motorcycle.dm
index 822830040e5..e8a59715bc0 100644
--- a/code/modules/vehicle/motorcycle.dm
+++ b/code/modules/vehicle/motorcycle.dm
@@ -3,7 +3,6 @@
desc = "A fast and highly maneuverable vehicle."
icon = 'icons/vehicles/motorcycle.dmi'
icon_state = "motorcycle_4dir"
- generic_pixel_x = 0
generic_pixel_y = 4
vehicle_move_delay = 1
var/mutable_appearance/bikecover
diff --git a/code/modules/vehicle/secway.dm b/code/modules/vehicle/secway.dm
index 9dfccd646be..d5edd9eefbc 100644
--- a/code/modules/vehicle/secway.dm
+++ b/code/modules/vehicle/secway.dm
@@ -6,7 +6,6 @@
armor = list(MELEE = 20, BULLET = 15, LASER = 10, ENERGY = 0, BOMB = 30, RAD = 0, FIRE = 60, ACID = 60)
key_type = /obj/item/key/security
integrity_failure = 50
- generic_pixel_x = 0
generic_pixel_y = 4
vehicle_move_delay = 1
diff --git a/code/modules/vehicle/snowmobile.dm b/code/modules/vehicle/snowmobile.dm
index 25d2f4e1ccf..9a167db7aa4 100644
--- a/code/modules/vehicle/snowmobile.dm
+++ b/code/modules/vehicle/snowmobile.dm
@@ -1,10 +1,8 @@
/obj/vehicle/snowmobile
name = "red snowmobile"
desc = "Wheeeeeeeeeeee."
- icon = 'icons/obj/vehicles.dmi'
icon_state = "snowmobile"
key_type = /obj/item/key/snowmobile
- generic_pixel_x = 0
generic_pixel_y = 4
/obj/vehicle/snowmobile/blue
diff --git a/code/modules/vehicle/sportscar.dm b/code/modules/vehicle/sportscar.dm
index 54c503d95f0..79fe1f72d03 100644
--- a/code/modules/vehicle/sportscar.dm
+++ b/code/modules/vehicle/sportscar.dm
@@ -3,7 +3,6 @@
desc = "A very luxurious vehicle."
icon = 'icons/vehicles/sportscar.dmi'
icon_state = "sportscar"
- generic_pixel_x = 0
generic_pixel_y = 4
vehicle_move_delay = 1
var/mutable_appearance/carcover
diff --git a/code/modules/vehicle/tg_vehicles/scooter.dm b/code/modules/vehicle/tg_vehicles/scooter.dm
index b42b7044935..e0a5f8c1563 100644
--- a/code/modules/vehicle/tg_vehicles/scooter.dm
+++ b/code/modules/vehicle/tg_vehicles/scooter.dm
@@ -273,7 +273,6 @@
desc = "A metal frame for building a scooter. Looks like you'll need to add some iron to make wheels."
icon = 'icons/obj/tgvehicles.dmi'
icon_state = "scooter_frame"
- w_class = WEIGHT_CLASS_NORMAL
/obj/item/scooter_frame/attackby__legacy__attackchain(obj/item/I, mob/user, params)
if(!istype(I, /obj/item/stack/sheet/metal))
diff --git a/code/modules/vehicle/tg_vehicles/tg_vehicles.dm b/code/modules/vehicle/tg_vehicles/tg_vehicles.dm
index d8f3a8328cf..945caf2d545 100644
--- a/code/modules/vehicle/tg_vehicles/tg_vehicles.dm
+++ b/code/modules/vehicle/tg_vehicles/tg_vehicles.dm
@@ -7,7 +7,6 @@
max_integrity = 300
armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 0, BOMB = 30, RAD = 0, FIRE = 60, ACID = 60)
density = TRUE
- anchored = FALSE
blocks_emissive = EMISSIVE_BLOCK_GENERIC
buckle_lying = FALSE
can_buckle = TRUE
diff --git a/code/modules/vehicle/vehicle.dm b/code/modules/vehicle/vehicle.dm
index a9d43776caf..cf738cfb846 100644
--- a/code/modules/vehicle/vehicle.dm
+++ b/code/modules/vehicle/vehicle.dm
@@ -6,7 +6,6 @@
icon_state = null
density = TRUE
appearance_flags = LONG_GLIDE
- anchored = FALSE
can_buckle = TRUE
buckle_lying = FALSE
max_integrity = 300