Commit Graph

83 Commits

Author SHA1 Message Date
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Sonic121x 4e2b05a22a Fix the missing Technode icon 2020-07-02 22:33:35 +08:00
Letter N b35e3f2b93 fix: R&D Console, Vending, and chem master 2020-07-01 19:07:03 +08:00
kevinz000 f7808e97ad fix (#12188) 2020-05-10 02:58:58 +02:00
Ghommie 54e76e8ffb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit697 2020-05-01 21:49:52 +02:00
kevinz000 269db0c7d6 Identification components + chameleon clothing from uplink is now obfuscated (#12045)
* fine we'll use components

* syndie kits

* Whew

* examine

* flags

* whew

* compile

* fix

* fix

* ok

* ok

* ok

* done
2020-05-01 18:39:45 +02:00
Ghommie e0a51903a1 Not yet implemented design security level requirements. 2020-04-24 00:51:04 +02:00
Ghommie 1659e2804e Deletes lots of autoylathe copypasta. 2020-04-21 04:04:10 +02:00
Ghommie 32975bf509 More bug reports yee'd their last haw. 2020-03-18 23:43:23 +01:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
Ghom bcbaea4a7b CallMaterialName reagent fix 2020-02-09 10:46:29 +01:00
Ghommie 95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
Ghommie 7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01:00
Artur e3d3f7b750 Ported 2020-01-13 13:20:55 +02:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Ghommie b2b1390bd3 Ports techweb backend refactor & co. 2019-11-07 05:07:38 +01:00
Ghommie 0513f3464a one 2019-06-05 19:20:25 +02:00
kevinz000 8418eadc5b Update rdconsole.dm 2018-11-19 20:11:29 -08:00
kevinz000 8eed799f08 Update rdconsole.dm 2018-11-12 14:42:41 -08:00
kevinz000 ad05591136 Update rdconsole.dm 2018-10-29 00:26:23 -07:00
Poojawa 284e9d0325 module things, jfc 2018-09-11 07:51:01 -05:00
kevinz000 ef851d5744 Destructive analyzers can now destroy anything again, even if it has no materials (#38690)
* Update rdconsole.dm

* Update destructive_analyzer.dm
2018-06-26 15:42:16 -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
LetterJay 6750abeb9e Merge pull request #6862 from Citadel-Station-13/upstream-merge-38020
[MIRROR] Fix outdated R&D console comment
2018-05-25 02:35:58 -05:00
LetterJay b89254ced7 Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
2018-05-24 11:58:57 -05:00
Tad Hardesty aec2e19b94 Fix outdated R&D console comment (#38020) 2018-05-23 16:12:04 -05:00
Tad Hardesty 6167423c85 Fix formatting when emagging an R&D console 2018-05-21 11:25:48 -05:00
kevinz000 73b0ac7859 Emagging a R&D console now unlocks it and prevents it from being locked as opposed to nothing (#37937)
* rdconsole emagging

* Fix grammar
2018-05-21 02:38:44 -05:00
kevinz000 d54667c81b [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT 2018-05-19 18:51:51 -05:00
Dax Dupont eb29d86c5f Fixes wrong circuits (#37853)
* Fixes wrong circuits

* this too
2018-05-16 12:04:54 -05:00
Tad Hardesty 111ad79eab Use spritesheets to reduce time spent sending PNG assets by 90+% 2018-05-09 22:44:57 -05:00
Tlaltecuhtli 3ffe415eb8 sucessfully fixes some grammar (#37095)
* sucessfully fixes some grammar

/🆑
grammar:fix
🆑

* fixes kevin spelling words in albanian

* tfffaerfvvjjewwaazcb

* does this work

* what if this works

* sdad

* ok
2018-04-14 08:12:34 -05:00
Poojawa 5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
CitadelStationBot 9338d18a28 [MIRROR] Techweb fixes (#6023)
* Techweb fixes (#36513)

* Techweb fixes

* board

* robo

* Techweb fixes
2018-03-19 21:18:35 -05:00
kevinz000 91ac70a73e RND TECHWEBS: TECHFABS (#36055)
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.

Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.

experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
2018-03-07 21:11:56 -06:00
vuonojenmustaturska e70194f329 Merge pull request #35561 from ShizCalev/rndconsole-runtime
Fixes rnd console runtimes
2018-02-15 10:38:49 -06:00
CitadelStationBot fcff80df09 [MIRROR] Fix research investigate logs (#5310)
* Merge pull request #35283 from AutomaticFrenzy/patch/research-logs

Fix research investigate logs

* Fix research investigate logs
2018-02-05 00:49:17 -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
ExcessiveUseOfCobblestone af4f017b93 Adds Display Name Argument to Techweb Logging (#34216)
* Update _techweb.dm

* Replaces ID with the name of the tech web

* REVERT ON THE WEBBITOR

* Webbitor Blues

* removes "
2018-01-11 07:40:11 -06:00
kevinz000 a82d0e13ce Fixes RND 2017-12-22 00:58:46 -08:00
LetterJay 2d995e3f5a Update rdconsole.dm 2017-12-21 12:44:16 -06:00
LetterJay 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000 253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
CitadelStationBot cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
deathride58 c9f0f4923f Update rdconsole.dm 2017-11-26 21:34:09 -05:00
kevinz000 437c527fd2 Fixes rdconsole emagging 2017-11-25 15:17:52 -06:00
Jordie b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00