Commit Graph

68 Commits

Author SHA1 Message Date
FrozenGuy5
9439d61184 Adds a missing brown gas rename. 2017-11-02 19:59:33 -05:00
as334
eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
Poojawa
7b8e88ec7e Medihound Fixes (#3462)
* fix borgs, tries new things

* TGUI experiment, Expanded resist

also cleans up some bad code we don't want to keep

* kinda important to have the right one

* I actually managed to compile tgui

* tgui fuckery

I hate UI building

* more tgui tweaks

and it finally compiles, again.

* Have I mentioned UIs are not my strong point?

Because they're really not

* updates to this shit thing.

Tgui button chem selection -> chem to inject needs to be fixed

* No.

* FUCKING, FINALLY
2017-10-21 06:15:50 -05:00
oranges
993cf948fb allows vent internal pressure bound to be set by air alarms 2017-10-14 21:10:47 -05:00
LetterJay
41846d0793 Merge branch 'master' into upstream-merge-31599 2017-10-12 11:00:37 -04:00
LetterJay
4a8f3d0e41 fuck this shit 2017-10-12 09:58:16 -05:00
LetterJay
2918c2c20d Update atmos_filter.ract 2017-10-12 02:58:50 -05:00
duncathan salt
e61b6aecd7 unfucks filters 2017-10-12 01:07:52 -05:00
duncathan salt
c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
Robustin
a570ec8610 Adds the Chemistry Smoke Machine (#30920)
* Smoke Machine

* Tweak

* More responsive smoke timing

* Antur Review and Admin Logs

* Cboss review

* More logging

* Removes analyze, streamlines logs

* r-e-a

* no s in reagents_list

* Cyberboss Review

* woops

* Cboss nitpicking
2017-10-10 13:13:38 -05:00
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