Commit 9e1af49

committed

Merge remote-tracking branch 'upstream/main' into food

2 parents 47a8846 + 236eba0 commit 9e1af49Copy full SHA for 9e1af49

4 files changed

+421

-408

lines changed

_maps/map_files
- stonehamlet
  - stonehamlet.dmm
- templates/dwarf_outpost
  - Dwarf_Outpost_1.dmm
code/modules/mob/living/simple_animal/rogue/creacher
- _corpses.dm
modular/Mapping
- Mapping_aides.dm

+421

-408

lines changed

Comments

(0)