Commit Graph

5 Commits

Author SHA1 Message Date
Venuska1117
ede086a241 ... (#21560) 2023-07-23 22:25:55 +01:00
Qwertytoforty
55615f762a You may now stuff grenades in plushies. Adds the shark and abductor plushies from TG, non haunted branch (#21769)
* *cocks gun* branch's haunted

* branch is still haunted but we hired ghost hunters
2023-07-21 15:56:00 +01:00
S34N
ce7d68fcf1 Fixes draggable bushes, sprite oversight [MAPPING CHANGES] (#19351)
* no drag the bush, and other tweaks

* im smart

* mapping changes

* delete
2022-10-19 16:22:41 -05:00
S34N
8ef5c698d6 New newscaster sprites [MAPPING CHANGES] (#19252)
* map

* PR number

* master maps

* re-apply changes

* manually stop that shuffle
2022-10-15 11:30:56 -05:00
S34N
4f5c3376e3 Updates tools to include mapmerge hooks and merge drivers, plus more (#18034)
* bumps tools to modern versions, adds DMM merge driver hooks for automatic map merging

* mapping guidelines update

* Update .github/CONTRIBUTING.md

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* aa review

* these somehow got ignored? force adding

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-06-21 23:53:19 +01:00