From 133173c67c802f009d707f82305eb0475cf397a7 Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Thu, 20 Apr 2017 14:25:44 +0100 Subject: [PATCH] Removes adhoc types --- code/_globalvars/lists/maintenance_loot.dm | 10 +++++----- code/game/objects/effects/spawners/lootdrop.dm | 2 +- code/game/objects/items/stacks/rods.dm | 9 +++++++++ code/game/objects/items/stacks/sheets/sheet_types.dm | 3 +++ code/modules/power/cable.dm | 3 +++ 5 files changed, 21 insertions(+), 6 deletions(-) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 050e3d8f42c..849c5248a05 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -47,13 +47,13 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/device/t_scanner = 5, /obj/item/weapon/airlock_painter = 1, /obj/item/stack/cable_coil/random = 4, - /obj/item/stack/cable_coil/random{amount = 5} = 6, + /obj/item/stack/cable_coil/random/five = 6, /obj/item/stack/medical/bruise_pack = 1, - /obj/item/stack/rods{amount = 10} = 9, - /obj/item/stack/rods{amount = 23} = 1, - /obj/item/stack/rods{amount = 50} = 1, + /obj/item/stack/rods/ten = 9, + /obj/item/stack/rods/twentyfive = 1, + /obj/item/stack/rods/fifty = 1, /obj/item/stack/sheet/cardboard = 2, - /obj/item/stack/sheet/metal{amount = 20} = 1, + /obj/item/stack/sheet/metal/twenty = 1, /obj/item/stack/sheet/mineral/plasma = 1, /obj/item/stack/sheet/rglass = 1, /obj/item/weapon/book/manual/wiki/engineering_construction = 1, diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 05d465af90b..a84843b0b24 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -10,7 +10,7 @@ ..() if(mapload) // the delay gives holidays chance to modify maint loot - SSticker.OnRoundstart(CALLBACK(src, ./proc/lootdrop)) + SSticker.OnRoundstart(CALLBACK(src, .proc/lootdrop)) else lootdrop() diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm index 169d8eeb2b7..2037c719184 100644 --- a/code/game/objects/items/stacks/rods.dm +++ b/code/game/objects/items/stacks/rods.dm @@ -73,3 +73,12 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \ /obj/item/stack/rods/cyborg/update_icon() return + +/obj/item/stack/rods/ten + amount = 10 + +/obj/item/stack/rods/twentyfive + amount = 25 + +/obj/item/stack/rods/fifty + amount = 50 diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 6ab9493f4f4..a007dd45455 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -78,6 +78,9 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \ /obj/item/stack/sheet/metal/fifty amount = 50 +/obj/item/stack/sheet/metal/twenty + amount = 20 + /obj/item/stack/sheet/metal/five amount = 5 diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index cbb520b6800..fded49f58a2 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -773,3 +773,6 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai item_color = pick("red","orange","yellow","green","cyan","blue","pink","white") icon_state = "coil_[item_color]" ..() + +/obj/item/stack/cable_coil/random/five + amount = 5