Commit Graph
61 Commits
Author SHA1 Message Date
BongaTheProto b6dc33fb2e modular map loader
yep
2023-08-18 20:04:20 -05:00
BongaTheProto 3e96df735a Revert "Revert "Merge pull request #136 from AyyRobotics/VaultTech""
This reverts commit 5e044b84fa.
2022-01-17 12:08:38 -05:00
BongaTheProto 5e044b84fa Revert "Merge pull request #136 from AyyRobotics/VaultTech"
This reverts commit 20be3932b5, reversing
changes made to cce6c7a07a.
2022-01-16 23:28:17 -05:00
BongaTheProto 96d330d8a0 trying again 2022-01-15 19:54:08 -05:00
AyyRobotics 79ff681e28 Boosts the Credit Cost by 500
Honestly, just to restart the check due to Map Merge issues.
2022-01-15 18:05:29 -05:00
Ayy-RoboticsandGitHub 31d25d1233 Nerfing Cost + Admin Notes
Making the price more accessible while adding admin notes to it.
2022-01-10 16:51:03 -05:00
Ayy-RoboticsandGitHub a5badb997e Adds the Emergency Vault Shuttle (Code) 2022-01-10 16:38:18 -05:00
James 9258b93f64 Modularises (most of) the code into EROS module folder 2021-12-05 19:39:24 +00:00
James 738e009078 Adds WIP shuttle / hideout. Adds teleport implant. More slave stuff. 2021-12-04 06:02:40 +00:00
LetterN 228105b391 laptop and closet decon fix 2021-03-16 14:47:28 +08:00
Letter N de6f1401bb final fix 2021-03-08 13:24:28 +08:00
Letter N de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Letter N 8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
19f1e99a8c mass ports like 15 tg prs + counting (#13386)
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
2020-10-10 12:20:33 +02:00
Artur 20245f7319 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-30 02:30:29 +03:00
Detective Google 57fca41e20 aeugh2 2020-06-25 15:22:11 -05:00
Artur c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Timothy Teakettle d10dfbec5e fix maps but it works 2020-06-16 16:23:53 +01:00
Timothy Teakettle d7bce8aec0 ports some events 2020-06-15 20:22:40 +01:00
Artur b6dc41b852 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-09 11:07:39 +03:00
Artur 5b7d9a9008 Merge conflict fix 2020-05-13 12:37:18 +03:00
Detective Google 424133c48a adds the actual snow taxi to snaxi 2020-05-09 22:20:26 -05:00
Detective Google 9f25759aa8 Citsnow -> final name (Snaxi) , fixes arrivals 2020-05-09 00:53:04 -05:00
5c5fc37959 Introducing noitatsxoB (#12073)
* okay

* ok

* ok

* ok

* ok

* why am i doing this

* WHY DID I DO THIS

* mirror doesn't work

* compile

* shuttles should work

* fix engine

* fix engine

* off by 1

* ok

* adds proccall to write next map

* haha post processing funny

* fixes

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mapping/map_template.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-05-06 17:50:50 +02:00
Artur 67e0b95407 Shuttle stuffs and gateway refactor port https://github.com/tgstation/tgstation/pull/49868/ 2020-04-23 12:36:42 +03:00
EmeraldSundisk d8e82c03ef Update shuttles.dm 2020-03-17 08:36:28 -07:00
EmeraldSundisk dfe73565a1 Revert "shut"
This reverts commit 7502cec756.
2020-03-17 08:33:53 -07:00
EmeraldSundisk 7502cec756 shut 2020-03-17 08:19:45 -07:00
Persi c4b4a90bd8 Oh hey it's KiloStation
Trying to make Kilo open...

Finally, the work begins!

Kilo added!

Kilo Station!
2020-02-20 00:58:54 -05:00
GhomandGitHub d709edb1c2 Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
2020-01-18 20:32:14 +01:00
r4d6 ce16c91b2f Code changes 2020-01-16 14:08:14 -05:00
Seris02 83eff39063 nope 2020-01-08 17:20:58 +08:00
BlackMajor 959c4b35ce Update all them shuttles 2019-10-21 22:00:18 +13:00
Tupinambis a3678b0713 Adds an emag exclusive syndicate emergency shuttle. 2018-11-10 15:33:01 -06:00
Poojawa bc0d14c193 Continual updates until merged 2018-09-17 04:55:03 -05:00
Poojawa b6430559e9 datums 2018-09-11 02:49:41 -05:00
kevinz000andGitHub 8b7fa2396b Update shuttles.dm 2018-07-29 17:04:55 -07:00
deathride58 3e18d8208e Updates to tgstation commit 78e471d 2018-07-05 01:22:27 -04:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
Dax Dupontandletterjay e5b95cfcdd Some minor pubby shuttle tweaks (#38489)
* Some minor pubby shuttle tweaks

* no step

* Good idea denton

* thanks guys
2018-06-16 06:17:57 -05:00
deathride58andkevinz000 2f9e3e403d Hard upstream sync (#6951)
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
2018-05-31 16:03:18 -07:00
CitadelStationBotandkevinz000 d62cb31e9b [MIRROR] Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile (#6884)
* Delete some duplicate macro definitions

* sql changelog changes ping the host

* Templates the caravan ambush ruin shuttles

* Update CODEOWNERS

* Update components.dm

* Shuffles Exited() call to after loc is actually changed in forceMove. Fixes storage forcing everything to mouse opacity fulltile

* Initial Placeholder

* Update caravanambush.dmm
2018-05-27 19:27:56 -07:00
Poojawa e5f9765d2a datums/controller stuff 2018-04-23 00:02:42 -05:00
deathride58 72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05:00
Dax DupontandCitadelStationBot 0f8b7da2a1 Adds the saltmine shuttle. (#35369)
* Adds the saltmine shuttle

* Adds an orange, makes the revolver a reverse one

* henk

* honker

* pay me

* more cat and cat accessories

* memes

* Crybabies jeeez

* Salt is expensive

* There now it's an easter egg shuttle

* nani
2018-02-07 07:17:50 -06:00
PoojawaandGitHub 03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Dax DupontandCitadelStationBot 91cc5b1024 Adds disco inferno shuttle. (#33230)
* Adds disco inferno shuttle

* step be gone

* Minor wall replacement

* Add no diagonal walls

* Made the dance machine all access

* Makes the statues work as I originally intended in this shuttle

* Fixes a chair

* Changed door and made it to keep fire inside.
2017-12-05 03:22:40 -06:00
swindlyandCitadelStationBot 3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
CitadelStationBot cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot 1a38b6fd6f Shuttle engines affecting travel time 2017-06-25 20:53:00 -05:00