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.

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

Updating from Neb dev #15

Closed
wants to merge 36 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
baa528c
Make ammo magazines lazy-initialize
out-of-phaze Feb 23, 2024
9ed8c48
Merge pull request #3730 from out-of-phaze/optimization/lazy-ammo
MistakeNot4892 Jun 18, 2024
702df7e
Automatic changelog generation for PR #3730 [ci skip]
NebulaSS13Bot Jun 18, 2024
84c4ca4
Move Heist gamemode into its own modpack
out-of-phaze Jun 16, 2024
88c4123
Genericize heist objectives
out-of-phaze Jun 16, 2024
20e8906
Move crossfire gamemode into modpack
out-of-phaze Jun 16, 2024
9c28f6f
Include Heist and mixed gamemode modpacks
out-of-phaze Jun 16, 2024
fdbd77b
Merge pull request #4114 from out-of-phaze/codequality/heist-modpack
MistakeNot4892 Jun 18, 2024
1185d44
Move Ninja antagonist and gamemode into a modpack
out-of-phaze Jun 15, 2024
c7e4dce
Merge pull request #4107 from out-of-phaze/codequality/ninja-modpack
MistakeNot4892 Jun 19, 2024
20d95a7
Fixes and expansions for skeletal limbs.
MistakeNot4892 Jun 18, 2024
be37949
Automatic changelog generation [ci skip]
NebulaSS13Bot Jun 19, 2024
112441a
Merge pull request #4122 from MistakeNot4892/feature/skellymans
out-of-phaze Jun 19, 2024
6297725
Make diagonal movement on by default
out-of-phaze Jun 19, 2024
febc7d6
Remove unnecessary uses of unsafe var access operator
out-of-phaze Jun 19, 2024
8d420a1
Added beggar knights to Shaded Hills.
MistakeNot4892 Jun 17, 2024
ae9a484
Expand DME validation to include modpacks
out-of-phaze Jun 16, 2024
0e5c2c1
Fix issues found in modpacks
out-of-phaze Jun 16, 2024
230d9ed
You can now dip items into turf liquids, wells and barrels.
MistakeNot4892 Jun 17, 2024
15deea6
Added debounce to on_reagent_change().
MistakeNot4892 Jun 17, 2024
45e8f30
Automatic changelog generation for PR #4120 [ci skip]
NebulaSS13Bot Jun 19, 2024
a959e3c
Automatic changelog generation [ci skip]
NebulaSS13Bot Jun 20, 2024
5590a2a
Added shrine and associated jobs to Shaded Hills.
MistakeNot4892 Jun 19, 2024
67f3291
Travel* back to travell*.
MistakeNot4892 Jun 20, 2024
4490e0d
Removed DNA and replaced it with mob_snapshot.
MistakeNot4892 Jun 20, 2024
94984e0
Merge pull request #3882 from MistakeNot4892/removal/dna
out-of-phaze Jun 20, 2024
b04da0c
Updating comment and adding migration for human repath.
MistakeNot4892 Jun 16, 2024
14c99d4
Repaths /mob/living/carbon/human to /mob/living/human.
MistakeNot4892 Jun 20, 2024
811438c
Add log wall frames/low walls
out-of-phaze Jun 20, 2024
3895efb
Add low log walls to fantasy map
out-of-phaze Jun 20, 2024
1e9a927
Merge pull request #4113 from MistakeNot4892/rework/carbon_final_removal
out-of-phaze Jun 20, 2024
2728152
Move Revolution gamemode into a modpack
out-of-phaze Jun 20, 2024
a5a4834
Merge pull request #4132 from out-of-phaze/codequality/rev-modpack
MistakeNot4892 Jun 20, 2024
b9133ff
Merge pull request #4130 from out-of-phaze/feature/low-log
MistakeNot4892 Jun 20, 2024
e64a30b
Merge pull request #4127 from out-of-phaze/tweak/default-diagonal
MistakeNot4892 Jun 21, 2024
17c8eef
Merge pull request #4126 from MistakeNot4892/feature/shrine
out-of-phaze Jun 21, 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
Prev Previous commit
Next Next commit
Fix issues found in modpacks
out-of-phaze authored and comma committed Jun 19, 2024
commit 0e5c2c1a2ce16990bcb6f0f832a1a4e6c3e21fa1
4 changes: 3 additions & 1 deletion maps/exodus/exodus.dm
Original file line number Diff line number Diff line change
@@ -13,13 +13,15 @@
#include "../../mods/content/matchmaking/_matchmaking.dme"
#include "../../mods/content/modern_earth/_modern_earth.dme"
#include "../../mods/content/mouse_highlights/_mouse_highlight.dme"
#include "../../mods/content/psionics/_psionics.dme"
#include "../../mods/content/scaling_descriptors.dm"
#include "../../mods/content/xenobiology/_xenobiology.dme"

