diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm index 532d4958b22..b1ad1b4ea92 100644 --- a/code/game/objects/items/weapons/weaponry.dm +++ b/code/game/objects/items/weapons/weaponry.dm @@ -104,7 +104,7 @@ force = 9 throwforce = 10 w_class = 3 - materials = list(MAT_METAL=1875) + materials = list(MAT_METAL=1000) attack_verb = list("hit", "bludgeoned", "whacked", "bonked") /obj/item/weapon/wirerod/attackby(obj/item/I, mob/user, params) diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index 47eef2e9eb7..334be992a43 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -481,7 +481,7 @@ icon = 'icons/obj/items.dmi' icon_state = "rack_parts" flags = CONDUCT - materials = list(MAT_METAL=3750) + materials = list(MAT_METAL=2000) /obj/item/weapon/rack_parts/attackby(obj/item/weapon/W, mob/user, params) ..() diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index f1334036a89..c9a11073725 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -65,7 +65,7 @@ throwforce = 10.0 item_state = "pickaxe" w_class = 4.0 - materials = list(MAT_METAL=3750) //one sheet, but where can you make them? + materials = list(MAT_METAL=2000) //one sheet, but where can you make them? var/digspeed = 40 var/list/digsound = list('sound/effects/picaxe1.ogg','sound/effects/picaxe2.ogg','sound/effects/picaxe3.ogg') origin_tech = "materials=1;engineering=1" @@ -194,9 +194,9 @@ start_turf = locate(start_turf.x -2, start_turf.y - 2, start_turf.z) room = spawn_room(start_turf, x_size, y_size, walltypes, floor_type, "Emergency Shelter") - + start_turf = get_turf(src.loc) - + //Fill it cur_turf = locate(start_turf.x, start_turf.y-2, start_turf.z) new /obj/machinery/door/airlock/glass(cur_turf) diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index 8e117dc0bee..b4076859184 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -24,7 +24,7 @@ Design Guidlines reliability_mod (starts at 0, gets improved through experimentation). Example: PACMAN generator. 79 base reliablity + 6 tech (3 plasmatech, 3 powerstorage) + 0 (since it's completely new) = 85% reliability. Reliability is the chance it works CORRECTLY. - When adding new designs, check rdreadme.dm to see what kind of things have already been made and where new stuff is needed. -- A single sheet of anything is 3750 units of material. Materials besides metal/glass require help from other jobs (mining for +- A single sheet of anything is 2000 units of material. Materials besides metal/glass require help from other jobs (mining for other types of metals and chemistry for reagents). - Add the AUTOLATHE tag to */ @@ -142,7 +142,7 @@ other types of metals and chemistry for reagents). id = "drill_diamond" req_tech = list("materials" = 6, "powerstorage" = 4, "engineering" = 4) build_type = PROTOLATHE - materials = list(MAT_METAL = 6000, MAT_GLASS = 1000, MAT_DIAMOND = 3750) //Yes, a whole diamond is needed. + materials = list(MAT_METAL = 6000, MAT_GLASS = 1000, MAT_DIAMOND = 2000) //Yes, a whole diamond is needed. reliability = 79 build_path = /obj/item/weapon/pickaxe/drill/diamonddrill category = list("Mining Designs") diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm index c3a14613b65..6f349b66ad1 100644 --- a/code/modules/research/designs/mechfabricator_designs.dm +++ b/code/modules/research/designs/mechfabricator_designs.dm @@ -670,7 +670,7 @@ build_type = MECHFAB build_path = /obj/item/borg/upgrade/ddrill req_tech = list("engineering" = 5, "materials" = 5) - materials = list(MAT_METAL=10000, MAT_DIAMOND=3750) + materials = list(MAT_METAL=10000, MAT_DIAMOND=2000) construction_time = 120 category = list("Cyborg Upgrade Modules") diff --git a/config/admins.txt b/config/admins.txt index 3b29d011131..b1dd2072f34 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -92,4 +92,6 @@ Dunc = Game Master MMMiracles = Game Master bear1ake = Game Master CoreOverload = Game Master -Jalleo = Game Master \ No newline at end of file +Jalleo = Game Master + +FoxPMcCloud = Game Master \ No newline at end of file diff --git a/html/changelogs/Fox P McCloud - Impropermaterials.yml b/html/changelogs/Fox P McCloud - Impropermaterials.yml new file mode 100644 index 00000000000..b1aa446047e --- /dev/null +++ b/html/changelogs/Fox P McCloud - Impropermaterials.yml @@ -0,0 +1,7 @@ + +author: Fox P McCloud + +delete-after: True + +changes: + - bugfix: "Fixes an exploit and inconsistency issue with a few material amounts on a few items and designs."