From d080860a8f6ff323f4f55077016aaee915213203 Mon Sep 17 00:00:00 2001 From: TheVekter Date: Sun, 17 Nov 2019 12:47:40 -0600 Subject: [PATCH] Removes illegal tech from syndicate thrown weapons (#47820) * Changes loot table to remove syndicate throwing items from gambling drop table Removes illegal tech from Mateba revolver. * Okay fine we'll do it this way * Something something hugbox --- code/_globalvars/lists/maintenance_loot.dm | 1 + code/game/objects/effects/spawners/lootdrop.dm | 14 ++++++++------ code/modules/uplink/uplink_items.dm | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index b005ae5ad6e..19c23da273b 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -107,5 +107,6 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/toy/eightball = 1, /obj/item/reagent_containers/pill/floorpill = 1, /obj/item/reagent_containers/food/snacks/canned/peaches/maint = 1, + /obj/item/throwing_star = 1, "" = 3 )) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index dececcabc2a..7c674798cdc 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -39,16 +39,16 @@ loot = list( /obj/item/gun/ballistic/automatic/pistol = 8, /obj/item/gun/ballistic/shotgun/automatic/combat = 5, - /obj/item/gun/ballistic/revolver/mateba, - /obj/item/gun/ballistic/automatic/pistol/deagle + /obj/item/gun/ballistic/automatic/pistol/deagle, + /obj/item/gun/ballistic/revolver/mateba ) /obj/effect/spawner/lootdrop/armory_contraband/metastation loot = list(/obj/item/gun/ballistic/automatic/pistol = 5, /obj/item/gun/ballistic/shotgun/automatic/combat = 5, - /obj/item/gun/ballistic/revolver/mateba, /obj/item/gun/ballistic/automatic/pistol/deagle, - /obj/item/storage/box/syndie_kit/throwing_weapons = 3) + /obj/item/storage/box/syndie_kit/throwing_weapons = 3, + /obj/item/gun/ballistic/revolver/mateba) /obj/effect/spawner/lootdrop/armory_contraband/donutstation loot = list(/obj/item/grenade/clusterbuster/teargas = 5, @@ -61,8 +61,10 @@ name = "gambling valuables spawner" loot = list( /obj/item/gun/ballistic/revolver/russian = 5, - /obj/item/storage/box/syndie_kit/throwing_weapons = 1, - /obj/item/toy/cards/deck/syndicate = 2 + /obj/item/clothing/head/ushanka = 3, + /obj/item/storage/box/syndie_kit/throwing_weapons, + /obj/item/coin/gold, + /obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, ) /obj/effect/spawner/lootdrop/grille_or_trash diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 3f7a01d7e4d..206a733d3fa 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -366,6 +366,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) throwing weapons. The bolas can knock a target down and the shurikens will embed into limbs." item = /obj/item/storage/box/syndie_kit/throwing_weapons cost = 3 + illegal_tech = FALSE /datum/uplink_item/dangerous/shotgun name = "Bulldog Shotgun"