From b6f51c1f49e107d70c45c131891cdd1eefc03d28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A1=D0=B8=D1=80=D0=BE=D1=82=D0=BA=D0=B0?= <114731039+ErdGinalD@users.noreply.github.com> Date: Sun, 6 Oct 2024 12:28:11 +0300 Subject: [PATCH] Nerf Space Loot (#26738) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Decrease Gamer loot in space * Update depot_spawners.dm * Update code/game/objects/items/weapons/melee/energy_melee_weapons.dm Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update depot_spawners.dm * Update code/game/objects/effects/spawners/depot_spawners.dm Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> * Update energy_melee_weapons.dm --------- Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com> Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> --- _maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm | 2 +- .../RandomRuins/SpaceRuins/syndiecakesfactory.dmm | 2 +- code/game/objects/effects/spawners/depot_spawners.dm | 1 + .../objects/items/weapons/melee/energy_melee_weapons.dm | 9 +++++++-- code/modules/mob/living/simple_animal/corpse.dm | 1 - 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm index 592d9f2455a..3131e93a9a5 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm @@ -1244,7 +1244,7 @@ /obj/structure/safe/floor, /obj/item/tank/internals/oxygen/red, /obj/item/clothing/mask/gas/syndicate, -/obj/item/mod/control/pre_equipped/traitor, +/obj/item/mod/control/pre_equipped/mining/asteroid, /obj/item/reagent_containers/drinks/bottle/rum, /obj/item/reagent_containers/drinks/bottle/rum, /obj/item/folder/syndicate/blue, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm index e31219ca97e..26c6e5586f9 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm @@ -628,7 +628,7 @@ }, /area/ruin/space/syndicakefactory) "wW" = ( -/obj/machinery/suit_storage_unit/syndicate, +/obj/machinery/suit_storage_unit/mining, /turf/simulated/floor/engine, /area/ruin/space/syndicakefactory) "xy" = ( diff --git a/code/game/objects/effects/spawners/depot_spawners.dm b/code/game/objects/effects/spawners/depot_spawners.dm index 6f8548fabff..efebffdd04b 100644 --- a/code/game/objects/effects/spawners/depot_spawners.dm +++ b/code/game/objects/effects/spawners/depot_spawners.dm @@ -173,6 +173,7 @@ /obj/item/shield/energy, /obj/item/storage/box/syndie_kit/teleporter, /obj/item/weaponcrafting/gunkit/universal_gun_kit, + /obj/item/mod/control/pre_equipped/traitor_elite ) // Layout-affecting spawns diff --git a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm index 96893ff65c9..9aeedf0b9d8 100644 --- a/code/game/objects/items/weapons/melee/energy_melee_weapons.dm +++ b/code/game/objects/items/weapons/melee/energy_melee_weapons.dm @@ -346,12 +346,17 @@ ////////////////////////////// /obj/item/melee/energy/sword/pirate name = "energy cutlass" - desc = "Arrrr matey." + desc = "A crude copy of syndicate technology. Favored among space pirates for its small form factor while inactive. Arrrr, matey!" force_on = 20 + throwforce_on = 10 // No PvP shenanigans, this is main weapon in PvE explorer gameplay and can be obtained very easy + embed_chance = 45 + embedded_impact_pain_multiplier = 4 + armour_penetration_percentage = 0 + armour_penetration_flat = 0 icon_state = "cutlass0" icon_state_on = "cutlass1" light_color = LIGHT_COLOR_RED - origin_tech = "combat=3;magnets=4;syndicate=2" + origin_tech = "combat=3;magnets=4" ////////////////////////////// // MARK: HARDLIGHT BLADE diff --git a/code/modules/mob/living/simple_animal/corpse.dm b/code/modules/mob/living/simple_animal/corpse.dm index 5d28b33ca16..85cb40e3d1d 100644 --- a/code/modules/mob/living/simple_animal/corpse.dm +++ b/code/modules/mob/living/simple_animal/corpse.dm @@ -57,7 +57,6 @@ gloves = /obj/item/clothing/gloves/combat l_ear = /obj/item/radio/headset mask = /obj/item/clothing/mask/gas/syndicate - back = /obj/item/mod/control/pre_equipped/traitor_elite r_pocket = /obj/item/tank/internals/emergency_oxygen id = /obj/item/card/id