#include "../../mods/mobs/dionaea/_dionaea.dme"
#include "../../mods/mobs/borers/_borers.dme"

// Must come after borers for compatibility.
#include "../../mods/content/psionics/_psionics.dme"

#include "../../mods/species/ascent/_ascent.dme"
#include "../../mods/content/pheromones/_pheromones.dme"
#include "../../mods/species/serpentid/_serpentid.dme"
4 changes: 3 additions & 1 deletion maps/ministation/ministation.dm
Original file line number Diff line number Diff line change
@@ -34,7 +34,6 @@ Twice...
#include "../../mods/content/government/_government.dme"
#include "../../mods/content/modern_earth/_modern_earth.dme"
#include "../../mods/content/mouse_highlights/_mouse_highlight.dme"
#include "../../mods/content/psionics/_psionics.dme"
#include "../../mods/content/scaling_descriptors.dm"

#include "ministation_antagonists.dm"
@@ -70,6 +69,9 @@ Twice...
#include "../../mods/mobs/dionaea/_dionaea.dme"
#include "../../mods/mobs/borers/_borers.dme"

// Must come after borers for compatibility.
#include "../../mods/content/psionics/_psionics.dme"

#include "ministation_overmap.dm"

#include "jobs/command.dm"
4 changes: 3 additions & 1 deletion maps/modpack_testing/modpack_testing.dm
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@
#include "../../mods/content/matchmaking/_matchmaking.dme"
#include "../../mods/content/modern_earth/_modern_earth.dme"
#include "../../mods/content/mouse_highlights/_mouse_highlight.dme"
#include "../../mods/content/psionics/_psionics.dme"
#include "../../mods/content/shackles/_shackles.dme"
#include "../../mods/content/xenobiology/_xenobiology.dme"
#include "../../mods/content/pheromones/_pheromones.dme"
@@ -31,6 +30,9 @@
#include "../../mods/mobs/dionaea/_dionaea.dme"
#include "../../mods/mobs/borers/_borers.dme"

// Must come after borers for compatibility.
#include "../../mods/content/psionics/_psionics.dme"

#include "../../mods/species/serpentid/_serpentid.dme"
#include "../../mods/species/ascent/_ascent.dme"
#include "../../mods/species/neoavians/_neoavians.dme"
4 changes: 3 additions & 1 deletion maps/tradeship/tradeship.dm
Original file line number Diff line number Diff line change
@@ -17,7 +17,6 @@
#include "../../mods/content/government/_government.dme"
#include "../../mods/content/modern_earth/_modern_earth.dme"
#include "../../mods/content/mouse_highlights/_mouse_highlight.dme"
#include "../../mods/content/psionics/_psionics.dme"
#include "../../mods/content/scaling_descriptors.dm"
#include "../../mods/content/xenobiology/_xenobiology.dme"
#include "../../mods/content/matchmaking/_matchmaking.dme"
@@ -26,6 +25,9 @@
#include "../../mods/mobs/dionaea/_dionaea.dme"
#include "../../mods/mobs/borers/_borers.dme"

// Must come after borers for compatibility.
#include "../../mods/content/psionics/_psionics.dme"

