From 6d3211d7d34656f8b03075f643420601c023efbb Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 22:18:38 +0100 Subject: [PATCH 01/55] merge duplicate /turf/open/floor/holofloor/asteroid definitions --- code/modules/holodeck/turfs.dm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/code/modules/holodeck/turfs.dm b/code/modules/holodeck/turfs.dm index 6827f649e4c..3b9351a153e 100644 --- a/code/modules/holodeck/turfs.dm +++ b/code/modules/holodeck/turfs.dm @@ -54,8 +54,9 @@ bullet_sizzle = TRUE /turf/open/floor/holofloor/asteroid - name = "asteroid" - icon_state = "asteroid0" + gender = PLURAL + name = "asteroid sand" + icon_state = "asteroid" tiled_dirt = FALSE /turf/open/floor/holofloor/asteroid/Initialize() @@ -136,10 +137,3 @@ /turf/open/floor/holofloor/snow/cold initial_gas_mix = "nob=7500;TEMP=2.7" - -/turf/open/floor/holofloor/asteroid - gender = PLURAL - name = "asteroid sand" - icon = 'icons/turf/floors.dmi' - icon_state = "asteroid" - tiled_dirt = FALSE From 7017b98d60110891eb09bc720cf53376b2faf3f5 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 22:23:00 +0100 Subject: [PATCH 02/55] remove duplicate /obj/item/circuitboard/machine/protolathe definition --- .../objects/items/circuitboards/machine_circuitboards.dm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 406c14df8e4..15cc475a86f 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -414,15 +414,6 @@ /obj/item/stock_parts/manipulator = 2, /obj/item/reagent_containers/glass/beaker = 2) -/obj/item/circuitboard/machine/protolathe - name = "Protolathe (Machine Board)" - icon_state = "generic" - build_path = /obj/machinery/rnd/production/protolathe - req_components = list( - /obj/item/stock_parts/matter_bin = 2, - /obj/item/stock_parts/manipulator = 2, - /obj/item/reagent_containers/glass/beaker = 2) - /obj/item/circuitboard/machine/protolathe/department name = "Departmental Protolathe (Machine Board)" icon_state = "generic" From 42904e74b4797f45db9ef9cf918107037dddc07e Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 22:23:40 +0100 Subject: [PATCH 03/55] remove duplicate /obj/item/circuitboard/machine/protolathe/department definition --- .../objects/items/circuitboards/machine_circuitboards.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 15cc475a86f..5d445c48764 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -419,11 +419,6 @@ icon_state = "generic" build_path = /obj/machinery/rnd/production/protolathe/department -/obj/item/circuitboard/machine/protolathe/department - name = "Departmental Protolathe (Machine Board)" - icon_state = "generic" - build_path = /obj/machinery/rnd/production/protolathe/department - /obj/item/circuitboard/machine/reagentgrinder name = "Machine Design (All-In-One Grinder)" icon_state = "generic" From 6c3278e712e3052f77c27a993ad8659df1f4b544 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 22:28:33 +0100 Subject: [PATCH 04/55] merge duplicate /datum/map_template/shuttle/cargo definitions --- code/datums/shuttles.dm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 9ec5ca09948..38e946e3238 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -108,6 +108,7 @@ /datum/map_template/shuttle/cargo port_id = "cargo" name = "Base Shuttle Template (Cargo)" + can_be_bought = FALSE /datum/map_template/shuttle/ferry port_id = "ferry" @@ -128,10 +129,6 @@ port_id = "mining_common" can_be_bought = FALSE -/datum/map_template/shuttle/cargo - port_id = "cargo" - can_be_bought = FALSE - /datum/map_template/shuttle/arrival port_id = "arrival" can_be_bought = FALSE From b06f2cec1180cc2e8c8ad7ad22d8b42dc991235b Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 22:33:16 +0100 Subject: [PATCH 05/55] remove duplicate /datum/map_template/shuttle/cargo/box definition --- code/datums/shuttles.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index 38e946e3238..f92a2b08d16 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -439,10 +439,6 @@ suffix = "whiteship_pod" name = "Salvage Pod" -/datum/map_template/shuttle/cargo/box - suffix = "box" - name = "supply shuttle (Box)" - /datum/map_template/shuttle/cargo/kilo suffix = "kilo" name = "supply shuttle (Kilo)" From 53ed029490ed70e135ca4f76089363b2b6fc68ec Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 22:38:57 +0100 Subject: [PATCH 06/55] remove duplicate /datum/component/storage/concrete/pockets definition --- code/datums/components/storage/concrete/pockets.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/datums/components/storage/concrete/pockets.dm b/code/datums/components/storage/concrete/pockets.dm index e159d926385..2e576998cff 100644 --- a/code/datums/components/storage/concrete/pockets.dm +++ b/code/datums/components/storage/concrete/pockets.dm @@ -12,9 +12,6 @@ else to_chat(user, "You discreetly slip [I] into [parent].") -/datum/component/storage/concrete/pockets - max_w_class = WEIGHT_CLASS_NORMAL - /datum/component/storage/concrete/pockets/small max_items = 1 max_w_class = WEIGHT_CLASS_SMALL From 8d658d1d90090e5e1377f955495e9bc6766d430f Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 22:43:38 +0100 Subject: [PATCH 07/55] remove duplicate definition of /datum/mutation/human/hulk's locked var --- code/datums/mutations/hulk.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index 899d9f49d38..5ce0f9be734 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -9,7 +9,6 @@ species_allowed = list("human") //no skeleton/lizard hulk health_req = 25 instability = 40 - locked = TRUE /datum/mutation/human/hulk/on_acquiring(mob/living/carbon/human/owner) if(..()) From 061b2558ea0673a350995e8bbc68b5b1c8f7ed8b Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 22:44:47 +0100 Subject: [PATCH 08/55] remove duplicate definition of /datum/mutation/human/shock's locked var --- code/datums/mutations/touch.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/mutations/touch.dm b/code/datums/mutations/touch.dm index e4efdd40796..7ff96e62a9f 100644 --- a/code/datums/mutations/touch.dm +++ b/code/datums/mutations/touch.dm @@ -8,7 +8,6 @@ text_lose_indication = "The energy in your hands subsides." power = /obj/effect/proc_holder/spell/targeted/touch/shock instability = 30 - locked = TRUE /obj/effect/proc_holder/spell/targeted/touch/shock name = "Shock Touch" From 3daea05e2aed74c2e14f32afa56790efc473022f Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 22:47:38 +0100 Subject: [PATCH 09/55] remove duplicate definition of /obj/screen/alert/status_effect/regenerative_core's name var --- code/datums/status_effects/buffs.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 82c8485b8aa..67a1ccb39ea 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -560,10 +560,9 @@ SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "goodmusic", /datum/mood_event/goodmusic) /obj/screen/alert/status_effect/regenerative_core - name = "Reinforcing Tendrils" + name = "Regenerative Core Tendrils" desc = "You can move faster than your broken body could normally handle!" icon_state = "regenerative_core" - name = "Regenerative Core Tendrils" /datum/status_effect/regenerative_core id = "Regenerative Core" From 7412197317c00c898eb4d3abdb71fd86b80f155a Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 22:49:05 +0100 Subject: [PATCH 10/55] remove duplicate definition of /area/vacant_room's icon_state var --- code/game/area/Space_Station_13_areas.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 2b33bdfb3a6..2fea68f0ff3 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -985,9 +985,8 @@ NOTE: there are two lists of areas in the end of this file: centcom and station // Vacant Rooms /area/vacant_room name = "Vacant Room" - icon_state = "yellow" - ambientsounds = MAINTENANCE icon_state = "vacant_room" + ambientsounds = MAINTENANCE /area/vacant_room/office name = "Vacant Office" From 6b13eeac4569d55d08cf42f161ef1cce9596678d Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 22:52:10 +0100 Subject: [PATCH 11/55] remove duplication definitions in /obj/mecha/working/ripley/deathripley --- code/game/mecha/working/ripley.dm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm index b345ecd291c..6501c039e69 100644 --- a/code/game/mecha/working/ripley.dm +++ b/code/game/mecha/working/ripley.dm @@ -111,10 +111,8 @@ name = "\improper DEATH-RIPLEY" icon_state = "deathripley" fast_pressure_step_in = 2 //step_in while in low pressure conditions - slow_pressure_step_in = 4 //step_in while in normal pressure conditions + slow_pressure_step_in = 3 //step_in while in normal pressure conditions step_in = 4 - slow_pressure_step_in = 3 - opacity=0 lights_power = 7 wreckage = /obj/structure/mecha_wreckage/ripley/deathripley step_energy_drain = 0 From 00a29087d5597eaf3fdee4124b0d9e819e1ac7b8 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:01:20 +0100 Subject: [PATCH 12/55] remove duplication var definition in /obj/effect/decal/cleanable/blood/tracks --- code/game/objects/effects/decals/cleanable/humans.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index c82f7c8f73d..92aa0f0e20b 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -33,7 +33,6 @@ /obj/effect/decal/cleanable/blood/tracks icon_state = "tracks" desc = "They look like tracks left by wheels." - icon_state = "tracks" random_icon_states = null beauty = -50 From e8a0b723de51567fdf751041dab17d41967faf3e Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:09:04 +0100 Subject: [PATCH 13/55] stray /obj/effect/turf_decal/trimline/brown/filled/end -> /obj/effect/turf_decal/trimline/neutral/filled/end --- code/game/objects/effects/decals/turfdecal/tilecoloring.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm index 66e03c6420e..7b5b4d9b4eb 100644 --- a/code/game/objects/effects/decals/turfdecal/tilecoloring.dm +++ b/code/game/objects/effects/decals/turfdecal/tilecoloring.dm @@ -234,5 +234,5 @@ /obj/effect/turf_decal/trimline/neutral/filled/corner icon_state = "trimline_corner_fill" -/obj/effect/turf_decal/trimline/brown/filled/end +/obj/effect/turf_decal/trimline/neutral/filled/end icon_state = "trimline_end_fill" From 58ebaf07e9b8872e5639c0adefb9be034d00aa14 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:11:01 +0100 Subject: [PATCH 14/55] remove duplicate var definition in /obj/structure/checkoutmachine --- code/game/objects/items/crab17.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/crab17.dm b/code/game/objects/items/crab17.dm index a20b83e8d68..6cb0a22b5d4 100644 --- a/code/game/objects/items/crab17.dm +++ b/code/game/objects/items/crab17.dm @@ -28,11 +28,10 @@ desc = "This is good for spacecoin because" icon = 'icons/obj/money_machine.dmi' icon_state = "bogdanoff" - layer = TABLE_LAYER //So that the crate inside doesn't appear underneath + layer = LARGE_MOB_LAYER armor = list("melee" = 80, "bullet" = 30, "laser" = 30, "energy" = 60, "bomb" = 90, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 80) density = TRUE pixel_z = -8 - layer = LARGE_MOB_LAYER max_integrity = 5000 var/list/accounts_to_rob var/mob/living/carbon/human/bogdanoff From 84808b77c44e78c8f8183306256803d9bf840dbc Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:13:32 +0100 Subject: [PATCH 15/55] remove duplicate var definition in /obj/item/toy/plush/slimeplushie --- code/game/objects/items/plushes.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 9f70c98e223..15a91627886 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -523,7 +523,6 @@ attack_verb = list("blorbled", "slimed", "absorbed") squeak_override = list('sound/effects/blobattack.ogg' = 1) gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy - squeak_override = list('sound/effects/blobattack.ogg' = 1) /obj/item/toy/plush/awakenedplushie name = "awakened plushie" From 7f702163f43325170bacaced225cb10fb9c7897e Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:15:32 +0100 Subject: [PATCH 16/55] remove duplicate var definition in /obj/item/pneumatic_cannon/ghetto --- code/game/objects/items/pneumaticCannon.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index 8b32b09bcdc..527e1b4d8ca 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -233,9 +233,8 @@ name = "improvised pneumatic cannon" desc = "A gas-powered, object-firing cannon made out of common parts." force = 5 - maxWeightClass = 7 - gasPerThrow = 5 maxWeightClass = 10 + gasPerThrow = 5 /obj/item/pneumatic_cannon/proc/updateTank(obj/item/tank/internals/thetank, removing = 0, mob/living/carbon/human/user) if(removing) From 15e5d098af1fc2d16dc930944d9e6fc890478e8b Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:19:12 +0100 Subject: [PATCH 17/55] rename dupe icon_state on /obj/item/stack/sheet/animalhide/monkey to item_state (still does not exist) --- code/game/objects/items/stacks/sheets/leather.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 2df757b75f4..5ba57e26ff3 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -69,7 +69,7 @@ GLOBAL_LIST_INIT(corgi_recipes, list ( \ desc = "The by-product of monkey farming." singular_name = "monkey hide piece" icon_state = "sheet-monkey" - icon_state = "sheet-monkey" + item_state = "sheet-monkey" GLOBAL_LIST_INIT(monkey_recipes, list ( \ new/datum/stack_recipe("monkey mask", /obj/item/clothing/mask/gas/monkeymask, 1), \ From 8221f6de8721741f7e070e119b2d11e1244355c7 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:20:33 +0100 Subject: [PATCH 18/55] remove duplicate var definition in /obj/item/stack/sheet/paperframes --- code/game/objects/items/stacks/sheets/sheet_types.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 1434e2ee97f..19c5b97a8ed 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -693,7 +693,6 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra item_state = "sheet-paper" merge_type = /obj/item/stack/sheet/paperframes resistance_flags = FLAMMABLE - merge_type = /obj/item/stack/sheet/paperframes /obj/item/stack/sheet/paperframes/get_main_recipes() . = ..() From d83ac45514eb8e11b747627528a5690d692f2b40 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:22:03 +0100 Subject: [PATCH 19/55] remove duplicate /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle --- code/game/objects/items/storage/backpack.dm | 9 --------- 1 file changed, 9 deletions(-) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 105da615fb2..dd51ba5d1e1 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -542,15 +542,6 @@ new /obj/item/ammo_box/magazine/m12g(src) new /obj/item/clothing/glasses/thermal/syndi(src) -/obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle - desc = "A large duffel bag containing a tactical medkit, a Donksoft machine gun, a big jumbo box of riot darts, and a knock-off pair of magboots." - -/obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle/PopulateContents() - new /obj/item/clothing/shoes/magboots/syndie(src) - new /obj/item/storage/firstaid/tactical(src) - new /obj/item/gun/ballistic/automatic/l6_saw/toy(src) - new /obj/item/ammo_box/foambox/riot(src) - /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle desc = "A large duffel bag containing a medical equipment, a Donksoft LMG, a big jumbo box of riot darts, and a knock-off pair of magboots." From b59c809bd52e3e5a21b754332e0122b8da742535 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:23:09 +0100 Subject: [PATCH 20/55] remove duplicate var definition in /obj/item/storage/toolbox --- code/game/objects/items/storage/toolbox.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 57f1dc06939..96ee11af9fb 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -16,7 +16,6 @@ hitsound = 'sound/weapons/smash.ogg' drop_sound = 'sound/items/handling/toolbox_drop.ogg' pickup_sound = 'sound/items/handling/toolbox_pickup.ogg' - custom_materials = list(/datum/material/iron = 500) //Toolboxes by default use iron as their core, custom material. material_flags = MATERIAL_COLOR var/latches = "single_latch" var/has_latches = TRUE From ea39325ec5512d7755f446ac97eae2c2900ff8a5 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:24:28 +0100 Subject: [PATCH 21/55] remove duplicate var in /obj/structure/flora/rock/jungle --- code/game/objects/structures/flora.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 547a6de518c..ef189e01ae8 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -393,9 +393,8 @@ //Jungle rocks /obj/structure/flora/rock/jungle - icon_state = "pile of rocks" - desc = "A pile of rocks." icon_state = "rock" + desc = "A pile of rocks." icon = 'icons/obj/flora/jungleflora.dmi' density = FALSE From c688bc39f720a1c9b311ee567548b5212a71bdaa Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:25:38 +0100 Subject: [PATCH 22/55] remove duplicate var from /obj/structure/closet/cardboard --- .../objects/structures/crates_lockers/closets/cardboardbox.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm index 2f9ff4692c7..3e69977f367 100644 --- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm +++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm @@ -9,7 +9,6 @@ integrity_failure = 0 can_weld_shut = 0 cutting_tool = /obj/item/wirecutters - open_sound = "rustle" material_drop = /obj/item/stack/sheet/cardboard delivery_icon = "deliverybox" anchorable = FALSE From 53227eef494b2d0deb981995b485f0b8db1ac19b Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:26:25 +0100 Subject: [PATCH 23/55] remove duplicate var definition from /obj/machinery/portable_atmospherics/canister/proto/default --- code/modules/atmospherics/machinery/portable/canister.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 7e960da6357..5bf612cdb69 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -169,7 +169,6 @@ name = "prototype canister" desc = "The best way to fix an atmospheric emergency... or the best way to introduce one." icon_state = "proto" - icon_state = "proto" volume = 5000 max_integrity = 300 temperature_resistance = 2000 + T0C From 878a8e207ef132a86d6714e9bf1d7f83bed95a9f Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:31:26 +0100 Subject: [PATCH 24/55] remove duplicate var definition in /obj/item/clothing/head/helmet --- code/modules/clothing/head/helmet.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index b142b2ff633..95f430deb8c 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -4,7 +4,6 @@ icon_state = "helmet" item_state = "helmet" armor = list("melee" = 35, "bullet" = 30, "laser" = 30,"energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) - flags_inv = HIDEEARS cold_protection = HEAD min_cold_protection_temperature = HELMET_MIN_TEMP_PROTECT heat_protection = HEAD From 9c9ead64b2e43545d6cf7aafbc5d0901aca04e3f Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:32:27 +0100 Subject: [PATCH 25/55] remove duplicate /obj/item/clothing/head/flatcap --- code/modules/clothing/head/misc.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 1bfcad82178..0afb2535560 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -119,14 +119,6 @@ dog_fashion = /datum/dog_fashion/head/rabbit - -/obj/item/clothing/head/flatcap - name = "flat cap" - desc = "A working man's cap." - icon_state = "flat_cap" - item_state = "detective" - - /obj/item/clothing/head/pirate name = "pirate hat" desc = "Yarr." From 07deda90bffc61ccc63c8a2610852de1e27cd4c8 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:34:41 +0100 Subject: [PATCH 26/55] replace extra icon_state on /obj/item/clothing/head/pharaoh with item_state --- code/modules/clothing/head/misc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 0afb2535560..321adf07e3e 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -348,7 +348,7 @@ name = "pharaoh hat" desc = "Walk like an Egyptian." icon_state = "pharoah_hat" - icon_state = "pharoah_hat" + item_state = "pharoah_hat" /obj/item/clothing/head/jester/alt name = "jester hat" From 88945ad0c83490058c4c538fd2313152634252e7 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:35:14 +0100 Subject: [PATCH 27/55] remove duplicate /obj/item/clothing/shoes/sneakers/brown --- code/modules/clothing/shoes/colour.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm index e91f393d4e7..f6a6c14ce1a 100644 --- a/code/modules/clothing/shoes/colour.dm +++ b/code/modules/clothing/shoes/colour.dm @@ -33,10 +33,6 @@ name = "purple shoes" icon_state = "purple" -/obj/item/clothing/shoes/sneakers/brown - name = "brown shoes" - icon_state = "brown" - /obj/item/clothing/shoes/sneakers/red name = "red shoes" desc = "Stylish red shoes." From 2efe7fb7d3599e51220c75a1137b92df6432d67e Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:35:44 +0100 Subject: [PATCH 28/55] remove duplicate var on /obj/item/clothing/shoes/sandal --- code/modules/clothing/shoes/miscellaneous.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm index 5024eec68d6..47aeeabe97e 100644 --- a/code/modules/clothing/shoes/miscellaneous.dm +++ b/code/modules/clothing/shoes/miscellaneous.dm @@ -29,10 +29,9 @@ desc = "A pair of rather plain wooden sandals." name = "sandals" icon_state = "wizard" - strip_delay = 50 + strip_delay = 5 equip_delay_other = 50 permeability_coefficient = 0.9 - strip_delay = 5 /obj/item/clothing/shoes/sandal/marisa desc = "A pair of magic black shoes." From 69b62c9ea3d6d258aa9b5d96c579b40a4ee76eed Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:36:26 +0100 Subject: [PATCH 29/55] replace extra icon_state on /obj/item/clothing/suit/nemes with item_state --- code/modules/clothing/suits/miscellaneous.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 289b01bb7d5..6789f20ecf9 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -478,7 +478,7 @@ name = "pharoah tunic" desc = "Lavish space tomb not included." icon_state = "pharoah" - icon_state = "pharoah" + item_state = "pharoah" body_parts_covered = CHEST|GROIN /obj/item/clothing/suit/caution From 54bb2c05a99e23e991499e5e45f05cfe644c9624 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:38:18 +0100 Subject: [PATCH 30/55] remove dulpicate var definition in /obj/item/clothing/under/costume/russian_officer --- code/modules/clothing/under/costume.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/clothing/under/costume.dm b/code/modules/clothing/under/costume.dm index 9d32cb9bbb0..0d129833fda 100644 --- a/code/modules/clothing/under/costume.dm +++ b/code/modules/clothing/under/costume.dm @@ -249,6 +249,5 @@ alt_covers_chest = TRUE armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 30) strip_delay = 50 - alt_covers_chest = TRUE sensor_mode = SENSOR_COORDS random_sensor = FALSE From fff4e9aee5d277c1d5e52a1eda5fef8281570b5a Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:39:44 +0100 Subject: [PATCH 31/55] remove duplicate var definition in /obj/structure/chisel_message --- code/modules/library/soapstone.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/library/soapstone.dm b/code/modules/library/soapstone.dm index 7de4c114fed..3f9f33e2fc0 100644 --- a/code/modules/library/soapstone.dm +++ b/code/modules/library/soapstone.dm @@ -112,11 +112,10 @@ desc = "A message from a past traveler." icon = 'icons/obj/stationobjs.dmi' icon_state = "soapstone_message" - layer = HIGH_OBJ_LAYER + layer = LATTICE_LAYER density = FALSE anchored = TRUE max_integrity = 30 - layer = LATTICE_LAYER var/hidden_message var/creator_key From b77030ff803fd9eba4d74d4d9ad4be0136c46a20 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:43:28 +0100 Subject: [PATCH 32/55] extra icon_state -> item_state on /obj/item/stack/ore/gold & /obj/item/stack/ore/glass/basalt --- code/modules/mining/ores_coins.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index f418f6268d0..dcce5db48a8 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -123,7 +123,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/stack/ore/glass/basalt name = "volcanic ash" icon_state = "volcanic_sand" - icon_state = "volcanic_sand" + item_state = "volcanic_sand" singular_name = "volcanic ash pile" /obj/item/stack/ore/plasma @@ -152,7 +152,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ /obj/item/stack/ore/gold name = "gold ore" icon_state = "Gold ore" - icon_state = "Gold ore" + item_state = "Gold ore" singular_name = "gold ore chunk" points = 18 custom_materials = list(/datum/material/gold=MINERAL_MATERIAL_AMOUNT) From c00d4574824bbdaa168df8be94aa802d01d9ee39 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:48:04 +0100 Subject: [PATCH 33/55] remove duplicate /datum/sprite_accessory/hair/bun2 &/datum/sprite_accessory/hair/bun3 --- code/modules/mob/dead/new_player/sprite_accessories.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm index fa3cf66727f..0783f4766eb 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -207,14 +207,6 @@ name = "Bun (Tight)" icon_state = "hair_tightbun" -/datum/sprite_accessory/hair/bun2 - name = "Bun Head 2" - icon_state = "hair_bunhead2" - -/datum/sprite_accessory/hair/bun3 - name = "Bun Head 3" - icon_state = "hair_bun3" - /datum/sprite_accessory/hair/business name = "Business Hair" icon_state = "hair_business" From a59e8f2cf0d0235e03395bded90f5de715da1a45 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:48:47 +0100 Subject: [PATCH 34/55] remove duplicate /datum/emote/silicon/chime definition --- code/modules/mob/living/silicon/robot/emote.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index a385fb9e2b8..cf7d1699486 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -39,12 +39,6 @@ message_param = "pings at %t." sound = 'sound/machines/ping.ogg' -/datum/emote/silicon/chime - key = "chime" - key_third_person = "chimes" - message = "chimes." - sound = 'sound/machines/chime.ogg' - /datum/emote/silicon/sad key = "sad" message = "plays a sad trombone..." From 174aa1d84c90d1ccf542da10bae8b8af2b6c959e Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:52:20 +0100 Subject: [PATCH 35/55] remove duplicate var definition in /mob/living/simple_animal/shade --- code/modules/mob/living/simple_animal/shade.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index 16df7cc2feb..a3795de4cec 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -28,7 +28,6 @@ maxbodytemp = INFINITY 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) stop_automated_movement = 1 - status_flags = 0 faction = list("cult") status_flags = CANPUSH movement_type = FLYING From d1486ae7332a2c31904b04279a59adfe0e4bd0ca Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:55:13 +0100 Subject: [PATCH 36/55] remove duplicate var definition in /mob/living/simple_animal/pet/penguin/emperor --- code/modules/mob/living/simple_animal/friendly/penguin.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/friendly/penguin.dm b/code/modules/mob/living/simple_animal/friendly/penguin.dm index c6f05cfd611..ba7789fa74b 100644 --- a/code/modules/mob/living/simple_animal/friendly/penguin.dm +++ b/code/modules/mob/living/simple_animal/friendly/penguin.dm @@ -32,7 +32,6 @@ icon_state = "penguin" icon_living = "penguin" icon_dead = "penguin_dead" - butcher_results = list() gold_core_spawnable = FRIENDLY_SPAWN butcher_results = list(/obj/item/organ/ears/penguin = 1, /obj/item/reagent_containers/food/snacks/meat/slab/penguin = 3) From b8f97ba926cc60011612b7f7365822c61ed185ce Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:56:16 +0100 Subject: [PATCH 37/55] remove duplicate var definition in /mob/living/simple_animal/hostile/poison/giant_spider --- code/modules/mob/living/simple_animal/hostile/giant_spider.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 8b7958528a5..26c58d06410 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -27,7 +27,7 @@ emote_hear = list("chitters") speak_chance = 5 turns_per_move = 5 - see_in_dark = 10 + see_in_dark = 4 butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/spider = 2, /obj/item/reagent_containers/food/snacks/spiderleg = 8) response_help_continuous = "pets" response_help_simple = "pet" @@ -48,7 +48,6 @@ attack_sound = 'sound/weapons/bite.ogg' unique_name = 1 gold_core_spawnable = HOSTILE_SPAWN - see_in_dark = 4 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE var/playable_spider = FALSE var/datum/action/innate/spider/lay_web/lay_web From 66433833052280de8e028a42954ed79fa56a1e83 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Tue, 8 Oct 2019 23:57:58 +0100 Subject: [PATCH 38/55] remove duplicate var definition in /mob/living/simple_animal/hostile/netherworld --- code/modules/mob/living/simple_animal/hostile/netherworld.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/netherworld.dm b/code/modules/mob/living/simple_animal/hostile/netherworld.dm index dcd9a4560ee..d9a426d721f 100644 --- a/code/modules/mob/living/simple_animal/hostile/netherworld.dm +++ b/code/modules/mob/living/simple_animal/hostile/netherworld.dm @@ -12,12 +12,11 @@ attack_verb_continuous = "slashes" attack_verb_simple = "slash" attack_sound = 'sound/weapons/bladeslice.ogg' - faction = list("creature") + faction = list("nether") speak_emote = list("screams") gold_core_spawnable = HOSTILE_SPAWN 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 - faction = list("nether") /mob/living/simple_animal/hostile/netherworld/migo name = "mi-go" From 053b9778855fd73cb8b5b7e1aa71050b99b0aff7 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:02:22 +0100 Subject: [PATCH 39/55] remove duplicate var definition in /mob/living/simple_animal/hostile/tree --- code/modules/mob/living/simple_animal/hostile/tree.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm index 0dd6f114bc1..98766b5a089 100644 --- a/code/modules/mob/living/simple_animal/hostile/tree.dm +++ b/code/modules/mob/living/simple_animal/hostile/tree.dm @@ -13,7 +13,7 @@ response_help_simple = "brush" response_disarm_continuous = "pushes" response_disarm_simple = "push" - faction = list("plants") + faction = list("hostile") speed = 1 maxHealth = 250 health = 250 @@ -36,7 +36,6 @@ minbodytemp = 0 maxbodytemp = 1200 - faction = list("hostile") deathmessage = "is hacked into pieces!" loot = list(/obj/item/stack/sheet/mineral/wood) gold_core_spawnable = HOSTILE_SPAWN From a133637cab7f774027c52627fe5a3504e2a6cbdb Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:05:41 +0100 Subject: [PATCH 40/55] remove duplicate var in /mob/living/simple_animal/hostile/asteroid/fugu --- code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm index d553edea391..dc7ee7445a8 100644 --- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm +++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm @@ -27,7 +27,6 @@ attack_verb_simple = "chomp" attack_sound = 'sound/weapons/punch1.ogg' throw_message = "is avoided by the" - vision_range = 5 aggro_vision_range = 9 mob_size = MOB_SIZE_SMALL environment_smash = ENVIRONMENT_SMASH_NONE From 65ba24d4fbf5e2d64f6b8aabf11a391b3004560b Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:06:38 +0100 Subject: [PATCH 41/55] remove duplicate var definition in /mob/living/simple_animal/hostile/gorilla --- code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm | 1 - 1 file changed, 1 deletion(-) 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 72c69123a86..9895fd105a2 100644 --- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm +++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm @@ -6,7 +6,6 @@ desc = "A ground-dwelling, predominantly herbivorous ape that inhabits the forests of central Africa." icon = 'icons/mob/gorilla.dmi' icon_state = "crawling" - icon_state = "crawling" icon_living = "crawling" icon_dead = "dead" mob_biotypes = MOB_ORGANIC|MOB_HUMANOID From 5c240c87f3dcb43a2abb8ed609f69b18d6aaa782 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:07:15 +0100 Subject: [PATCH 42/55] remove duplicate var definition in /mob/living/simple_animal/hostile/lightgeist --- .../mob/living/simple_animal/hostile/megafauna/colossus.dm | 1 - 1 file changed, 1 deletion(-) 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 a93bd04182a..e51da845960 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -660,7 +660,6 @@ Difficulty: Very Hard faction = list("neutral") del_on_death = TRUE unsuitable_atmos_damage = 0 - movement_type = FLYING minbodytemp = 0 maxbodytemp = 1500 obj_damage = 0 From 7bd69f587b1a3323e2381bfe8bb9da8d32ff6c9d Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:08:54 +0100 Subject: [PATCH 43/55] remove duplicate var definition in /mob/living/simple_animal/hostile/asteroid/basilisk --- .../mob/living/simple_animal/hostile/mining_mobs/basilisk.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index 8ddb871fc47..cc9e967ffe3 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -29,7 +29,6 @@ a_intent = INTENT_HARM speak_emote = list("chitters") attack_sound = 'sound/weapons/bladeslice.ogg' - vision_range = 2 aggro_vision_range = 9 turns_per_move = 5 gold_core_spawnable = HOSTILE_SPAWN From 6ea67b18f3af5f7e3f1ba8252d603b61d41b4fe0 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:10:17 +0100 Subject: [PATCH 44/55] remove duplicate var definition in /mob/living/simple_animal/hostile/asteroid/goliath --- .../mob/living/simple_animal/hostile/mining_mobs/goliath.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm index 735b33a48d9..b9505be7471 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goliath.dm @@ -16,7 +16,6 @@ friendly_verb_continuous = "wails at" friendly_verb_simple = "wail at" speak_emote = list("bellows") - vision_range = 4 speed = 3 maxHealth = 300 health = 300 From 59fb7d3a4a010e1f97b8edc55dbc5915aff2c87b Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:10:46 +0100 Subject: [PATCH 45/55] remove duplicate var definition in /mob/living/simple_animal/slime --- code/modules/mob/living/simple_animal/slime/slime.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index bac694c7ded..ac8350da0cc 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -28,7 +28,6 @@ maxHealth = 150 health = 150 healable = 0 - gender = NEUTER see_in_dark = 8 From 70acd2bc4867b02cd9f5e9d6ad695b419e560a44 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:11:55 +0100 Subject: [PATCH 46/55] remove duplicate var definition from /obj/item/energy_katana --- code/modules/ninja/energy_katana.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index 092f078efa1..9a95b97ddb6 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -12,7 +12,6 @@ w_class = WEIGHT_CLASS_NORMAL hitsound = 'sound/weapons/bladeslice.ogg' attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut") - block_chance = 50 slot_flags = ITEM_SLOT_BACK|ITEM_SLOT_BELT sharpness = IS_SHARP max_integrity = 200 From 076e532e65f639b69db7322095925bc9ec2595c5 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:13:11 +0100 Subject: [PATCH 47/55] remove duplicate var definitions in /obj/item/gun/magic --- code/modules/projectiles/guns/magic.dm | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm index 7d02c431fc6..e027914545d 100644 --- a/code/modules/projectiles/guns/magic.dm +++ b/code/modules/projectiles/guns/magic.dm @@ -4,8 +4,8 @@ icon = 'icons/obj/guns/magic.dmi' icon_state = "staffofnothing" item_state = "staff" - lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' - righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' + 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' fire_sound = 'sound/weapons/emitter.ogg' flags_1 = CONDUCT_1 w_class = WEIGHT_CLASS_HUGE @@ -21,9 +21,6 @@ trigger_guard = TRIGGER_GUARD_ALLOW_ALL // Has no trigger at all, uses magic instead pin = /obj/item/firing_pin/magic - 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' - /obj/item/gun/magic/process_fire(atom/target, mob/living/user, message, params, zone_override, bonus_spread) if(no_den_usage) var/area/A = get_area(user) From 45f2feda3b745e24d1bda1575e8795ded2811298 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:15:41 +0100 Subject: [PATCH 48/55] replace extra icon_state with item_state in /obj/item/gun/ballistic/rifle --- code/modules/projectiles/guns/ballistic/rifle.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm index 19ef904ab44..43c93b8a166 100644 --- a/code/modules/projectiles/guns/ballistic/rifle.dm +++ b/code/modules/projectiles/guns/ballistic/rifle.dm @@ -2,7 +2,7 @@ name = "Bolt Rifle" desc = "Some kind of bolt action rifle. You get the feeling you shouldn't have this." icon_state = "moistnugget" - icon_state = "moistnugget" + item_state = "moistnugget" mag_type = /obj/item/ammo_box/magazine/internal/boltaction bolt_wording = "bolt" bolt_type = BOLT_TYPE_STANDARD From 0e1bab08694f015e04a721b51f93eb41624f9deb Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:17:56 +0100 Subject: [PATCH 49/55] remove duplicate var definition in /obj/projectile/bullet/p50/penetrator --- code/modules/projectiles/projectile/bullets/sniper.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/projectiles/projectile/bullets/sniper.dm b/code/modules/projectiles/projectile/bullets/sniper.dm index cb6e4ad5c13..eab5e0f06cc 100644 --- a/code/modules/projectiles/projectile/bullets/sniper.dm +++ b/code/modules/projectiles/projectile/bullets/sniper.dm @@ -30,9 +30,8 @@ return ..() /obj/projectile/bullet/p50/penetrator - name =".50 penetrator bullet" - icon_state = "gauss" name = "penetrator round" + icon_state = "gauss" damage = 60 movement_type = FLYING | UNSTOPPABLE dismemberment = 0 //It goes through you cleanly. From 6600d43ba94c60b54a20126ea6b17114c8781bde Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:18:43 +0100 Subject: [PATCH 50/55] remove duplicate /obj/item/reagent_containers/glass/bottle/formaldehyde --- code/modules/reagents/reagent_containers/bottle.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 79fc7653eb6..98fce0d6884 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/code/modules/reagents/reagent_containers/bottle.dm @@ -98,11 +98,6 @@ desc = "A small bottle of synaptizine." list_reagents = list(/datum/reagent/medicine/synaptizine = 30) -/obj/item/reagent_containers/glass/bottle/formaldehyde - name = "formaldehyde bottle" - desc = "A small bottle of formaldehyde." - list_reagents = list(/datum/reagent/toxin/formaldehyde = 30) - /obj/item/reagent_containers/glass/bottle/ammonia name = "ammonia bottle" desc = "A small bottle of ammonia." From b492bb56a407f7d0421a58f665cb1123b7fdfa01 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:19:41 +0100 Subject: [PATCH 51/55] remove duplicate var definition in /datum/design/board/telecomms_server --- code/modules/research/designs/telecomms_designs.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/research/designs/telecomms_designs.dm b/code/modules/research/designs/telecomms_designs.dm index eb4b404db4d..18c7b4a9caf 100644 --- a/code/modules/research/designs/telecomms_designs.dm +++ b/code/modules/research/designs/telecomms_designs.dm @@ -49,7 +49,6 @@ build_path = /obj/item/circuitboard/machine/telecomms/server category = list("Subspace Telecomms") departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE /datum/design/board/telecomms_messaging name = "Machine Design (Messaging Server)" From 816b46348702a3a0c7a3b65b072414bc0c8c949a Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:20:20 +0100 Subject: [PATCH 52/55] remove duplicate /obj/screen/alert/status_effect/bloodchill --- .../research/xenobiology/crossbreeding/_status_effects.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm index 189f7ac976b..8cfda0bf7e4 100644 --- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm +++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm @@ -195,11 +195,6 @@ /datum/status_effect/bloodchill/on_remove() owner.remove_movespeed_modifier("bloodchilled") -/obj/screen/alert/status_effect/bloodchill - name = "Bloodchilled" - desc = "You feel a shiver down your spine after getting hit with a glob of cold blood. You'll move slower and get frostbite for a while!" - icon_state = "bloodchill" - /datum/status_effect/bonechill id = "bonechill" duration = 80 From 74e069e43dc44faaeef8974abb0c73453084bc80 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:21:04 +0100 Subject: [PATCH 53/55] remove duplicate /obj/structure/fans/tiny/invisible --- code/modules/ruins/lavaland_ruin_code.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index 1d210867b75..bf9482c1729 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -1,9 +1,5 @@ //If you're looking for spawners like ash walker eggs, check ghost_role_spawners.dm -/obj/structure/fans/tiny/invisible //For blocking air in ruin doorways - invisibility = INVISIBILITY_ABSTRACT - - ///Wizard tower item /obj/item/disk/design_disk/adv/knight_gear name = "Magic Disk of Smithing" From 66202f3e2c586daac0b5f0af5a9218d9fbf7a644 Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 00:22:39 +0100 Subject: [PATCH 54/55] remove duplicate var definition in /obj/effect/proc_holder/spell/targeted/turf_teleport/blink/cult --- code/modules/spells/spell_types/wizard.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/spells/spell_types/wizard.dm b/code/modules/spells/spell_types/wizard.dm index d934de4ff8b..0227f4b3393 100644 --- a/code/modules/spells/spell_types/wizard.dm +++ b/code/modules/spells/spell_types/wizard.dm @@ -136,7 +136,6 @@ name = "quickstep" charge_max = 100 - clothes_req = FALSE clothes_req = TRUE /obj/effect/proc_holder/spell/targeted/area_teleport/teleport From f2a2baef870ce2fee2bf3459618b80d52de8256f Mon Sep 17 00:00:00 2001 From: William Wallace Date: Wed, 9 Oct 2019 01:15:16 +0100 Subject: [PATCH 55/55] remove dupe /obj/item/clothing/head/collectable/slime --- code/modules/clothing/head/collectable.dm | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/code/modules/clothing/head/collectable.dm b/code/modules/clothing/head/collectable.dm index 5457d32e8ab..29a63c4260e 100644 --- a/code/modules/clothing/head/collectable.dm +++ b/code/modules/clothing/head/collectable.dm @@ -10,13 +10,6 @@ desc = "It smells faintly of plasma." icon_state = "petehat" -/obj/item/clothing/head/collectable/slime - name = "collectable slime cap!" - desc = "It just latches right in place!" - clothing_flags = SNUG_FIT - icon_state = "slime" - dynamic_hair_suffix = "" - /obj/item/clothing/head/collectable/xenom name = "collectable xenomorph helmet!" desc = "Hiss hiss hiss!" @@ -81,6 +74,7 @@ icon_state = "headslime" item_state = "headslime" clothing_flags = SNUG_FIT + dynamic_hair_suffix = "" /obj/item/clothing/head/collectable/flatcap name = "collectable flat cap"