Skip to content

[PTMO] Gangs of New Reno (New Map and Factions) #9

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

Open
hermaplusplus wants to merge 89 commits into
base: main
Choose a base branch
from
Open

[PTMO] Gangs of New Reno (New Map and Factions) #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
8ca5c37
Gangs of New Reno
SeeminglyTypicalUsername Jun 18, 2022
fd69230
We need a .json before we can finalize this
Kitsunemitsu Jun 18, 2022
36d225d
jsons
SeeminglyTypicalUsername Jun 18, 2022
4634804
changes maptype
SeeminglyTypicalUsername Jun 18, 2022
174ae9c
Update maptype.dm
Kitsunemitsu Jun 18, 2022
c1471a3
Update fortune13.dme
SeeminglyTypicalUsername Jun 18, 2022
971d09d
train???
SeeminglyTypicalUsername Jun 19, 2022
2a73b53
Adds Reno to map rotation
hermaplusplus Jun 21, 2022
0a4167c
Misc
SeeminglyTypicalUsername Jun 21, 2022
aa53fbd
Map fixes
SeeminglyTypicalUsername Jun 21, 2022
10e1c4b
Color change
SeeminglyTypicalUsername Jun 21, 2022
a341bbd
Train?
SeeminglyTypicalUsername Jun 21, 2022
31d326d
Hotfix
SeeminglyTypicalUsername Jun 21, 2022
103510b
Cappening
SeeminglyTypicalUsername Jun 21, 2022
662a321
hotfix
SeeminglyTypicalUsername Jun 21, 2022
5913905
misc
SeeminglyTypicalUsername Jun 21, 2022
c7f1e4e
Salvatores fixes
SeeminglyTypicalUsername Jun 21, 2022
d0ac962
Concealed armor/map stuff
SeeminglyTypicalUsername Jun 21, 2022
9accaf8
occupation fix
SeeminglyTypicalUsername Jun 22, 2022
2a6986e
oof
SeeminglyTypicalUsername Jun 22, 2022
45e28ca
Mercenary fix
SeeminglyTypicalUsername Jun 22, 2022
450f216
Map updates
SeeminglyTypicalUsername Jun 22, 2022
6e2cfa6
Dungeon things
SeeminglyTypicalUsername Jun 22, 2022
90d8a9c
Misc
SeeminglyTypicalUsername Jun 22, 2022
438e8aa
New Stuff
SeeminglyTypicalUsername Jun 22, 2022
4c02f9f
Reno Sign Animated
SeeminglyTypicalUsername Jun 23, 2022
be0403a
cleanup
SeeminglyTypicalUsername Jun 23, 2022
aac4533
Things
SeeminglyTypicalUsername Jun 23, 2022
cff16c6
Fixes
SeeminglyTypicalUsername Jun 23, 2022
2d6e13d
fixes
SeeminglyTypicalUsername Jun 23, 2022
9fea8ce
map
SeeminglyTypicalUsername Jun 23, 2022
6c9ff26
Merge branch 'NewReno' of https://github.com/SeeminglyTypicalUsername…
Kitsunemitsu Jun 23, 2022
68b06f9
Update new_player.dm
Kitsunemitsu Jun 23, 2022
7c11548
Update new_player.dm
Kitsunemitsu Jun 23, 2022
260a5fa
Merge branch 'NewReno' of https://github.com/SeeminglyTypicalUsername…
SeeminglyTypicalUsername Jun 23, 2022
e6ba8a2
Adds in handcuffs
SeeminglyTypicalUsername Jun 23, 2022
4c350d7
camera fix
SeeminglyTypicalUsername Jun 23, 2022
836bafb
casino hotfix
SeeminglyTypicalUsername Jun 23, 2022
5a40cfc
public showers
SeeminglyTypicalUsername Jun 23, 2022
cd2616b
Pond
SeeminglyTypicalUsername Jun 23, 2022
664e4fe
Fixes peasant spawns
SeeminglyTypicalUsername Jun 24, 2022
4b33755
fixes
SeeminglyTypicalUsername Jun 24, 2022
24b4fbb
Stuff
SeeminglyTypicalUsername Jun 24, 2022
b28c3ab
Update new_player.dm
Kitsunemitsu Jun 24, 2022
ac9e522
Merge branch 'NewReno' of https://github.com/SeeminglyTypicalUsername…
Kitsunemitsu Jun 24, 2022
af2601c
Reno - The Loot PR (#8)
Kitsunemitsu Jun 24, 2022
34bb079
Fixes/partially sets up headsets
SeeminglyTypicalUsername Jun 24, 2022
e36f616
Fixes/partially sets up headsets
SeeminglyTypicalUsername Jun 25, 2022
a1f4dcc
Check trigger
hermaplusplus Jun 25, 2022
1e7fea6
Update
SeeminglyTypicalUsername Jun 25, 2022
b4e1e8f
salvatore armory balance
SeeminglyTypicalUsername Jun 25, 2022
a57dc28
Checks trigger
hermaplusplus Jun 25, 2022
19d7a45
Checks trigger
hermaplusplus Jun 25, 2022
9226fe2
Checks trigger 2: electric boogaloo
hermaplusplus Jun 25, 2022
84a3143
Checks trigger 2: electric boogaloo
hermaplusplus Jun 25, 2022
0a84090
I am drunk coding. This refactors maptypes to work properly
Kitsunemitsu Jun 26, 2022
05e11f7
adds in support for sunnyvale
Kitsunemitsu Jun 26, 2022
d005b88
Embassy update
SeeminglyTypicalUsername Jun 26, 2022
42932d4
Adds to faction radio code
SeeminglyTypicalUsername Jun 26, 2022
ef8597a
updates ID cards, fixes surgery bags
SeeminglyTypicalUsername Jun 26, 2022
1c76420
Hotfix
SeeminglyTypicalUsername Jun 26, 2022
f346000
Merge pull request #19 from Kitsunemitsu/maptype-refactor-2
hermaplusplus Jun 27, 2022
d3f85bc
Merge pull request #20 from SeeminglyTypicalUsername/Reno
hermaplusplus Jun 27, 2022
ed1bc06
Handies : 0
SeeminglyTypicalUsername Jun 28, 2022
5978a66
adds signalers
SeeminglyTypicalUsername Jun 28, 2022
a4184b4
Update wvm.dm
SeeminglyTypicalUsername Jun 28, 2022
2c8828b
Eye gouging/poking
SeeminglyTypicalUsername Jun 28, 2022
f95c0fb
Revert "Eye gouging/poking"
SeeminglyTypicalUsername Jun 29, 2022
6e0096d
Merge branch 'main' into maps/newreno
hermaplusplus Jun 29, 2022
2714d7f
Merge conflict hotfix
hermaplusplus Jun 29, 2022
c03c093
Merge pull request #21 from SeeminglyTypicalUsername/Reno
hermaplusplus Jun 29, 2022
e613793
DME cross-branch hotfix part 1
hermaplusplus Jun 30, 2022
ec5fc31
Merge branch 'main' into maps/newreno
hermaplusplus Jun 30, 2022
1663f6a
Hobo update
SeeminglyTypicalUsername Jul 3, 2022
985a3a5
Wrights DME Inclusion Hotfix
hermaplusplus Jul 3, 2022
a2d0af3
IDGAF if it's buggy it works and that's what matters (#39)
Kitsunemitsu Jul 5, 2022
18aee44
Merge branch 'main' into maps/newreno
hermaplusplus Jul 5, 2022
6791027
Checks Trigger
hermaplusplus Jul 5, 2022
8f8645c
Reno Emergency Shuttle dmm2tgm hotfix
hermaplusplus Jul 5, 2022
559864d
Missing trailing newline hotfix
hermaplusplus Jul 5, 2022
f99615a
Mixed indentation hotfix
hermaplusplus Jul 5, 2022
6d08358
Mixed indentation hotfix
hermaplusplus Jul 5, 2022
1ad75e5
Merge pull request #35 from SeeminglyTypicalUsername/Reno
hermaplusplus Jul 5, 2022
f5faba5
Radroach speed hotfix
hermaplusplus Jul 5, 2022
d0ef790
Dog bed hotfix
hermaplusplus Jul 5, 2022
b25323e
Merge branch 'main' into maps/newreno
hermaplusplus Jul 7, 2022
42fc9aa
Casino update (#42)
SeeminglyTypicalUsername Jul 7, 2022
ed5824f
Fixes checks (This is a hotfix)
Kitsunemitsu Jul 7, 2022
b7dcd84
Merge branch 'main' into maps/newreno
hermaplusplus Jul 14, 2022
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
4 changes: 4 additions & 0 deletions _maps/_basemap.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
#include "map_files\Sunnyvale\Sunnyvale-Underground-1.dmm"
#include "map_files\Sunnyvale\Dungeons.dmm"

#include "map_files\Reno\Reno-Above-3.dmm"
#include "map_files\Reno\Reno-Surface-2.dmm"
#include "map_files\Reno\Reno-Underground-1.dmm"

#ifdef TRAVISBUILDING
#include "templates.dm"
#endif
Expand Down
Loading