Skip to content

Commit

Permalink
Deathmatch but in an Industrial Park (#1172)
Browse files Browse the repository at this point in the history
* Create Industrial.dmm

* Update Industrial.dmm

* Moves map to modules

* Sets up the files

* Not eyes apparently -- GLASSES of course

* Adds some lights and such

* Update Industrial.dmm

* Update Industrial.dmm

* I failed at making an emagged cleanbot, honkbot will do instead

* Resolve conflict 1

* Prep for update

* Moves .dmm files to proper location

As per @Horatio22

* These walls lack opacity = 1 no longer

* Resolve Conflict 2

* Removes old nanite relics from the game (#1168)

* Removes old nanite relics from the game

* Update tgstation.dme

* forgot this

* new fluff room

* difffrent fluff room

* Updates with master

* Adds a second fulp Deathmatch arena (#1156)

* adds heliocentric

* Update deathmatch_loadouts.dm

* Update deathmatch_maps.dm

* Update heliocentric.dmm

* Update heliocentric.dmm

* Update deathmatch_maps.dm

* fixes ctf

* fixes

* fix

* am old an rusty

* Phone webedit

* Prep for update

* TGU - 3/14/2024 (#1154)

* TGU - 3/14/2024

* a

* nanite source fix

* Fixes Cargo

* Fix polling mutating its target's plane and layer

* Fixing cargo 2

---------

Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com>

* Pubby Decal Refresh (#1160)

* Changes many decals all over the station

* Missed decal

* More Tweaks, removes more yellowed hashes

* More (surely) epic changes

* Bridge touch up

* removes helio's layer 1 cables in sm chamber (#1169)

* removes helio's layer 1 cables in sm chamber

* Update Heliostation.dmm

* Update Heliostation.dmm

* Big Map Refector (#1170)

* Moves .dmm files to proper location

As per @Horatio22

* These walls lack opacity = 1 no longer

* Resolve Conflict 2

* Rebase, resend...

* Update, resend... I love conflicts!

---------

Co-authored-by: anettera <27014495+remove32@users.noreply.github.com>
Co-authored-by: Bilbo367 <163439532+Bilbo367@users.noreply.github.com>
Co-authored-by: Pepsilawn <reisenrui@gmail.com>
Co-authored-by: JohnFulpWillard <53777086+JohnFulpWillard@users.noreply.github.com>
  • Loading branch information
5 people authored Mar 23, 2024
1 parent 54896ee commit 185991a
Show file tree
Hide file tree
Showing 3 changed files with 3,761 additions and 1 deletion.
Loading

0 comments on commit 185991a

Please sign in to comment.