#include "../../mods/species/ascent/_ascent.dme"
#include "../../mods/species/drakes/_drakes.dme"
#include "../../mods/species/serpentid/_serpentid.dme"
2 changes: 2 additions & 0 deletions mods/content/bigpharma/_bigpharma.dme
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
#ifndef MODPACK_BIGPHARMA
#define MODPACK_BIGPHARMA
// BEGIN_INCLUDE
#include "_bigpharma.dm"
#include "chems.dm"
#include "extension.dm"
#include "language.dm"
#include "overrides.dm"
#include "pill_bottle.dm"
// END_INCLUDE
#endif
9 changes: 5 additions & 4 deletions mods/content/dungeon_loot/_dungeon_loot.dme
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
#ifndef MODPACK_DUNGEON_LOOT
#define MODPACK_DUNGEON_LOOT
// BEGIN INCLUDE
// BEGIN_INCLUDE
#include "_dungeon_loot.dm"
#include "loot_pile.dm"
#include "subtypes/exosuit.dm"
#include "subtypes/maint.dm"
#include "subtypes/surface.dm"
#include "subtypes\exosuit.dm"
#include "subtypes\maint.dm"
#include "subtypes\surface.dm"
// END_INCLUDE
#endif
56 changes: 29 additions & 27 deletions mods/content/fantasy/_fantasy.dme
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
#ifndef MODPACK_FANTASY_SPECIES
#define MODPACK_FANTASY_SPECIES
// BEGIN_INCLUDE
#include "_fantasy.dm"
#include "datum/cultures.dm"
#include "datum/currencies.dm"
#include "datum/factions.dm"
#include "datum/locations.dm"
#include "datum/outfits.dm"
#include "datum/overrides.dm"
#include "datum/species.dm"
#include "datum/hnoll/bodytypes.dm"
#include "datum/hnoll/culture.dm"
#include "datum/hnoll/language.dm"
#include "datum/hnoll/markings.dm"
#include "datum/hnoll/organs.dm"
#include "datum/hnoll/species.dm"
#include "datum/kobaloi/bodytypes.dm"
#include "datum/kobaloi/clothing.dm"
#include "datum/kobaloi/culture.dm"
#include "datum/kobaloi/language.dm"
#include "datum/kobaloi/markings.dm"
#include "datum/kobaloi/organs.dm"
#include "datum/kobaloi/species.dm"
#include "items/clothing/_loadout.dm"
#include "items/clothing/_recipes.dm"
#include "items/clothing/armor.dm"
#include "items/clothing/jerkin.dm"
#include "items/clothing/loincloth.dm"
#include "items/clothing/overrides.dm"
#include "items/clothing/trousers.dm"
#include "datum\cultures.dm"
#include "datum\currencies.dm"
#include "datum\factions.dm"
#include "datum\locations.dm"
#include "datum\outfits.dm"
#include "datum\overrides.dm"
#include "datum\species.dm"
#include "datum\hnoll\bodytypes.dm"
#include "datum\hnoll\culture.dm"
#include "datum\hnoll\language.dm"
#include "datum\hnoll\markings.dm"
#include "datum\hnoll\organs.dm"
#include "datum\hnoll\species.dm"
#include "datum\kobaloi\bodytypes.dm"
#include "datum\kobaloi\clothing.dm"
#include "datum\kobaloi\culture.dm"
#include "datum\kobaloi\language.dm"
#include "datum\kobaloi\markings.dm"
#include "datum\kobaloi\organs.dm"
#include "datum\kobaloi\species.dm"
#include "items\clothing\_loadout.dm"
#include "items\clothing\_recipes.dm"
#include "items\clothing\armor.dm"
#include "items\clothing\jerkin.dm"
#include "items\clothing\loincloth.dm"
#include "items\clothing\overrides.dm"
#include "items\clothing\trousers.dm"
// END_INCLUDE
#endif
4 changes: 3 additions & 1 deletion mods/content/generic_shuttles/_generic_shuttles.dme
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#ifndef MODPACK_GENERIC_SHUTTLES
#define MODPACK_GENERIC_SHUTTLES
// BEGIN_INCLUDE
#include "_generic_shuttles.dm"
#include "tanker/tanker.dm"
#include "tanker\tanker.dm"
// END_INCLUDE
#endif
4 changes: 2 additions & 2 deletions mods/content/government/_government.dme
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#ifndef MODPACK_GOVERNMENT
#define MODPACK_GOVERNMENT
// BEGIN INCLUDE
// BEGIN_INCLUDE
#include "government.dm"
#include "datum\ai_holo.dm"
#include "datum\ai_laws.dm"
#include "items\clutter.dm"
#include "items\cups.dm"
#include "items\documents.dm"
#include "ruins\ec_old_crash\ec_old_crash.dm"
#endif
// END_INCLUDE
#endif
6 changes: 4 additions & 2 deletions mods/content/matchmaking/_matchmaking.dme
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
#ifndef CONTENT_PACK_MATCHMAKING
#define CONTENT_PACK_MATCHMAKING
#include "matchmaking.dm"
// BEGIN_INCLUDE
#include "matchmaker.dm"
#include "relations_types.dm"
#include "matchmaking.dm"
#include "relations.dm"
#include "relations_types.dm"
// END_INCLUDE
#endif
2 changes: 2 additions & 0 deletions mods/content/mouse_highlights/_mouse_highlight.dme
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#ifndef CONTENT_PACK_MOUSEOVER
#define CONTENT_PACK_MOUSEOVER
// BEGIN_INCLUDE
#include "mouse_highlight.dm"
#include "mouse_highlight_client.dm"
#include "mouse_highlight_prefs.dm"
// END_INCLUDE
#endif
2 changes: 2 additions & 0 deletions mods/content/pheromones/_pheromones.dme
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
#ifndef MODPACK_PHEROMONES
#define MODPACK_PHEROMONES
// BEGIN_INCLUDE
#include "_pheromones.dm"
#include "pheromone_effect.dm"
#include "pheromone_emotes.dm"
#include "pheromone_implant.dm"
#include "pheromone_mob.dm"
// END_INCLUDE
#endif
1 change: 1 addition & 0 deletions mods/content/psionics/_psionics.dme
Original file line number Diff line number Diff line change
@@ -53,6 +53,7 @@
#include "system\psionics\interface\ui.dm"
#include "system\psionics\interface\ui_hub.dm"
#include "system\psionics\interface\ui_toggles.dm"
#include "system\psionics\mob\borer_power.dm"
#include "system\psionics\mob\mob.dm"
#include "system\psionics\mob\mob_assay.dm"
#include "system\psionics\mob\mob_interactions.dm"
7 changes: 2 additions & 5 deletions mods/content/psionics/system/psionics/mob/borer_power.dm
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
#ifdef CONTENT_PACK_BORERS
/mob/living/simple_animal/borer
var/image/aura_image

