From 765d0ddca9097fc2d09e66db5a5cfde856ed29cd Mon Sep 17 00:00:00 2001 From: FreeStylaLT Date: Wed, 15 Jun 2016 02:55:48 +0300 Subject: [PATCH 01/10] goodies only pistols, no list yet --- code/modules/projectiles/ammunition/magazines.dm | 3 +++ code/modules/projectiles/guns/projectile/pistol.dm | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index c77dcc07595..a00f6f16747 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -180,6 +180,9 @@ max_ammo = 8 multiple_sprites = 2 +/obj/item/ammo_box/magazine/m10mm/empty //for maint drops + max_ammo = 1 + /obj/item/ammo_box/magazine/m45 name = "handgun magazine (.45)" icon_state = "45-8" diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index b2c0aa823be..a0858bbb9ad 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -26,6 +26,14 @@ mag_type = /obj/item/ammo_box/magazine/m45 can_suppress = 0 +/obj/item/weapon/gun/projectile/automatic/pistol/empty //empty stetchshit for maint spawns + desc = "A small, easily concealable 10mm handgun. Had a threaded barrel for suppressors." + can_suppress = 0 + +/obj/item/weapon/gun/projectile/automatic/pistol/empty/New() + magazine = new /obj/item/ammo_box/magazine/m10mm/empty(src) + ..() + /obj/item/weapon/gun/projectile/automatic/pistol/deagle name = "desert eagle" desc = "A robust .50 AE handgun." From 9e95dfcd17e07e094406c6900ae17ae17b8f480a Mon Sep 17 00:00:00 2001 From: FreeStylaLT Date: Thu, 16 Jun 2016 00:09:13 +0300 Subject: [PATCH 02/10] added the actual items to the list --- .../game/objects/effects/spawners/lootdrop.dm | 141 +++++++++++------- 1 file changed, 84 insertions(+), 57 deletions(-) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index d88d5a309d1..136677fac75 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -58,65 +58,92 @@ //maintcentral: 2 items, 2 spots 0 extra (08/08/2014) //port: 5 items, 5 spots 0 extra (08/08/2014) loot = list( - /obj/item/bodybag = 1, - /obj/item/clothing/glasses/meson = 2, - /obj/item/clothing/glasses/sunglasses = 1, - /obj/item/clothing/gloves/color/yellow/fake = 1, - /obj/item/clothing/head/hardhat = 1, - /obj/item/clothing/head/hardhat/red = 1, - /obj/item/clothing/head/that{throwforce = 1; throwing = 1} = 1, - /obj/item/clothing/head/ushanka = 1, - /obj/item/clothing/head/welding = 1, - /obj/item/clothing/mask/gas = 15, - /obj/item/clothing/suit/storage/hazardvest = 1, - /obj/item/clothing/under/rank/vice = 1, - /obj/item/device/assembly/prox_sensor = 4, - /obj/item/device/assembly/timer = 3, - /obj/item/device/flashlight = 4, - /obj/item/device/flashlight/pen = 1, - /obj/item/device/multitool = 2, - /obj/item/device/radio/off = 2, - /obj/item/device/t_scanner = 6, - /obj/item/stack/cable_coil = 4, - /obj/item/stack/cable_coil{amount = 5} = 6, - /obj/item/stack/medical/advanced/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/bodybag = 10, + /obj/item/clothing/glasses/meson = 20, + /obj/item/clothing/glasses/sunglasses = 10, + /obj/item/clothing/gloves/color/yellow/fake = 10, + /obj/item/clothing/head/hardhat = 10, + /obj/item/clothing/head/hardhat/red = 10, + /obj/item/clothing/head/that{throwforce = 1; throwing = 1} = 10, + /obj/item/clothing/head/ushanka = 10, + /obj/item/clothing/head/welding = 10, + /obj/item/clothing/mask/gas = 150, + /obj/item/clothing/suit/storage/hazardvest = 10, + /obj/item/clothing/under/rank/vice = 10, + /obj/item/device/assembly/prox_sensor = 40, + /obj/item/device/assembly/timer = 30, + /obj/item/device/flashlight = 40, + /obj/item/device/flashlight/pen = 10, + /obj/item/device/multitool = 20, + /obj/item/device/radio/off = 20, + /obj/item/device/t_scanner = 60, + /obj/item/stack/cable_coil = 40, + /obj/item/stack/cable_coil{amount = 5} = 60, + /obj/item/stack/medical/advanced/bruise_pack = 10, + /obj/item/stack/rods{amount = 10} = 90, + /obj/item/stack/rods{amount = 23} = 10, + /obj/item/stack/rods{amount = 50} = 10, /obj/item/stack/sheet/cardboard = 2, - /obj/item/stack/sheet/metal{amount = 20} = 1, - /obj/item/stack/sheet/mineral/plasma{layer = 2.9} = 1, - /obj/item/stack/sheet/rglass = 1, - /obj/item/weapon/book/manual/engineering_construction = 1, - /obj/item/weapon/book/manual/engineering_hacking = 1, - /obj/item/clothing/head/cone = 1, - /obj/item/weapon/coin/silver = 1, - /obj/item/weapon/coin/twoheaded = 1, - /obj/item/weapon/contraband/poster = 1, - /obj/item/weapon/crowbar = 1, - /obj/item/weapon/crowbar/red = 1, - /obj/item/weapon/extinguisher = 11, + /obj/item/stack/sheet/metal{amount = 20} = 10, + /obj/item/stack/sheet/mineral/plasma{layer = 2.9} = 10, + /obj/item/stack/sheet/rglass = 10, + /obj/item/weapon/book/manual/engineering_construction = 10, + /obj/item/weapon/book/manual/engineering_hacking = 10, + /obj/item/clothing/head/cone = 10, + /obj/item/weapon/coin/silver = 10, + /obj/item/weapon/coin/twoheaded = 10, + /obj/item/weapon/contraband/poster = 10, + /obj/item/weapon/crowbar = 10, + /obj/item/weapon/crowbar/red = 10, + /obj/item/weapon/extinguisher = 110, //obj/item/weapon/gun/projectile/revolver/russian = 1, //disabled until lootdrop is a proper world proc. - /obj/item/weapon/hand_labeler = 1, - /obj/item/weapon/paper/crumpled = 1, - /obj/item/weapon/pen = 1, - /obj/item/weapon/plantspray/pests = 1, - /obj/item/weapon/stock_parts/cell = 3, - /obj/item/weapon/storage/belt/utility = 2, - /obj/item/weapon/storage/box = 2, - /obj/item/weapon/storage/box/cups = 1, - /obj/item/weapon/storage/box/donkpockets = 1, - /obj/item/weapon/storage/box/lights/mixed = 3, - /obj/item/weapon/storage/fancy/cigarettes/dromedaryco = 1, - /obj/item/weapon/storage/toolbox/mechanical = 1, - /obj/item/weapon/screwdriver = 3, - /obj/item/weapon/tank/emergency_oxygen = 2, - /obj/item/weapon/vending_refill/cola = 1, - /obj/item/weapon/weldingtool = 3, - /obj/item/weapon/wirecutters = 1, - /obj/item/weapon/wrench = 4, - /obj/item/weapon/relic = 3, - "" = 11 + /obj/item/weapon/hand_labeler = 10, + /obj/item/weapon/paper/crumpled = 10, + /obj/item/weapon/pen = 10, + /obj/item/weapon/plantspray/pests = 10, + /obj/item/weapon/stock_parts/cell = 30, + /obj/item/weapon/storage/belt/utility = 20, + /obj/item/weapon/storage/box = 20, + /obj/item/weapon/storage/box/cups = 10, + /obj/item/weapon/storage/box/donkpockets = 10, + /obj/item/weapon/storage/box/lights/mixed = 30, + /obj/item/weapon/storage/fancy/cigarettes/dromedaryco = 10, + /obj/item/weapon/storage/toolbox/mechanical = 10, + /obj/item/weapon/screwdriver = 30, + /obj/item/weapon/tank/emergency_oxygen = 20, + /obj/item/weapon/vending_refill/cola = 10, + /obj/item/weapon/weldingtool = 30, + /obj/item/weapon/wirecutters = 10, + /obj/item/weapon/wrench = 40, + /obj/item/weapon/relic = 30, + ////////////////CONTRABAND SHIT////////////////// + /obj/item/weapon/grenade/clown_grenade = 5, + /obj/item/seeds/ambrosiavulgarisseed/cruciatus = 5, + /obj/item/clothing/under/contortionist = 5, + /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimulants = 5, + /obj/item/weapon/gun/projectile/automatic/pistol/empty = 1, + /obj/item/ammo_box/magazine/m10mm = 10, + /obj/item/weapon/soap/syndie = 20, + /obj/item/weapon/gun/syringe/syndicate = 5, + /obj/item/weapon/suppressor = 10, + /obj/item/clothing/under/chameleon = 5, + /obj/item/weapon/stamp/chameleon = 5, + /obj/item/clothing/shoes/syndigaloshes = 15, + /obj/item/clothing/mask/gas/voice = 5, + /obj/item/weapon/dnascrambler = 3, + /obj/item/weapon/storage/backpack/satchel_flat = 5, + /obj/item/weapon/storage/toolbox/syndicate = 5, + /obj/item/weapon/storage/backpack/duffel/syndie/surgery = 5, + /obj/item/weapon/storage/belt/military = 5, + /obj/item/weapon/storage/box/syndie_kit/space = 5, + /obj/item/clothing/glasses/thermal/syndi = 1, + /obj/item/device/encryptionkey/binary = 1, + /obj/item/weapon/c4 = 3, + /obj/item/weapon/pinpointer/advpinpointer = 1, + /obj/item/device/multitool/ai_detect = 5, + /obj/item/weapon/implanter/freedom = 1, + /obj/item/weapon/implanter/storage = 1, + "" = 90 ) /obj/effect/spawner/lootdrop/trade_sol_rare From e712baf111b1bfdac98d3399a0f47698a6479f34 Mon Sep 17 00:00:00 2001 From: FreeStylaLT Date: Thu, 16 Jun 2016 04:26:51 +0300 Subject: [PATCH 03/10] removed thermals, binary key and adrenal implants from the list --- code/game/objects/effects/spawners/lootdrop.dm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 136677fac75..ba0bb68f7b3 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -116,7 +116,7 @@ /obj/item/weapon/wirecutters = 10, /obj/item/weapon/wrench = 40, /obj/item/weapon/relic = 30, - ////////////////CONTRABAND SHIT////////////////// + ////////////////CONTRABAND SHIT////////////////// /obj/item/weapon/grenade/clown_grenade = 5, /obj/item/seeds/ambrosiavulgarisseed/cruciatus = 5, /obj/item/clothing/under/contortionist = 5, @@ -136,12 +136,8 @@ /obj/item/weapon/storage/backpack/duffel/syndie/surgery = 5, /obj/item/weapon/storage/belt/military = 5, /obj/item/weapon/storage/box/syndie_kit/space = 5, - /obj/item/clothing/glasses/thermal/syndi = 1, - /obj/item/device/encryptionkey/binary = 1, /obj/item/weapon/c4 = 3, - /obj/item/weapon/pinpointer/advpinpointer = 1, /obj/item/device/multitool/ai_detect = 5, - /obj/item/weapon/implanter/freedom = 1, /obj/item/weapon/implanter/storage = 1, "" = 90 ) From bbb94651088c29bfb5ac1385afd2155065dadf61 Mon Sep 17 00:00:00 2001 From: FreeStylaLT Date: Thu, 16 Jun 2016 05:00:28 +0300 Subject: [PATCH 04/10] removes stimulants (oops) adds syndicards, regular brown shoes and syndicate briefcase to loot drop list (double oops) --- code/game/objects/effects/spawners/lootdrop.dm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index ba0bb68f7b3..bd0952a482b 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -80,7 +80,7 @@ /obj/item/stack/cable_coil = 40, /obj/item/stack/cable_coil{amount = 5} = 60, /obj/item/stack/medical/advanced/bruise_pack = 10, - /obj/item/stack/rods{amount = 10} = 90, + /obj/item/stack/rods{amount = 10} = 80, /obj/item/stack/rods{amount = 23} = 10, /obj/item/stack/rods{amount = 50} = 10, /obj/item/stack/sheet/cardboard = 2, @@ -95,7 +95,7 @@ /obj/item/weapon/contraband/poster = 10, /obj/item/weapon/crowbar = 10, /obj/item/weapon/crowbar/red = 10, - /obj/item/weapon/extinguisher = 110, + /obj/item/weapon/extinguisher = 90, //obj/item/weapon/gun/projectile/revolver/russian = 1, //disabled until lootdrop is a proper world proc. /obj/item/weapon/hand_labeler = 10, /obj/item/weapon/paper/crumpled = 10, @@ -116,11 +116,11 @@ /obj/item/weapon/wirecutters = 10, /obj/item/weapon/wrench = 40, /obj/item/weapon/relic = 30, - ////////////////CONTRABAND SHIT////////////////// + /obj/item/clothing/shoes/brown = 30, + ////////////////CONTRABAND STUFF////////////////// /obj/item/weapon/grenade/clown_grenade = 5, /obj/item/seeds/ambrosiavulgarisseed/cruciatus = 5, /obj/item/clothing/under/contortionist = 5, - /obj/item/weapon/reagent_containers/hypospray/autoinjector/stimulants = 5, /obj/item/weapon/gun/projectile/automatic/pistol/empty = 1, /obj/item/ammo_box/magazine/m10mm = 10, /obj/item/weapon/soap/syndie = 20, @@ -139,6 +139,8 @@ /obj/item/weapon/c4 = 3, /obj/item/device/multitool/ai_detect = 5, /obj/item/weapon/implanter/storage = 1, + /obj/item/toy/cards/deck/syndicate = 5, + /obj/item/weapon/storage/secure/briefcase/syndie = 5, "" = 90 ) From f7949d77e1218d85b79c62d89b4090034f96c79b Mon Sep 17 00:00:00 2001 From: FreeStylaLT Date: Thu, 16 Jun 2016 21:42:58 +0300 Subject: [PATCH 05/10] i have no clue what i did here but it made me make a commit so --- code/modules/projectiles/guns/projectile/pistol.dm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index a0858bbb9ad..661a14a44b4 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -27,12 +27,10 @@ can_suppress = 0 /obj/item/weapon/gun/projectile/automatic/pistol/empty //empty stetchshit for maint spawns - desc = "A small, easily concealable 10mm handgun. Had a threaded barrel for suppressors." - can_suppress = 0 /obj/item/weapon/gun/projectile/automatic/pistol/empty/New() - magazine = new /obj/item/ammo_box/magazine/m10mm/empty(src) - ..() + magazine = new /obj/item/ammo_box/magazine/m10mm/empty(src) + ..() /obj/item/weapon/gun/projectile/automatic/pistol/deagle name = "desert eagle" From 950b7185513f3967dc1711789485fd77c76b0014 Mon Sep 17 00:00:00 2001 From: FreeStylaLT Date: Fri, 17 Jun 2016 16:56:07 +0300 Subject: [PATCH 06/10] adds extended oxygen tank to list, also fixed indentation in last commit I think --- code/game/objects/effects/spawners/lootdrop.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index bd0952a482b..5a56fcc893d 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -67,7 +67,7 @@ /obj/item/clothing/head/that{throwforce = 1; throwing = 1} = 10, /obj/item/clothing/head/ushanka = 10, /obj/item/clothing/head/welding = 10, - /obj/item/clothing/mask/gas = 150, + /obj/item/clothing/mask/gas = 140, /obj/item/clothing/suit/storage/hazardvest = 10, /obj/item/clothing/under/rank/vice = 10, /obj/item/device/assembly/prox_sensor = 40, @@ -111,6 +111,7 @@ /obj/item/weapon/storage/toolbox/mechanical = 10, /obj/item/weapon/screwdriver = 30, /obj/item/weapon/tank/emergency_oxygen = 20, + /obj/item/weapon/tank/emergency_oxygen/engi = 10, /obj/item/weapon/vending_refill/cola = 10, /obj/item/weapon/weldingtool = 30, /obj/item/weapon/wirecutters = 10, From 5f74dacf6ac450bbb4601fa6109655646ad3200a Mon Sep 17 00:00:00 2001 From: FreeStylaLT Date: Mon, 20 Jun 2016 01:19:06 +0300 Subject: [PATCH 07/10] Adds duct tape, makes everything rarer, adds a new surgery bag to replace the current one, adds regular shoes and black jumpsuits --- .../game/objects/effects/spawners/lootdrop.dm | 48 ++++++++++--------- .../objects/items/weapons/storage/backpack.dm | 19 ++++++++ 2 files changed, 44 insertions(+), 23 deletions(-) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 5a56fcc893d..542b673b325 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -67,7 +67,7 @@ /obj/item/clothing/head/that{throwforce = 1; throwing = 1} = 10, /obj/item/clothing/head/ushanka = 10, /obj/item/clothing/head/welding = 10, - /obj/item/clothing/mask/gas = 140, + /obj/item/clothing/mask/gas = 100, /obj/item/clothing/suit/storage/hazardvest = 10, /obj/item/clothing/under/rank/vice = 10, /obj/item/device/assembly/prox_sensor = 40, @@ -83,7 +83,7 @@ /obj/item/stack/rods{amount = 10} = 80, /obj/item/stack/rods{amount = 23} = 10, /obj/item/stack/rods{amount = 50} = 10, - /obj/item/stack/sheet/cardboard = 2, + /obj/item/stack/sheet/cardboard = 20, /obj/item/stack/sheet/metal{amount = 20} = 10, /obj/item/stack/sheet/mineral/plasma{layer = 2.9} = 10, /obj/item/stack/sheet/rglass = 10, @@ -118,30 +118,32 @@ /obj/item/weapon/wrench = 40, /obj/item/weapon/relic = 30, /obj/item/clothing/shoes/brown = 30, + /obj/item/seeds/ambrosiadeusseed = 10, + /obj/item/seeds/ambrosiavulgarisseed = 20, + /obj/item/clothing/under/color/black = 30, + /obj/item/stack/tape_roll = 10, ////////////////CONTRABAND STUFF////////////////// - /obj/item/weapon/grenade/clown_grenade = 5, - /obj/item/seeds/ambrosiavulgarisseed/cruciatus = 5, - /obj/item/clothing/under/contortionist = 5, + /obj/item/weapon/grenade/clown_grenade = 4, + /obj/item/seeds/ambrosiavulgarisseed/cruciatus = 4, /obj/item/weapon/gun/projectile/automatic/pistol/empty = 1, - /obj/item/ammo_box/magazine/m10mm = 10, - /obj/item/weapon/soap/syndie = 20, - /obj/item/weapon/gun/syringe/syndicate = 5, - /obj/item/weapon/suppressor = 10, - /obj/item/clothing/under/chameleon = 5, - /obj/item/weapon/stamp/chameleon = 5, - /obj/item/clothing/shoes/syndigaloshes = 15, - /obj/item/clothing/mask/gas/voice = 5, - /obj/item/weapon/dnascrambler = 3, - /obj/item/weapon/storage/backpack/satchel_flat = 5, - /obj/item/weapon/storage/toolbox/syndicate = 5, - /obj/item/weapon/storage/backpack/duffel/syndie/surgery = 5, - /obj/item/weapon/storage/belt/military = 5, - /obj/item/weapon/storage/box/syndie_kit/space = 5, - /obj/item/weapon/c4 = 3, - /obj/item/device/multitool/ai_detect = 5, + /obj/item/ammo_box/magazine/m10mm = 7, + /obj/item/weapon/soap/syndie = 10, + /obj/item/weapon/gun/syringe/syndicate = 3, + /obj/item/weapon/suppressor = 7, + /obj/item/clothing/under/chameleon = 3, + /obj/item/weapon/stamp/chameleon = 3, + /obj/item/clothing/shoes/syndigaloshes = 7, + /obj/item/clothing/mask/gas/voice = 3, + /obj/item/weapon/dnascrambler = 1, + /obj/item/weapon/storage/backpack/satchel_flat = 3, + /obj/item/weapon/storage/toolbox/syndicate = 3, + /obj/item/weapon/storage/backpack/duffel/syndie/surgery_fake = 3, + /obj/item/weapon/storage/belt/military = 3, + /obj/item/weapon/storage/box/syndie_kit/space = 3, + /obj/item/device/multitool/ai_detect = 3, /obj/item/weapon/implanter/storage = 1, - /obj/item/toy/cards/deck/syndicate = 5, - /obj/item/weapon/storage/secure/briefcase/syndie = 5, + /obj/item/toy/cards/deck/syndicate = 3, + /obj/item/weapon/storage/secure/briefcase/syndie = 3, "" = 90 ) diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 6c59e98385f..904e7448583 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -322,6 +322,25 @@ new /obj/item/clothing/mask/muzzle(src) new /obj/item/device/mmi/syndie(src) +/obj/item/weapon/storage/backpack/duffel/syndie/surgery_fake //for maint spawns + name = "surgery dufflebag" + desc = "A suspicious looking dufflebag for holding surgery tools." + icon_state = "duffel-syndimed" + item_state = "duffle-syndimed" + +/obj/item/weapon/storage/backpack/duffel/syndie/surgery_fake/New() + ..() + new /obj/item/weapon/scalpel(src) + new /obj/item/weapon/hemostat(src) + new /obj/item/weapon/retractor(src) + new /obj/item/weapon/cautery(src) + new /obj/item/weapon/bonegel(src) + new /obj/item/weapon/bonesetter(src) + new /obj/item/weapon/FixOVein(src) + if(prob(50)) + new /obj/item/weapon/circular_saw(src) + new /obj/item/weapon/surgicaldrill(src) + /obj/item/weapon/storage/backpack/duffel/captain name = "captain's duffelbag" desc = "A duffelbag designed to hold large quantities of condoms." From d4216fbd3c591ad2f4cecb3ddf46415390f20f5e Mon Sep 17 00:00:00 2001 From: FreeStylaLT Date: Wed, 22 Jun 2016 19:18:01 +0300 Subject: [PATCH 08/10] Adds a description to the magazine, emphasizing its uselessness. --- code/modules/projectiles/ammunition/magazines.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index a00f6f16747..1ed3483f1a0 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -181,6 +181,7 @@ multiple_sprites = 2 /obj/item/ammo_box/magazine/m10mm/empty //for maint drops + desc = "A gun magazine. Seems to be broken and can only hold one bullet. Pretty useless." max_ammo = 1 /obj/item/ammo_box/magazine/m45 From 9bb6a2f7dc397232608bfd03aa220e1cbafc3283 Mon Sep 17 00:00:00 2001 From: FreeStylaLT Date: Sun, 3 Jul 2016 20:29:44 +0300 Subject: [PATCH 09/10] Tweaked probabilities, added black gloves, real insu gloves, mini hoe and botany tray to maint drops --- .../game/objects/effects/spawners/lootdrop.dm | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 542b673b325..4f58a38065f 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -61,13 +61,17 @@ /obj/item/bodybag = 10, /obj/item/clothing/glasses/meson = 20, /obj/item/clothing/glasses/sunglasses = 10, - /obj/item/clothing/gloves/color/yellow/fake = 10, + /obj/item/clothing/gloves/color/yellow/fake = 15, + /obj/item/clothing/gloves/color/fyellow = 10, + /obj/item/clothing/gloves/color/yellow = 5, + /obj/item/clothing/gloves/color/black = 20, + /obj/machinery/portable_atmospherics/hydroponics = 10, /obj/item/clothing/head/hardhat = 10, /obj/item/clothing/head/hardhat/red = 10, /obj/item/clothing/head/that{throwforce = 1; throwing = 1} = 10, /obj/item/clothing/head/ushanka = 10, /obj/item/clothing/head/welding = 10, - /obj/item/clothing/mask/gas = 100, + /obj/item/clothing/mask/gas = 10, /obj/item/clothing/suit/storage/hazardvest = 10, /obj/item/clothing/under/rank/vice = 10, /obj/item/device/assembly/prox_sensor = 40, @@ -81,7 +85,7 @@ /obj/item/stack/cable_coil{amount = 5} = 60, /obj/item/stack/medical/advanced/bruise_pack = 10, /obj/item/stack/rods{amount = 10} = 80, - /obj/item/stack/rods{amount = 23} = 10, + /obj/item/stack/rods{amount = 23} = 20, /obj/item/stack/rods{amount = 50} = 10, /obj/item/stack/sheet/cardboard = 20, /obj/item/stack/sheet/metal{amount = 20} = 10, @@ -100,6 +104,7 @@ /obj/item/weapon/hand_labeler = 10, /obj/item/weapon/paper/crumpled = 10, /obj/item/weapon/pen = 10, + /obj/item/weapon/minihoe = 10, /obj/item/weapon/plantspray/pests = 10, /obj/item/weapon/stock_parts/cell = 30, /obj/item/weapon/storage/belt/utility = 20, @@ -116,34 +121,34 @@ /obj/item/weapon/weldingtool = 30, /obj/item/weapon/wirecutters = 10, /obj/item/weapon/wrench = 40, - /obj/item/weapon/relic = 30, + /obj/item/weapon/relic = 35, /obj/item/clothing/shoes/brown = 30, /obj/item/seeds/ambrosiadeusseed = 10, /obj/item/seeds/ambrosiavulgarisseed = 20, /obj/item/clothing/under/color/black = 30, /obj/item/stack/tape_roll = 10, ////////////////CONTRABAND STUFF////////////////// - /obj/item/weapon/grenade/clown_grenade = 4, - /obj/item/seeds/ambrosiavulgarisseed/cruciatus = 4, + /obj/item/weapon/grenade/clown_grenade = 3, + /obj/item/seeds/ambrosiavulgarisseed/cruciatus = 3, /obj/item/weapon/gun/projectile/automatic/pistol/empty = 1, - /obj/item/ammo_box/magazine/m10mm = 7, - /obj/item/weapon/soap/syndie = 10, - /obj/item/weapon/gun/syringe/syndicate = 3, - /obj/item/weapon/suppressor = 7, - /obj/item/clothing/under/chameleon = 3, - /obj/item/weapon/stamp/chameleon = 3, - /obj/item/clothing/shoes/syndigaloshes = 7, - /obj/item/clothing/mask/gas/voice = 3, + /obj/item/ammo_box/magazine/m10mm = 4, + /obj/item/weapon/soap/syndie = 7, + /obj/item/weapon/gun/syringe/syndicate = 2, + /obj/item/weapon/suppressor = 4, + /obj/item/clothing/under/chameleon = 2, + /obj/item/weapon/stamp/chameleon = 2, + /obj/item/clothing/shoes/syndigaloshes = 5, + /obj/item/clothing/mask/gas/voice = 2, /obj/item/weapon/dnascrambler = 1, - /obj/item/weapon/storage/backpack/satchel_flat = 3, - /obj/item/weapon/storage/toolbox/syndicate = 3, - /obj/item/weapon/storage/backpack/duffel/syndie/surgery_fake = 3, - /obj/item/weapon/storage/belt/military = 3, - /obj/item/weapon/storage/box/syndie_kit/space = 3, - /obj/item/device/multitool/ai_detect = 3, + /obj/item/weapon/storage/backpack/satchel_flat = 2, + /obj/item/weapon/storage/toolbox/syndicate = 2, + /obj/item/weapon/storage/backpack/duffel/syndie/surgery_fake = 2, + /obj/item/weapon/storage/belt/military = 2, + /obj/item/weapon/storage/box/syndie_kit/space = 2, + /obj/item/device/multitool/ai_detect = 2, /obj/item/weapon/implanter/storage = 1, - /obj/item/toy/cards/deck/syndicate = 3, - /obj/item/weapon/storage/secure/briefcase/syndie = 3, + /obj/item/toy/cards/deck/syndicate = 2, + /obj/item/weapon/storage/secure/briefcase/syndie = 2, "" = 90 ) From 2140d9168a20eb7c484cb9ab4580bbedf708406c Mon Sep 17 00:00:00 2001 From: FreeStylaLT Date: Sun, 10 Jul 2016 03:40:05 +0300 Subject: [PATCH 10/10] removes dank trays from list --- code/game/objects/effects/spawners/lootdrop.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 4f58a38065f..b4b70424377 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -65,7 +65,6 @@ /obj/item/clothing/gloves/color/fyellow = 10, /obj/item/clothing/gloves/color/yellow = 5, /obj/item/clothing/gloves/color/black = 20, - /obj/machinery/portable_atmospherics/hydroponics = 10, /obj/item/clothing/head/hardhat = 10, /obj/item/clothing/head/hardhat/red = 10, /obj/item/clothing/head/that{throwforce = 1; throwing = 1} = 10,