From be3589a0be2a12d94d50d33fe822e70fe56d49e7 Mon Sep 17 00:00:00 2001 From: Sugarette Date: Mon, 17 Feb 2014 10:28:01 +0300 Subject: [PATCH 1/9] Fixed origin_tech in manipulator items --- code/defines/obj/weapon.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 0f6a61ef7a8..c51f30c453e 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -480,7 +480,7 @@ name = "nano-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "nano_mani" - origin_tech = "materials=3,programming=2" + origin_tech = "materials=3;programming=2" rating = 2 m_amt = 30 @@ -523,7 +523,7 @@ name = "pico-manipulator" desc = "A tiny little manipulator used in the construction of certain devices." icon_state = "pico_mani" - origin_tech = "materials=5,programming=2" + origin_tech = "materials=5;programming=2" rating = 3 m_amt = 30 From 2b864693e73fc40fdcafb504096f1bf5cf584e40 Mon Sep 17 00:00:00 2001 From: Sugarette Date: Mon, 17 Feb 2014 10:32:46 +0300 Subject: [PATCH 2/9] Fixed origin_tech in pacman circuitboard --- code/game/machinery/constructable_frame.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 39fc9ce8b28..4b54247d33d 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -382,7 +382,7 @@ to destroy them and players will be able to make replacements. name = "circuit board (PACMAN-type Generator)" build_path = /obj/machinery/power/port_gen/pacman board_type = "machine" - origin_tech = "programming=3:powerstorage=3;plasmatech=3;engineering=3" + origin_tech = "programming=3;powerstorage=3;plasmatech=3;engineering=3" req_components = list( "/obj/item/weapon/stock_parts/matter_bin" = 1, "/obj/item/weapon/stock_parts/micro_laser" = 1, From f90498ff5be5679029ed310eed2cc01736e2fb04 Mon Sep 17 00:00:00 2001 From: Sugarette Date: Mon, 17 Feb 2014 10:39:42 +0300 Subject: [PATCH 3/9] Removed redundant origin_tech declarations Some of them were misspelled, too. --- code/game/machinery/computer/buildandrepair.dm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 1d9384cb58d..65552c19747 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -119,7 +119,6 @@ /obj/item/weapon/circuitboard/arcade/orion_trail name = "circuit board (Orion_Trail)" build_path = /obj/machinery/computer/arcade/orion_trail - origin_tech = "programming=2" /obj/item/weapon/circuitboard/turbine_control name = "circuit board (Turbine control)" build_path = /obj/machinery/computer/turbine_computer @@ -162,7 +161,6 @@ /obj/item/weapon/circuitboard/ordercomp name = "circuit board (Supply Ordering Console)" build_path = /obj/machinery/computer/ordercomp - origin_tech = "programming=2" /obj/item/weapon/circuitboard/supplycomp name = "circuit board (Supply shuttle console)" build_path = /obj/machinery/computer/supplycomp @@ -175,7 +173,6 @@ /obj/item/weapon/circuitboard/mining name = "circuit board (Outpost Status Display)" build_path = /obj/machinery/computer/security/mining - origin_tech = "programming=2" /obj/item/weapon/circuitboard/comm_monitor name = "circuit board (Telecommunications Monitor)" build_path = /obj/machinery/computer/telecomms/monitor @@ -197,20 +194,16 @@ /obj/item/weapon/circuitboard/shuttle name = "circuit board (Shuttle)" build_path = /obj/machinery/computer/shuttle - origin_tech = "programming=2" id = "1" /obj/item/weapon/circuitboard/labor_shuttle name = "circuit Board (Labor Shuttle)" build_path = /obj/machinery/computer/shuttle/labor - origin_tech = "programming 2" /obj/item/weapon/circuitboard/labor_shuttle/one_way name = "circuit Board (Prisoner Shuttle Console)" build_path = /obj/machinery/computer/shuttle/labor/one_way - origin_tech = "programming 2" /obj/item/weapon/circuitboard/mining_shuttle name = "circuit Board (Mining Shuttle)" build_path = /obj/machinery/computer/shuttle/mining - origin_tech = "programming 2" /obj/item/weapon/circuitboard/HolodeckControl // Not going to let people get this, but it's just here for future name = "circuit board (Holodeck Control)" build_path = /obj/machinery/computer/HolodeckControl @@ -222,11 +215,9 @@ /obj/item/weapon/circuitboard/area_atmos name = "circuit board (Area Air Control)" build_path = /obj/machinery/computer/area_atmos - origin_tech = "programming=2" /*/obj/item/weapon/circuitboard/prison_shuttle name = "circuit board (Prison Shuttle)" - build_path = /obj/machinery/computer/prison_shuttle - origin_tech = "programming=2"*/ + build_path = /obj/machinery/computer/prison_shuttle*/ /obj/item/weapon/circuitboard/supplycomp/attackby(obj/item/I as obj, mob/user as mob) From 2286d6dc610c068a4d0d0972d57a06801ba1cfd4 Mon Sep 17 00:00:00 2001 From: Sugarette Date: Mon, 17 Feb 2014 10:44:00 +0300 Subject: [PATCH 4/9] Merged two lines with origin_tech One used to overwrite the other. --- code/game/objects/items/devices/laserpointer.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index f3ad94f3fe7..3f60c5402b1 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -10,8 +10,7 @@ m_amt = 500 g_amt = 500 w_class = 2 //Increased to 2, because diodes are w_class 2. Conservation of matter. - origin_tech = "combat=1" - origin_tech = "magnets=2" + origin_tech = "combat=1;magnets=2" var/turf/pointer_loc var/energy = 5 var/max_energy = 5 @@ -205,4 +204,4 @@ energy = max_energy recharging = 0 recharge_locked = 0 - ..() \ No newline at end of file + ..() From c5488cc6cec67e4384ae214347c9e5519e3e996d Mon Sep 17 00:00:00 2001 From: Sugarette Date: Mon, 17 Feb 2014 10:47:21 +0300 Subject: [PATCH 5/9] Replaced empty string with null in origin_tech Changed it to keep in line with what seems to be a standard. --- .../objects/items/stacks/sheets/leather.dm | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index 8ba88796363..66f22c5cc58 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -3,42 +3,42 @@ desc = "The by-product of human farming." singular_name = "human skin piece" icon_state = "sheet-hide" - origin_tech = "" + origin_tech = null /obj/item/stack/sheet/animalhide/corgi name = "corgi hide" desc = "The by-product of corgi farming." singular_name = "corgi hide piece" icon_state = "sheet-corgi" - origin_tech = "" + origin_tech = null /obj/item/stack/sheet/animalhide/cat name = "cat hide" desc = "The by-product of cat farming." singular_name = "cat hide piece" icon_state = "sheet-cat" - origin_tech = "" + origin_tech = null /obj/item/stack/sheet/animalhide/monkey name = "monkey hide" desc = "The by-product of monkey farming." singular_name = "monkey hide piece" icon_state = "sheet-monkey" - origin_tech = "" + origin_tech = null /obj/item/stack/sheet/animalhide/lizard name = "lizard skin" desc = "Sssssss..." singular_name = "lizard skin piece" icon_state = "sheet-lizard" - origin_tech = "" + origin_tech = null /obj/item/stack/sheet/animalhide/xeno name = "alien hide" desc = "The skin of a terrible creature." singular_name = "alien hide piece" icon_state = "sheet-xeno" - origin_tech = "" + origin_tech = null //don't see anywhere else to put these, maybe together they could be used to make the xenos suit? /obj/item/stack/sheet/xenochitin @@ -47,35 +47,35 @@ singular_name = "alien hide piece" icon = 'icons/mob/alien.dmi' icon_state = "chitin" - origin_tech = "" + origin_tech = null /obj/item/xenos_claw name = "alien claw" desc = "The claw of a terrible creature." icon = 'icons/mob/alien.dmi' icon_state = "claw" - origin_tech = "" + origin_tech = null /obj/item/weed_extract name = "weed extract" desc = "A piece of slimy, purplish weed." icon = 'icons/mob/alien.dmi' icon_state = "weed_extract" - origin_tech = "" + origin_tech = null /obj/item/stack/sheet/hairlesshide name = "hairless hide" desc = "This hide was stripped of it's hair, but still needs tanning." singular_name = "hairless hide piece" icon_state = "sheet-hairlesshide" - origin_tech = "" + origin_tech = null /obj/item/stack/sheet/wetleather name = "wet leather" desc = "This leather has been cleaned but still needs to be dried." singular_name = "wet leather piece" icon_state = "sheet-wetleather" - origin_tech = "" + origin_tech = null var/wetness = 30 //Reduced when exposed to high temperautres var/drying_threshold_temperature = 500 //Kelvin to start drying @@ -133,4 +133,4 @@ var/obj/item/stack/sheet/leather/HS = new(src.loc) HS.amount = 1 wetness = initial(wetness) - src.use(1) \ No newline at end of file + src.use(1) From c16be9dfc5c9ccc3a02c0455d3525c067b0f9dfc Mon Sep 17 00:00:00 2001 From: Sugarette Date: Mon, 17 Feb 2014 10:50:28 +0300 Subject: [PATCH 6/9] Changed toy double saber's origin tech to null --- code/game/objects/items/toys.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 7532d4b2d37..97c248cb3f2 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -378,7 +378,7 @@ throw_range = 5 force_unwielded = 0 force_wielded = 0 - origin_tech = "" + origin_tech = null attack_verb = list("attacked", "struck", "hit") /obj/item/weapon/twohanded/dualsaber/toy/IsShield() From a319c216b3de0fee240215626094f91a662b0bdb Mon Sep 17 00:00:00 2001 From: Sugarette Date: Mon, 17 Feb 2014 10:51:48 +0300 Subject: [PATCH 7/9] Fixed origin_tech in lesser scroll --- code/game/objects/items/weapons/scrolls.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/scrolls.dm b/code/game/objects/items/weapons/scrolls.dm index 56e04af2d1a..85ec10e261d 100644 --- a/code/game/objects/items/weapons/scrolls.dm +++ b/code/game/objects/items/weapons/scrolls.dm @@ -13,7 +13,7 @@ /obj/item/weapon/teleportation_scroll/apprentice name = "lesser scroll of teleportation" uses = 1 - origin_tech = "bluespace 2" + origin_tech = "bluespace=2" @@ -94,4 +94,4 @@ user.loc = pick(L) smoke.start() - src.uses -= 1 \ No newline at end of file + src.uses -= 1 From e18d9c10c0d6daae4a372a7a8d10c3a53147edbf Mon Sep 17 00:00:00 2001 From: Sugarette Date: Mon, 17 Feb 2014 10:52:47 +0300 Subject: [PATCH 8/9] Fixed origin_tech in both weapons --- code/game/objects/items/weapons/singularityhammer.dm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/weapons/singularityhammer.dm b/code/game/objects/items/weapons/singularityhammer.dm index 52a75164cf3..974e64850b2 100644 --- a/code/game/objects/items/weapons/singularityhammer.dm +++ b/code/game/objects/items/weapons/singularityhammer.dm @@ -1,4 +1,3 @@ - /obj/item/weapon/twohanded/singularityhammer name = "singularity hammer" desc = "The pinnacle of close combat technology, the hammer harnesses the power of a miniaturized singularity to deal crushing blows." @@ -12,7 +11,7 @@ throw_range = 1 w_class = 5 var/charged = 5 - origin_tech = "combat=5, bluespace=4" + origin_tech = "combat=5;bluespace=4" @@ -84,7 +83,7 @@ throw_range = 10 w_class = 5 //var/charged = 5 - origin_tech = "combat=5, power=5" + origin_tech = "combat=5;powerstorage=5" /* @@ -130,4 +129,4 @@ /obj/item/weapon/twohanded/mjollnir/update_icon() //Currently only here to fuck with the on-mob icons. icon_state = "mjollnir[wielded]" - return \ No newline at end of file + return From 653ec88ab8d6dbec8248d5a8de463018de3b5995 Mon Sep 17 00:00:00 2001 From: Sugarette Date: Mon, 17 Feb 2014 10:53:48 +0300 Subject: [PATCH 9/9] Fixed origin_tech in experimental welding tool --- code/game/objects/items/weapons/tools.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/tools.dm b/code/game/objects/items/weapons/tools.dm index 15e5b03ed07..c7946359471 100644 --- a/code/game/objects/items/weapons/tools.dm +++ b/code/game/objects/items/weapons/tools.dm @@ -397,7 +397,7 @@ w_class = 3.0 m_amt = 70 g_amt = 120 - origin_tech = "engineering=4;plasma=3" + origin_tech = "engineering=4;plasmatech=3" icon_state = "ewelder" var/last_gen = 0 @@ -433,4 +433,4 @@ /obj/item/weapon/crowbar/red icon = 'icons/obj/items.dmi' icon_state = "red_crowbar" - item_state = "crowbar_red" \ No newline at end of file + item_state = "crowbar_red"