Commit Graph

59 Commits

Author SHA1 Message Date
Jordan Brown
1aa0091ec1 Merge pull request #37640 from AutomaticFrenzy/patch/server-revision
Lengthen commit hashes in Show Server Revision
2018-05-04 08:42:44 -05:00
vuonojenmustaturska
da5812b07b Stops ghosts from being able to start plasma fires 2018-04-15 12:39:40 -05:00
ACCount
07e3c61067 Refactors construction datums into components (#35894) 2018-03-04 17:52:14 -06:00
vuonojenmustaturska
c64a8a8d6b Merge pull request #35604 from ACCount12/construction_datum_refactor
Refactors mech construction datums
2018-02-17 10:00:09 -06:00
deathride58
72ff7be9bd code folder. 221 files changed wew 2018-02-12 21:03:40 -05: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
kevinz000
81bc49cafe Fixes Jaunters 2018-01-15 12:05:46 -06:00
Tad Hardesty
72319a9794 Replace hardcoded z-level numbers with a trait system 2018-01-11 14:06:17 -06:00
deathride58
d26a9b23a4 datums folder 2018-01-03 23:29:47 -05: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
Jordan Brown
cfb7749903 Merge pull request #33109 from ShizCalev/camera-teleport
Cancels camera view on teleport
2017-11-28 06:29:05 -06:00
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
Jordan Brown
c6584399fe Adds some server tools info to getrev (#32692) 2017-11-14 15:36:45 -06:00
Emmett Gaines
5bcc90d3c1 removes search_contents_for proc (#32411) 2017-11-05 02:07:16 -06:00
Leo
28656d3347 Merge pull request #31809 from ShizCalev/helper-cleanup
Cleans up some istypes not using helpers
2017-10-17 19:21:14 -05:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
LetterJay
ef10ac589a Update getrev.dm 2017-10-01 02:39:07 -05:00
LetterJay
0ab234ceb0 Merge branch 'master' into upstream-merge-31000 2017-10-01 03:31:49 -04:00
Jordan Brown
116041d621 Server tools API v3.1 2017-09-28 22:20:46 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
LetterJay
aa74660722 Update construction_datum.dm 2017-09-27 16:27:09 -05:00
GLACoding
7b3fa9bdb1 Adds installing cells as part of mech construction and fixes some mech construction bugs. 2017-09-27 04:14:22 -05:00
LetterJay
aa09cd4785 Update teleport.dm 2017-09-13 00:50:41 -05:00
LetterJay
cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJay
1f7db947e4 Update teleport.dm 2017-09-11 15:54:01 -05:00
LetterJay
f6f456068f Update teleport.dm 2017-09-11 15:47:48 -05:00
KorPhaeron
d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
CitadelStationBot
1caba77431 Server tools versioning and fix to displayed testmerges 2017-08-29 17:16:17 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot
87b56c9d9c Testmerged [s] PRs no longer shown to non-admins (#2220) 2017-08-03 06:02:37 -07:00
CitadelStationBot
55f1de10a6 Spellchecking 2017-08-01 08:46:20 -05:00
LetterJay
35fba1933e Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
CitadelStationBot
147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00
CitadelStationBot
a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
CitadelStationBot
66b02755cb Fixes testmerge display (#1644) 2017-06-17 13:15:21 -07:00
LetterJay
c760c52817 upstream-merge-27951 2017-06-11 02:11:34 -05:00
LetterJay
60da3ff9b8 Original mirrored too much. 2017-06-05 07:18:29 -05:00
CitadelStationBot
93c19d0e4b Replaces parentcommit with originmastercommit 2017-05-26 14:41:35 -05:00
CitadelStationBot
4d9b48e5c5 Commit hash in rev data is now shortened (#873) 2017-05-10 16:28:14 -07:00
LetterJay
fd6df15f93 Merge branch 'master' into upstream-merge-26131 2017-05-02 09:19:49 -05:00
LetterJay
06bfa8770e Merge branch 'master' into upstream-merge-26129 2017-04-29 11:45:37 -05:00
CitadelStationBot
caaf42815a Changes some << to to_chat 2017-04-28 06:14:47 -05:00
CitadelStationBot
08a01aa11b Refactors roundstart checks slightly 2017-04-26 17:06:29 -05:00
CitadelStationBot
bde5d6253a Unorphans the blackbox 2017-04-26 17:05:23 -05:00
LetterJay
73456c9e9a REJECT CLEANUP. FUUUUUUUUUUUUUUUUUUCK. 2017-04-25 21:40:46 -05:00
LetterJay
3d51a07243 world fix 2017-04-25 01:52:49 -05:00
CitadelStationBot
607868a5de [s]Exploit whack-a-mole 2017-04-25 01:31:50 -05:00
CitadelStationBot
defa9d863c >We still let old code in the codebase 2017-04-24 21:22:11 -05:00