/mob/living/simple_animal/borer/Initialize(var/mapload, var/gen=1)

if(!SSmodpacks.loaded_modpacks["Cortical Borers"]) // Borer module not included.
log_debug("Attempted spawn of stubbed mobtype [type].")
return INITIALIZE_HINT_QDEL

. = ..()
aura_image = create_aura_image(src)
aura_image.color = "#aaffaa"
@@ -57,3 +53,4 @@
set_ability_cooldown(15 SECONDS)

return TRUE
#endif
96 changes: 49 additions & 47 deletions mods/content/xenobiology/_xenobiology.dme
Original file line number Diff line number Diff line change
@@ -1,56 +1,58 @@
#ifndef CONTENT_PACK_XENOBIO
#define CONTENT_PACK_XENOBIO
// BEGIN_INCLUDE
#include "_xenobiology.dm"
#include "achievement.dm"
#include "circuit.dm"
#include "emotes.dm"
#include "food.dm"
#include "overrides.dm"
#include "colours/_colour.dm"
#include "colours/colour_adamantine.dm"
#include "colours/colour_black.dm"
#include "colours/colour_blue.dm"
#include "colours/colour_cerulean.dm"
#include "colours/colour_dark_blue.dm"
#include "colours/colour_dark_purple.dm"
#include "colours/colour_gold.dm"
#include "colours/colour_green.dm"
#include "colours/colour_grey.dm"
#include "colours/colour_light_pink.dm"
#include "colours/colour_metal.dm"
#include "colours/colour_oil.dm"
#include "colours/colour_orange.dm"
#include "colours/colour_pink.dm"
#include "colours/colour_purple.dm"
#include "colours/colour_pyrite.dm"
#include "colours/colour_quantum.dm"
#include "colours/colour_rainbow.dm"
#include "colours/colour_red.dm"
#include "colours/colour_sepia.dm"
#include "colours/colour_silver.dm"
#include "colours/colour_yellow.dm"
#include "mobs/critter_slime.dm"
#include "mobs/slime_feeding_helpers.dm"
#include "slime/_slime.dm"
#include "slime/death.dm"
#include "slime/examine.dm"
#include "slime/feeding.dm"
#include "slime/items.dm"
#include "slime/items_extract_enhancer.dm"
#include "slime/items_cell.dm"
#include "slime/items_potion.dm"
#include "slime/items_steroid.dm"
#include "slime/life.dm"
#include "slime/powers.dm"
#include "slime/say.dm"
#include "slime/slime_AI.dm"
#include "slime/slime_click.dm"
#include "slime/slime_codex.dm"
#include "slime/slime_commands.dm"
#include "slime/slime_comments.dm"
#include "slime/slime_follow.dm"
#include "slime/slime_hud.dm"
#include "slime/slime_reagents.dm"
#include "slime/slime_surgery.dm"
#include "slime/slime_update_icon.dm"
#include "colours\_colour.dm"
#include "colours\colour_adamantine.dm"
#include "colours\colour_black.dm"
#include "colours\colour_blue.dm"
#include "colours\colour_cerulean.dm"
#include "colours\colour_dark_blue.dm"
#include "colours\colour_dark_purple.dm"
#include "colours\colour_gold.dm"
#include "colours\colour_green.dm"
#include "colours\colour_grey.dm"
#include "colours\colour_light_pink.dm"
#include "colours\colour_metal.dm"
#include "colours\colour_oil.dm"
#include "colours\colour_orange.dm"
#include "colours\colour_pink.dm"
#include "colours\colour_purple.dm"
#include "colours\colour_pyrite.dm"
#include "colours\colour_quantum.dm"
#include "colours\colour_rainbow.dm"
#include "colours\colour_red.dm"
#include "colours\colour_sepia.dm"
#include "colours\colour_silver.dm"
#include "colours\colour_yellow.dm"
#include "mobs\critter_slime.dm"
#include "mobs\slime_feeding_helpers.dm"
#include "slime\_slime.dm"
#include "slime\death.dm"
#include "slime\examine.dm"
#include "slime\feeding.dm"
#include "slime\items.dm"
#include "slime\items_cell.dm"
#include "slime\items_extract_enhancer.dm"
#include "slime\items_potion.dm"
#include "slime\items_steroid.dm"
#include "slime\life.dm"
#include "slime\powers.dm"
#include "slime\say.dm"
#include "slime\slime_AI.dm"
#include "slime\slime_click.dm"
#include "slime\slime_codex.dm"
#include "slime\slime_commands.dm"
#include "slime\slime_comments.dm"
#include "slime\slime_follow.dm"
#include "slime\slime_hud.dm"
#include "slime\slime_reagents.dm"
#include "slime\slime_surgery.dm"
#include "slime\slime_update_icon.dm"
// END_INCLUDE
#endif
5 changes: 3 additions & 2 deletions mods/gamemodes/mixed/_mixed.dme
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#ifndef GAMEMODE_PACK_MIXED
#define GAMEMODE_PACK_MIXED
// BEGIN INCLUDES
// BEGIN_INCLUDE
#include "_mixed.dm"
#if defined(GAMEMODE_PACK_HEIST) // TODO: && defined(GAMEMODE_PACK_MERCENARY)
#include "crossfire.dm"
#endif
// END INCLUDES
// END_INCLUDE
#endif
5 changes: 5 additions & 0 deletions mods/mobs/borers/_borers.dme
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
#ifndef CONTENT_PACK_BORERS
#define CONTENT_PACK_BORERS

#ifdef MODPACK_PSIONICS
#warn Psionics modpack loaded before Borers modpack, compatibility features will be missing.
#endif

// BEGIN_INCLUDE
#include "borer.dm"
#include "datum\antagonist.dm"
Loading