KS7 Marshal Overhaul Update #3426
Conversation
| @@ -30,3 +30,5 @@ __pycache__ | |||
| code/modules/halo/flood/types/flood_shield.dm | |||
| code/modules/halo/flood/types/sangheili.dm | |||
| code/modules/halo/vehicles/types/phantom_dropship.dm | |||
| baystation12.dme | |||
| baystation12.dme | |||
There was a problem hiding this comment.
Kerfuffle with inclusion and a ignore githhub that I must have did wrong, there should be no changes to the indicated files, if there is then something is wrong on my end.
There was a problem hiding this comment.
there are changes, that's what github tracks
There was a problem hiding this comment.
If that is the case then I will cancel this merge request, I have not knowingly modified those files in any way and look into my own fork to see why those files have been changed.
| #include "maps\geminus_city\geminus_city.dm" | ||
| #include "maps\ks7_elmsville\includes.dm" |
There was a problem hiding this comment.
this should not have been PR'd
There was a problem hiding this comment.
Gitignore moment 2.0.
| @@ -3350,7 +3351,9 @@ | |||
| #include "maps\_gamemodes\_popbalance.dm" | |||
| #include "maps\_gamemodes\gamemode_overrides.dm" | |||
| #include "maps\_gamemodes\randantag\randantag.dm" | |||
| #include "maps\faction_bases\civ_shuttle.dm" | |||
There was a problem hiding this comment.
nor should have this been PR'd
There was a problem hiding this comment.
Gitignore moment.
There was a problem hiding this comment.
This update overhauls the KS7 Marshals with new equipment, gear and apparel, as well as changes to their PD including a left that leads to a underground garage, several QoL rooms, a mayors office on the second floor along with a expanded armory and other various facilities to promote a more enjoyable experience for KS7 Colonial Marshal players.
| @@ -30,3 +30,5 @@ __pycache__ | |||
| code/modules/halo/flood/types/flood_shield.dm | |||
| code/modules/halo/flood/types/sangheili.dm | |||
| code/modules/halo/vehicles/types/phantom_dropship.dm | |||
| baystation12.dme | |||
| baystation12.dme | |||
There was a problem hiding this comment.
Kerfuffle with inclusion and a ignore githhub that I must have did wrong, there should be no changes to the indicated files, if there is then something is wrong on my end.
| @@ -3350,7 +3351,9 @@ | |||
| #include "maps\_gamemodes\_popbalance.dm" | |||
| #include "maps\_gamemodes\gamemode_overrides.dm" | |||
| #include "maps\_gamemodes\randantag\randantag.dm" | |||
| #include "maps\faction_bases\civ_shuttle.dm" | |||
There was a problem hiding this comment.
Gitignore moment.
| #include "maps\geminus_city\geminus_city.dm" | ||
| #include "maps\ks7_elmsville\includes.dm" |
There was a problem hiding this comment.
Gitignore moment 2.0.
🆑 YourPalHolidays(Tsar)
rscadd: Added new Marshal gear and custom sprites. (Original credit goes to Eluxor)
rscadd: Overhauls KS7's police department.
tweak: Fixes the GCPD slowdown gear bug.
/:cl: