diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index d88d5a309d1..b4b70424377 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -58,65 +58,97 @@ //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/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/bodybag = 10, + /obj/item/clothing/glasses/meson = 20, + /obj/item/clothing/glasses/sunglasses = 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/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 = 10, + /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} = 80, + /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, + /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 = 90, //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/minihoe = 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/tank/emergency_oxygen/engi = 10, + /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 = 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 = 3, + /obj/item/seeds/ambrosiavulgarisseed/cruciatus = 3, + /obj/item/weapon/gun/projectile/automatic/pistol/empty = 1, + /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 = 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 = 2, + /obj/item/weapon/storage/secure/briefcase/syndie = 2, + "" = 90 ) /obj/effect/spawner/lootdrop/trade_sol_rare diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index 3cea1f1363f..c259edeb2d2 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." diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm index 0ae44b602e5..526876ca519 100644 --- a/code/modules/projectiles/ammunition/magazines.dm +++ b/code/modules/projectiles/ammunition/magazines.dm @@ -180,6 +180,10 @@ max_ammo = 8 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 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..661a14a44b4 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -26,6 +26,12 @@ mag_type = /obj/item/ammo_box/magazine/m45 can_suppress = 0 +/obj/item/weapon/gun/projectile/automatic/pistol/empty //empty stetchshit for maint spawns + +/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."