From 0a2fd6052017eb1814f4324abb57d181c074c1db Mon Sep 17 00:00:00 2001 From: Poojawa Date: Sun, 4 Sep 2016 07:34:46 -0500 Subject: [PATCH] Science nerfs (#28) * Because No * Okay not as much no this time * Cargo is impossible to nerf --- .../structures/crates_lockers/closets/secure/scientist.dm | 3 +-- code/modules/cargo/packs.dm | 2 +- code/modules/research/designs/weapon_designs.dm | 8 +++++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm index db0851b4bd..348dc923e0 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm @@ -22,5 +22,4 @@ new /obj/item/clothing/suit/armor/reactive/teleport(src) new /obj/item/device/assembly/flash/handheld(src) new /obj/item/device/laser_pointer(src) - new /obj/item/weapon/door_remote/research_director(src) - new /obj/item/weapon/storage/box/firingpins(src) + new /obj/item/weapon/door_remote/research_director(src) \ No newline at end of file diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 4e4c0c427f..3c7a430a26 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -1506,4 +1506,4 @@ /obj/item/weapon/canvas/twentythreeXtwentythree, /obj/item/toy/crayon/rainbow, /obj/item/toy/crayon/rainbow) - crate_name= "art supply crate" + crate_name= "art supply crate" \ No newline at end of file diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 26121faba7..b38453e220 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -46,9 +46,9 @@ name = "Telescopic Riot Shield" desc = "An advanced riot shield made of lightweight materials that collapses for easy storage." id = "tele_shield" - req_tech = list("combat" = 4, "materials" = 3, "engineering" = 4) + req_tech = list("combat" = 5, "materials" = 4, "engineering" = 4) build_type = PROTOLATHE - materials = list(MAT_METAL = 4000, MAT_GLASS = 5000, MAT_SILVER = 300) + materials = list(MAT_METAL = 4000, MAT_GLASS = 5000, MAT_SILVER = 3000) build_path = /obj/item/weapon/shield/riot/tele category = list("Weapons") @@ -198,6 +198,8 @@ category = list("Weapons") //WT550 Mags +// Literally cancer - Poojawa +/* /datum/design/mag_oldsmg name = "WT-550 Auto Gun Magazine (4.6x30mm)" @@ -229,7 +231,7 @@ id = "mag_oldsmg_tx" materials = list(MAT_METAL = 6000, MAT_SILVER = 600, MAT_URANIUM = 2000) build_path = /obj/item/ammo_box/magazine/wt550m9/wttx - +*/ /datum/design/stunshell name = "Stun Shell" desc = "A stunning shell for a shotgun."