From 2ffc5f055ccc8a699c9cc5f2ef20409f62024ce2 Mon Sep 17 00:00:00 2001 From: YotaXP Date: Thu, 5 Nov 2015 15:32:25 -0500 Subject: [PATCH] Fixed bad `origin_tech` values. --- code/game/gamemodes/abduction/gland.dm | 2 +- code/game/mecha/equipment/weapons/weapons.dm | 2 +- code/game/objects/items/devices/camera_bug.dm | 2 +- code/game/objects/items/devices/doorCharge.dm | 2 +- code/game/objects/items/stacks/tiles/tile_mineral.dm | 12 ++++++------ code/game/objects/items/stacks/tiles/tile_types.dm | 2 +- code/modules/clothing/shoes/magboots.dm | 2 +- code/modules/mob/living/carbon/alien/organs.dm | 4 ++-- code/modules/power/cell.dm | 4 ++-- code/modules/projectiles/guns/energy/nuclear.dm | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/code/game/gamemodes/abduction/gland.dm b/code/game/gamemodes/abduction/gland.dm index 0a8d5814359..fa610dae27b 100644 --- a/code/game/gamemodes/abduction/gland.dm +++ b/code/game/gamemodes/abduction/gland.dm @@ -255,7 +255,7 @@ /obj/item/organ/internal/gland/plasma cooldown_low = 2400 cooldown_high = 3000 - origin_tech = "materials=4;biotech=5;plasma=3" + origin_tech = "materials=4;biotech=5;plasmatech=3" uses = 1 /obj/item/organ/internal/gland/plasma/activate() diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index 6ce6246dbad..ae89085fdb2 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -109,7 +109,7 @@ icon_state = "mecha_plasmacutter" item_state = "plasmacutter" energy_drain = 60 - origin_tech = "materials=3;combat=2;powerstorage=3;plasma=3" + origin_tech = "materials=3;combat=2;powerstorage=3;plasmatech=3" projectile = /obj/item/projectile/plasma/adv/mech fire_sound = 'sound/weapons/Laser.ogg' diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 3514229bf13..7d283c67787 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -14,7 +14,7 @@ item_state = "camera_bug" throw_speed = 4 throw_range = 20 - origin_tech = "syndicate=3;engineering=;1" + origin_tech = "syndicate=3;engineering=1" var/obj/machinery/camera/current = null diff --git a/code/game/objects/items/devices/doorCharge.dm b/code/game/objects/items/devices/doorCharge.dm index 59b0a722f3c..9b0734a61d1 100644 --- a/code/game/objects/items/devices/doorCharge.dm +++ b/code/game/objects/items/devices/doorCharge.dm @@ -9,7 +9,7 @@ force = 3 attack_verb = list("blown up", "exploded", "detonated") materials = list(MAT_METAL=50, MAT_GLASS=30) - origin_tech = "syndicate=3;combat=2," + origin_tech = "syndicate=3;combat=2" /obj/item/device/doorCharge/ex_act(severity, target) switch(severity) diff --git a/code/game/objects/items/stacks/tiles/tile_mineral.dm b/code/game/objects/items/stacks/tiles/tile_mineral.dm index 89b6b09bfa6..319b1035190 100644 --- a/code/game/objects/items/stacks/tiles/tile_mineral.dm +++ b/code/game/objects/items/stacks/tiles/tile_mineral.dm @@ -3,7 +3,7 @@ singular_name = "plasma floor tile" desc = "A tile made out of highly flammable plasma. This can only end well." icon_state = "tile_plasma" - origin_tech = "plasma=1" + origin_tech = "plasmatech=1" turf_type = /turf/simulated/floor/mineral/plasma mineralType = "plasma" materials = list(MAT_PLASMA=500) @@ -13,7 +13,7 @@ singular_name = "uranium floor tile" desc = "A tile made out of uranium. You feel a bit woozy." icon_state = "tile_uranium" - origin_tech = "material=1" + origin_tech = "materials=1" turf_type = /turf/simulated/floor/mineral/uranium mineralType = "uranium" materials = list(MAT_URANIUM=500) @@ -23,7 +23,7 @@ singular_name = "gold floor tile" desc = "A tile made out of gold, the swag seems strong here." icon_state = "tile_gold" - origin_tech = "material=1" + origin_tech = "materials=1" turf_type = /turf/simulated/floor/mineral/gold mineralType = "gold" materials = list(MAT_GOLD=500) @@ -33,7 +33,7 @@ singular_name = "silver floor tile" desc = "A tile made out of silver, the light shining from it is blinding." icon_state = "tile_silver" - origin_tech = "material=1" + origin_tech = "materials=1" turf_type = /turf/simulated/floor/mineral/silver mineralType = "silver" materials = list(MAT_SILVER=500) @@ -43,7 +43,7 @@ singular_name = "diamond floor tile" desc = "A tile made out of diamond. Wow, just, wow." icon_state = "tile_diamond" - origin_tech = "material=2" + origin_tech = "materials=2" turf_type = /turf/simulated/floor/mineral/diamond mineralType = "diamond" materials = list(MAT_DIAMOND=500) @@ -53,7 +53,7 @@ singular_name = "bananium floor tile" desc = "A tile made out of bananium, HOOOOOOOOONK!" icon_state = "tile_bananium" - origin_tech = "material=1" + origin_tech = "materials=1" turf_type = /turf/simulated/floor/mineral/bananium mineralType = "bananium" materials = list(MAT_BANANIUM=500) diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm index c9d43de4d0b..f45cf2f40c6 100644 --- a/code/game/objects/items/stacks/tiles/tile_types.dm +++ b/code/game/objects/items/stacks/tiles/tile_types.dm @@ -112,7 +112,7 @@ desc = "A high-traction floor tile. It feels rubbery in your hand." icon_state = "tile_noslip" turf_type = /turf/simulated/floor/noslip - origin_tech = "material=3" + origin_tech = "materials=3" //Plasteel (normal) diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index c42f252bc26..b0b8ebc2ac3 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -53,4 +53,4 @@ name = "blood-red magboots" icon_state = "syndiemag0" magboot_state = "syndiemag" - origin_tech = "magnets=2,syndicate=3" + origin_tech = "magnets=2;syndicate=3" diff --git a/code/modules/mob/living/carbon/alien/organs.dm b/code/modules/mob/living/carbon/alien/organs.dm index 8e64f7820cc..180084a981f 100644 --- a/code/modules/mob/living/carbon/alien/organs.dm +++ b/code/modules/mob/living/carbon/alien/organs.dm @@ -30,7 +30,7 @@ /obj/item/organ/internal/alien/plasmavessel name = "plasma vessel" icon_state = "plasma" - origin_tech = "biotech=5;plasma=2" + origin_tech = "biotech=5;plasmatech=2" w_class = 3 zone = "chest" slot = "plasmavessel" @@ -55,7 +55,7 @@ plasma_rate = 15 /obj/item/organ/internal/alien/plasmavessel/large/queen - origin_tech = "biotech=6;plasma=3" + origin_tech = "biotech=6;plasmatech=3" plasma_rate = 20 /obj/item/organ/internal/alien/plasmavessel/small diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index d8027356d11..009dfeba438 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -147,7 +147,7 @@ /obj/item/weapon/stock_parts/cell/crap name = "\improper Nanotrasen brand rechargable AA battery" desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT - origin_tech = "powerstorage=0" + origin_tech = null maxcharge = 500 materials = list(MAT_GLASS=40) rating = 2 @@ -158,7 +158,7 @@ /obj/item/weapon/stock_parts/cell/secborg name = "security borg rechargable D battery" - origin_tech = "powerstorage=0" + origin_tech = null maxcharge = 600 //600 max charge / 100 charge per shot = six shots materials = list(MAT_GLASS=40) rating = 2.5 diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index dbe0225dd79..d95c659374c 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -27,7 +27,7 @@ name = "\improper DRAGnet" desc = "The \"Dynamic Rapid-Apprehension of the Guilty\" net is a revolution in law enforcement technology." icon_state = "dragnet" - origin_tech = "combat=3;magnets=3;materials=4; bluespace=4" + origin_tech = "combat=3;magnets=3;materials=4;bluespace=4" ammo_type = list(/obj/item/ammo_casing/energy/net, /obj/item/ammo_casing/energy/trap) can_flashlight = 0 ammo_x_offset = 1