Commit Graph

40 Commits

Author SHA1 Message Date
evilew
10ef9e374a Nanotrasen to GATO - comments
I know it's a mess, but the least I can do is add comments anywhere I can
2024-11-19 01:59:28 +01:00
evilew
edea3ae8e0 nanotrasen to gato
Replaced most instances of Nanotrasen mentions into GATO, though I've kept some that have more sense to be kept as Nanotrasen (like nanotrasen marked stuff and such)
2024-11-09 23:05:02 +01:00
Putnam3145
33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
Putnam3145
629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
SandPoot
b23b88524d Upload files 2021-09-28 22:03:17 -03:00
Letter N
935e46b492 The Mapping Update
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
silicons
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
Letter N
9a9e3ffef5 fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category. 2020-08-03 21:14:17 +08:00
Letter N
5d4bb48628 another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator 2020-07-29 15:10:01 +08:00
Artur
dabdf16eac Coonflict fiiixeeess 2020-05-13 12:56:17 +03:00
Artur
120615d472 Ports https://github.com/tgstation/tgstation/pull/44525, and
And fixes to make stuff work
2020-04-23 17:36:13 +03:00
Artur
80b47ec1c0 Ports https://github.com/tgstation/tgstation/pull/50497 2020-04-23 09:55:28 +03:00
Ghommie
e0d219650f Ready for testing. 2020-04-21 01:26:34 +02:00
Ghommie
4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
kevinz000
b983aa75ea Merge pull request #11145 from Ghommie/Ghommie-cit586
Something about pAIs and silicon access priviledges.
2020-02-19 18:59:10 -07:00
Ghommie
698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01:00
Ghom
a2583f5f7f Update expressconsole.dm 2020-02-17 14:25:50 +01:00
Trilbyspaceclone
470e786765 Update expressconsole.dm 2020-02-15 15:59:09 -05:00
Artur
8b21a60ac9 MF Line endings 2020-01-20 14:09:22 +02:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie
4e05c27cdb Updating supply pods code. 2019-11-27 01:54:10 +01:00
Ghommie
63da5ffb13 ID console fixes and other tweaks. 2019-11-11 17:10:14 +01:00
Ghommie
ffecca8c11 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-03 03:24:28 +02:00
Ghommie
0513f3464a one 2019-06-05 19:20:25 +02:00
Poojawa
d231018a3a Flashy flash and Gondola Pods
and cult effect addition, fixes CTF
2018-09-21 02:48:17 -05:00
Poojawa
284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
deathride58
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
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
MrDoomBringer
846aa734e8 fixes fuckup in expressconsole preventing packs being ordered when credits are low (#37239)
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* fixes my errors
2018-04-16 19:14:08 -05:00
MrDoomBringer
efb3dceb32 Fixes the cargo Express Console's description [wtf why is there a sprites tag] (#36765)
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089)

* mfw the space jews finally leave the drop pod buisiness

gimme gimme the gee bee pee

the fuck ahaha
2018-03-28 13:38:04 -05:00
CitadelStationBot
544d7bcaf4 [MIRROR] Adds descriptions to all cargo orders! (#5917)
* Adds descriptions to all cargo orders!

* recompiles tgui
2018-03-12 07:39:38 -05:00
Poojawa
455ee7e687 modules 2018-03-06 21:45:16 -06:00
CitadelStationBot
cc2d5bfc07 [MIRROR] Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs (#5283)
* Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs (#35249)

* yaga

* node change

* okay cobby

* Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs
2018-02-04 23:18:18 -06:00
Poojawa
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
LetterJay
888a132eff Update expressconsole.dm 2018-01-23 08:19:16 -06:00
MrDoomBringer
8e090b430b Adds the Bluespace Drop Pod upgrade to the cargo express console 2018-01-23 01:36:43 -06:00
Iamgoofball
dcd61e0ba4 The Express Console emag effect is now a proper emag effect (#34373)
* The Express Console emag effect is now a proper emag effect

cyka blyat

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm

* Update expressconsole.dm
2018-01-14 23:48:55 -06:00
oranges
1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00