From 9ce6730c56b1d702d0e8c8b883320c5c70eebc36 Mon Sep 17 00:00:00 2001 From: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Wed, 6 Dec 2023 10:27:45 -0500 Subject: [PATCH] removes the fluff item from moonbase, modifies loot (#23157) * removes the fluff item from moonbase, modifies loot * Update code/game/objects/items/weapons/storage/lockbox.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/lockbox.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * compiles * Update code/game/objects/items/weapons/storage/lockbox.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> * pick my hated * Update code/game/objects/items/weapons/storage/lockbox.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --------- Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> --- .../RandomRuins/SpaceRuins/moonoutpost19.dmm | 6 ++--- .../objects/items/weapons/storage/lockbox.dm | 27 +++++++++++++++++++ 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm index 7443d3fa731..09f32f0d372 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm @@ -5151,7 +5151,7 @@ /obj/effect/decal/cleanable/cobweb2, /obj/effect/turf_decal/delivery/hollow, /obj/structure/rack, -/obj/item/assembly/signaler/anomaly/random, +/obj/item/paper/researchnotes, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -8441,13 +8441,13 @@ /area/ruin/space/unpowered) "Fm" = ( /obj/structure/safe, -/obj/item/paper/researchnotes, -/obj/item/clothing/glasses/hud/security/sunglasses/fluff/eyepro, /obj/machinery/light/small{ dir = 4 }, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery/hollow, +/obj/item/assembly/signaler/anomaly/random, +/obj/item/storage/lockbox/experimental_weapon, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm index ea0465ef39c..c98fe583390 100644 --- a/code/game/objects/items/weapons/storage/lockbox.dm +++ b/code/game/objects/items/weapons/storage/lockbox.dm @@ -201,3 +201,30 @@ locked = FALSE icon_state = icon_broken origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D. + +/obj/item/storage/lockbox/experimental_weapon + name = "A-113 classified lockbox" + desc = "Contains a classifed item for experimental purposes. Looks like some acid was spilt on it." + req_access = list(ACCESS_SEC_DOORS) //officers, heads + +/obj/item/storage/lockbox/experimental_weapon/populate_contents() + if(prob(10)) + new /obj/item/clothing/mask/facehugger(src) //Suprise! Storing facehuggers improperly is what lead to this mess. + return + var/spawn_type = pick(/obj/item/gun/energy/kinetic_accelerator/experimental, /obj/item/surveillance_upgrade, /obj/item/mod/module/stealth/ninja) + if(prob(25)) + if(rand(1, 6) == 1) //organ time. I want this to be more balanced in distribution, so organs are under a prob 25 + new /obj/item/organ/internal/alien/plasmavessel/drone(src) //Disected drone before the place got wiped. No hivenode. + new /obj/item/organ/internal/alien/acidgland(src) + new /obj/item/organ/internal/alien/resinspinner(src) + return + var/list/organ_loot = list( + /obj/item/organ/internal/cyberimp/arm/katana, + /obj/item/organ/internal/cyberimp/arm/toolset_abductor, + /obj/item/organ/internal/cyberimp/arm/esword, + /obj/item/organ/internal/heart/demon/pulse, + /obj/item/organ/internal/eyes/cybernetic/eyesofgod + ) + + spawn_type = pick(organ_loot) + new spawn_type(src)