From 81039b131b4721955beb9a89952ec5391dc96b27 Mon Sep 17 00:00:00 2001 From: Seris02 Date: Fri, 31 Jan 2020 09:49:08 +0800 Subject: [PATCH 1/4] fixes --- code/game/objects/items/storage/toolbox.dm | 2 +- code/modules/cargo/exports/weapons.dm | 2 +- code/modules/uplink/uplink_items/uplink_roles.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 880b714f76..b0a29e5c68 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -251,7 +251,7 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons) new /obj/item/ammo_box/a762(src) new /obj/item/ammo_box/a762(src) -/obj/item/storage/toolbox/gold_real +/obj/item/storage/toolbox/plastitanium/gold_real name = "golden toolbox" desc = "A larger then normal toolbox made of gold plated plastitanium." icon_state = "gold" diff --git a/code/modules/cargo/exports/weapons.dm b/code/modules/cargo/exports/weapons.dm index 18a525b8dd..5b78a5d630 100644 --- a/code/modules/cargo/exports/weapons.dm +++ b/code/modules/cargo/exports/weapons.dm @@ -342,7 +342,7 @@ /datum/export/weapon/real_toolbox cost = 600 unit_name = "golden toolbox" - export_types = list(/obj/item/storage/toolbox/gold_real) + export_types = list(/obj/item/storage/toolbox/plastitanium/gold_real) /datum/export/weapon/melee cost = 50 diff --git a/code/modules/uplink/uplink_items/uplink_roles.dm b/code/modules/uplink/uplink_items/uplink_roles.dm index 89d3c25700..7e9d1ccff3 100644 --- a/code/modules/uplink/uplink_items/uplink_roles.dm +++ b/code/modules/uplink/uplink_items/uplink_roles.dm @@ -127,7 +127,7 @@ /datum/uplink_item/role_restricted/goldenbox name = "Gold Toolbox" desc = "A gold planted plastitanium toolbox loaded with tools. Comes with a set of AI detection multi-tool and a pare of combat gloves." - item = /obj/item/storage/toolbox/gold_real + item = /obj/item/storage/toolbox/plastitanium/gold_real cost = 3 // Has syndie tools + gloves + a robust weapon restricted_roles = list("Assistant", "Curator") //Curator due to this being made of gold - It fits the theme From 8053e438382f0a31666a95346bebfe393f1318f6 Mon Sep 17 00:00:00 2001 From: Seris02 <49109742+Seris02@users.noreply.github.com> Date: Sun, 2 Feb 2020 12:21:26 +0800 Subject: [PATCH 2/4] Update code/modules/uplink/uplink_items/uplink_roles.dm Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/uplink/uplink_items/uplink_roles.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/uplink/uplink_items/uplink_roles.dm b/code/modules/uplink/uplink_items/uplink_roles.dm index 7e9d1ccff3..44e0015f1a 100644 --- a/code/modules/uplink/uplink_items/uplink_roles.dm +++ b/code/modules/uplink/uplink_items/uplink_roles.dm @@ -126,7 +126,7 @@ /datum/uplink_item/role_restricted/goldenbox name = "Gold Toolbox" - desc = "A gold planted plastitanium toolbox loaded with tools. Comes with a set of AI detection multi-tool and a pare of combat gloves." + desc = "A gold plated plastitanium toolbox. It comes loaded with a full tool set including a AI detector multitool and combat gloves." item = /obj/item/storage/toolbox/plastitanium/gold_real cost = 3 // Has syndie tools + gloves + a robust weapon restricted_roles = list("Assistant", "Curator") //Curator due to this being made of gold - It fits the theme From d3d4a9f05b6afcbeb9f54dfb721bbe2ed009afef Mon Sep 17 00:00:00 2001 From: Seris02 <49109742+Seris02@users.noreply.github.com> Date: Sun, 2 Feb 2020 12:21:32 +0800 Subject: [PATCH 3/4] Update code/modules/uplink/uplink_items/uplink_roles.dm Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com> --- code/modules/uplink/uplink_items/uplink_roles.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/uplink/uplink_items/uplink_roles.dm b/code/modules/uplink/uplink_items/uplink_roles.dm index 44e0015f1a..09f6e94763 100644 --- a/code/modules/uplink/uplink_items/uplink_roles.dm +++ b/code/modules/uplink/uplink_items/uplink_roles.dm @@ -128,7 +128,7 @@ name = "Gold Toolbox" desc = "A gold plated plastitanium toolbox. It comes loaded with a full tool set including a AI detector multitool and combat gloves." item = /obj/item/storage/toolbox/plastitanium/gold_real - cost = 3 // Has syndie tools + gloves + a robust weapon + cost = 4 // Has syndie tools + gloves + a robust weapon restricted_roles = list("Assistant", "Curator") //Curator due to this being made of gold - It fits the theme /datum/uplink_item/role_restricted/mimery From 8a81ba9efee25cfff0e74d9dce1c69db7dcd1321 Mon Sep 17 00:00:00 2001 From: Ghom <42542238+Ghommie@users.noreply.github.com> Date: Sun, 2 Feb 2020 18:40:06 +0100 Subject: [PATCH 4/4] Ok here we go. --- code/game/objects/items/storage/toolbox.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index b0a29e5c68..4a3522fbd4 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -257,10 +257,6 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons) icon_state = "gold" item_state = "toolbox_gold" has_latches = FALSE - force = 16 // Less then a spear - throwforce = 14 - throw_speed = 5 - throw_range = 10 /obj/item/storage/toolbox/gold_real/PopulateContents() new /obj/item/screwdriver/nuke(src)