Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nerf Space Loot #26738

Merged
merged 8 commits into from
Oct 6, 2024
+10 −5
Merged

Nerf Space Loot #26738

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2c331b5
Decrease Gamer loot in space
ErdGinalD Sep 10, 2024
b6a793f
Update depot_spawners.dm
ErdGinalD Sep 10, 2024
0eb9a32
Update code/game/objects/items/weapons/melee/energy_melee_weapons.dm
ErdGinalD Sep 10, 2024
3f16d62
Merge remote-tracking branch 'upstream/master' into Nerf-gaming-loot
ErdGinalD Sep 25, 2024
d7167e1
Update depot_spawners.dm
ErdGinalD Sep 25, 2024
24c517a
Update code/game/objects/effects/spawners/depot_spawners.dm
ErdGinalD Oct 6, 2024
9fb19c5
Update energy_melee_weapons.dm
ErdGinalD Oct 6, 2024
87da88f
Merge branch 'Nerf-gaming-loot' of https://github.com/ErdGinalD/Off-p…
ErdGinalD Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/onehalf.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion _maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@
},
/area/ruin/space/syndicakefactory)
"wW" = (
/obj/machinery/suit_storage_unit/syndicate,
/obj/machinery/suit_storage_unit/mining,
ErdGinalD marked this conversation as resolved.
Show resolved Hide resolved
/turf/simulated/floor/engine,
/area/ruin/space/syndicakefactory)
"xy" = (
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/effects/spawners/depot_spawners.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,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 = 1,
ErdGinalD marked this conversation as resolved.
Show resolved Hide resolved
)

// Layout-affecting spawns
Expand Down
9 changes: 7 additions & 2 deletions code/game/objects/items/weapons/melee/energy_melee_weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 5 // 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
ErdGinalD marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down
1 change: 0 additions & 1 deletion code/modules/mob/living/simple_animal/corpse.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down