shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,073 Commits 5 Branches 0 Tags
22b634fe61ba45e1f70dcf3731cd95047cf44e83
Commit Graph
60 Commits
Author SHA1 Message Date
Poojawa 42db44b39e Alien Ruin fix, various cherrypicked upstream fixes 
Also adds new buildmode
 2018-09-13 22:55:11 -05:00
Poojawa 8b9ef1e400 Game folder 2018-09-11 04:06:45 -05:00
kevinz000 2a6e4fce59 Photography Update 2018-07-20 15:26:13 -07:00
deathride58 91805b8789 and that just leaves the modules folder 2018-07-02 00:28:51 -04:00
Jordan Brownandletterjay 5e15a988f6 Refactor machinery to default to being anchored 2018-06-01 11:28:19 -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
kevinz000andPoojawa 3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Dax DupontandCitadelStationBot 4850230fc4 Refactors and fixes RPEDs 2018-04-27 13:13:37 -05:00
Poojawaanddeathride58 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
Poojawa 95cb6b23f2 controllers, datums, game 2018-03-06 21:16:46 -06:00
LetterJayandGitHub 8b2e073841 Update message_server.dm 2018-02-16 07:53:54 -06:00
Jordan BrownandCitadelStationBot f9353da855 Quote the armor lists 2018-02-16 00:26:26 -06:00
AnturKandCitadelStationBot 10a40524ab Cleans up remnant traitor cyborg code and AI hacking. 2018-02-15 10:40:04 -06:00
CitadelStationBotandPoojawa 7c56b53aab [MIRROR] Ports telecoms to Initialize (#5249) 
* Ports telecoms to Initialize

* Update telecomunications.dm
 2018-02-05 00:57:04 -06:00
Poojawa fb5de29784 cleanup of game folder, other fixes 2018-01-31 06:39:18 -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
Jordan BrownandCitadelStationBot 08809072bb Merge pull request #34558 from AutomaticFrenzy/patch/pda-logs 
Log PDA messages sent by the message monitor console
 2018-01-18 16:48:25 -06:00
LetterJayandGitHub 6bcf918111 Update message.dm 2018-01-17 09:40:34 -06:00
orangesandCitadelStationBot ebfc1c3d9c Cleans up some redundant stripped_input usage 2018-01-16 14:32:25 -06:00
deathride58 d8facb3bce initial commit - game folder + maps + dme 2018-01-03 22:52:38 -05:00
LetterJayandGitHub 7a6cf002d3 Revert "[MIRROR] Fix PDA message photos not being viewable" 2017-12-31 06:41:03 -06:00
Tad HardestyandCitadelStationBot 38870f4056 Fix PDA message photos not being viewable 2017-12-30 21:27:31 -06:00
LetterJayandGitHub 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
JordieandCitadelStationBot b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
KorPhaeronandCitadelStationBot 594da93554 Heirophant Relay sprites (#32636) 2017-11-14 13:04:34 -06:00
Jordan BrownandCitadelStationBot 4b297f509e 512 forward compatibility merge 2017-10-29 10:28:36 -05:00
CitadelStationBotandPoojawa adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
bawhoppenandCitadelStationBot 82981339ed Adds desc to things lacking them. 2017-10-01 15:07:37 -05:00
Ashe HiggsandCitadelStationBot e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
KorPhaeronandCitadelStationBot d05fdb0eb0 Makes the station Z level into a list instead of a single define 2017-09-11 12:40:35 -05:00
kevinz000 2b5d584c67 sync 2017-08-29 20:15:33 -07:00
LetterJayandGitHub b39bd24aaa Merge branch 'master' into upstream-merge-30218 2017-08-28 09:03:46 -05:00
LetterJayandGitHub 472e39693f Update allinone.dm 2017-08-28 09:02:35 -05:00
CitadelStationBot a6cc400a4b Fixes allinone tcomms machine 2017-08-28 02:20:51 -05:00
CitadelStationBot 18904f2f0f Maintains that weird entire-tcomms-setup-in-one-machine thing 2017-08-26 11:08:01 -05:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
CitadelStationBot 4d19a89519 Removes a great amount of machinery copypasta with circuitboards. 2017-08-09 19:24:19 -05:00
CitadelStationBot cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
LetterJayandGitHub 27b826a6f1 Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260 
[MIRROR] Changes all access const to be a define
 2017-07-19 13:18:58 -05:00
CitadelStationBotandkevinz000 e522f715a2 [Ready] Shuttle dock() rewrite (#2040) 2017-07-17 22:52:18 -07:00
CitadelStationBot 609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
CitadelStationBotandkevinz000 ff6bbbedf5 Changes some 1s and 0s to TRUE and FALSE (#1967) 2017-07-10 16:13:16 -07:00
PoojawaandGitHub b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
CitadelStationBotandkevinz000 9d5e51777b use_power var now uses a define to reflect it not being a bool (#1842) 2017-06-30 20:41:59 -07:00
LetterJay 5571cca37c .rej cleanup 2017-06-26 06:14:42 -05:00
CitadelStationBotandkevinz000 30d3a42db6 Minor telecom code cleanup (#1691) 2017-06-20 07:58:53 -07:00
CitadelStationBot d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
LetterJay 6310292531 woo 2017-05-02 11:19:14 -05:00
LetterJay 991fb8335c manual merge 2017-04-29 11:42:28 -05:00