shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,371 Commits 5 Branches 0 Tags
a1202bcec7bdbef048a6980f2f00a4939142ad21
Commit Graph

58 Commits

Author SHA1 Message Date
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
Poojawa
9e3a1a4a0b fuck trying to install linux based bullshit scripts (#2758) 2017-09-14 06:43:11 -05:00
CitadelStationBot
083fc1a7b4 [MIRROR] Standardized power displays (#2539) 
* Standardized power displays

* Update tgui.js

* Delete tgui.js.rej
 2017-09-13 17:57:16 -05:00
LetterJay
14aefe2e64 commit 2017-09-11 14:01:42 -05:00
LetterJay
31102d0ec4 Merge pull request #2608 from Citadel-Station-13/upstream-merge-30262 
[MIRROR] Soft crit, except not terrible
 2017-09-07 10:01:35 -05:00
LetterJay
8299cf576c this sure was FUN 2017-09-07 09:47:56 -05:00
LetterJay
00199af27d Merge branch 'master' into upstream-merge-29866 2017-09-06 09:21:53 -05:00
kevinz000
c9280bd308 sync 2017-08-29 22:12:19 -07:00
CitadelStationBot
3e1031d6b9 Adds a ghost verb to see all available ghost spawners 2017-08-29 17:45:50 -05:00
kevinz000
2b6e8a6d51 rej 2017-08-29 09:58:26 -07:00
kevinz000
95fee82fcb tgui compile 2017-08-21 20:35:16 -07:00
CitadelStationBot
5eea016593 You can now click on symptoms in the Pandemic to see their description and stats 2017-08-19 18:52:55 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
609ae007ae Changes all access const to be a define 2017-07-16 11:44:47 -05:00
Poojawa
b1b4826c0c July 5th TG sync (#1883) 
July 5th TG sync
 2017-07-05 22:14:19 -05:00
Poojawa
db6d92c108 Delete tgui.js.rej 2017-07-05 09:00:44 -05:00
Poojawa
9e4d948aa2 Delete tgui.css.rej 2017-07-05 09:00:13 -05:00
LetterJay
19cee66fc5 Update tgui.js 2017-07-03 12:03:46 -05:00
CitadelStationBot
5882b25b7a Rewrites Recollection and splits it into categories, rewords Hierophant Network description 2017-07-03 10:10:17 -05:00
LetterJay
447a81bcad Update tgui.js 2017-06-29 04:37:52 -05:00
CitadelStationBot
d1a77ef774 Ports bay's supermatter monitor modular program 2017-06-28 10:05:53 -05:00
CitadelStationBot
237691f6fd [MIRROR] Fixes problems that were in the original PR (#1419) 
* Fixes problems that were in the original PR

* rej cleanup

* Wow CSS is even worse than byond
 2017-06-28 03:02:50 -05:00
CitadelStationBot
65736b7e23 [MIRROR] Ports the Ore Redemption Machine to TGUI (#1414) 
* Ports the Ore Redemption Machine to TGUI

* Update tgui.css

* Update tgui.js

* Delete tgui.css.rej

* Delete tgui.js.rej
 2017-06-28 02:24:55 -05:00
Poojawa
789064a3a5 Clean up .rej files 2017-06-28 02:24:03 -05:00
LetterJay
039dcb464f Delete tgui.js.rej 2017-06-26 23:18:08 -05:00
LetterJay
b44d1d721b Update tgui.js 2017-06-26 23:15:48 -05:00
CitadelStationBot
f36853ea75 Adds custom lighting support to modular computers, and a flashlight to tablets 2017-06-21 15:43:05 -05:00
LetterJay
e8b9b741eb evil powers 2017-06-12 22:35:47 -05:00
LetterJay
d34606ab57 Revert "dark magic [tgui]" 2017-06-10 22:40:41 -05:00
LetterJay
1ec7cfaba0 Create tgui.js 2017-06-10 14:11:20 -05:00
LetterJay
3d750adbd7 master cleanup 2017-06-05 22:50:31 -05:00
CitadelStationBot
e0b5221ebd The Crafting Menu now has subcategories! (#1364) 2017-06-04 09:09:59 -07:00
LetterJay
0b1a680d1a Merge pull request #1087 from Citadel-Station-13/upstream-merge-27480 
[MIRROR] Ports pandemic to tgui
 2017-05-23 06:13:41 -05:00
LetterJay
c9c2961c9c fancy 2017-05-23 05:26:20 -05:00
LetterJay
73dea85b15 commit/rej cleanup 2017-05-22 11:24:17 -05:00
CitadelStationBot
d7f0b9494b Ports pandemic to tgui 2017-05-21 22:28:16 -05:00
CitadelStationBot
c6a671a11b [MIRROR] Devil refactor+small revamp (#887) 
* Devil refactor+small revamp

* Delete mind.dm.rej

* clean up rej

* Delete admin_investigate.dm.rej

* Delete mapping.dm.rej

* compile fix
 2017-05-18 09:06:01 -05:00
CitadelStationBot
6a2916a171 [MIRROR] Bluespace Launchpads (#879) 
* Bluespace Launchpads

* Delete runtimestation.dmm.rej

* Delete tgstation.dme.rej

* Delete tgui.js.rej

* Update tgui.js
 2017-05-18 07:12:13 -05:00
CitadelStationBot
eb359f1014 [MIRROR] Cerestation Tweaks VI: Shuttle Edition (#876) 
* Cerestation Tweaks VI: Shuttle Edition

* fix .rej
 2017-05-18 06:51:26 -05:00
CitadelStationBot
2eea01f671 [MIRROR] Refactor of modular PC UIs (#874) 
* Refactor of modular PC UIs

* .rej fix
 2017-05-18 05:22:34 -05:00
LetterJay
1948b007d1 fix roundstart/rej cleanup 2017-05-17 05:08:51 -05:00
LetterJay
bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04:00
LetterJay
46f5c4bb1b commit 2017-05-16 23:35:54 -05:00
kevinz000
005d8a8156 Lets try that again... (#868) 
* TGUI GPS

* fixes .rej
 2017-05-08 22:58:46 -07:00
kevinz000
77c066d93a Revert "[MIRROR] TGUI GPS" (#867) 
* Revert "Automatic changelog generation for PR #608 [ci skip]"

This reverts commit 7701c39fde.

* Revert "TGUI GPS (#608)"

This reverts commit ba0f4b1c59.
 2017-05-08 22:48:34 -07:00
CitadelStationBot
ba0f4b1c59 TGUI GPS (#608) 2017-05-08 22:46:42 -07:00
CitadelStationBot
56d5e12263 Moves languages to a holder datum, gives mind its own language holder 2017-05-05 08:13:04 -05:00
CitadelStationBot
45e9b1644e Gas injectors are now buildable 2017-04-26 04:35:40 -05:00
Poojawa
7e9b96a00f April sync (#360) 
* Maps and things no code/icons

* helpers defines globalvars

* Onclick world.dm orphaned_procs

* subsystems

Round vote and shuttle autocall done here too

* datums

* Game folder

* Admin - chatter modules

* clothing - mining

* modular computers - zambies

* client

* mob level 1

* mob stage 2 + simple_animal

* silicons n brains

* mob stage 3 + Alien/Monkey

* human mobs

* icons updated

* some sounds

* emitter y u no commit

* update tgstation.dme

* compile fixes

* travis fixes

Also removes Fast digest mode, because reasons.

* tweaks for travis Mentors are broke again

Also fixes Sizeray guns

* oxygen loss fix for vore code.

* removes unused code

* some code updates

* bulk fixes

* further fixes

* outside things

* whoops.

* Maint bar ported

* GLOBs.
 2017-04-13 23:37:00 -05:00
Poojawa
f67e9f6d87 Bleeding edgy refresh (#303) 
* not code stuff

* other things

* global vars, defines, helpers

* onclick hud stuff, orphans, world.dm

* controllers and datums

* game folder

* everything not client/mobs in modules

* client folder

* stage 1 mob stuff

* simple animal things

* silicons

* carbon things

* ayylmaos and monkeys

* hyoomahn

* icons n shit

* sprite fixes

* compile fixes

* some fixes I cherrypicked.

* qdel fixes

* forgot brain refractors
 2017-03-21 11:44:10 -05:00