shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,523 Commits 5 Branches 0 Tags
dcf2e91e1a781a8226f5e4049f6d8049f1c09f4f
Commit Graph
6453 Commits
Author SHA1 Message Date
deathride58andGitHub 1d841ce65a Merge pull request #3994 from Citadel-Station-13/upstream-merge-32736 
[MIRROR] RPD ui improvements
 2017-11-18 05:40:13 +00:00
deathride58andGitHub a15007cd5a Merge pull request #3992 from Citadel-Station-13/upstream-merge-32761 
[MIRROR] Tweaks AI door open and close buttons
 2017-11-18 05:39:22 +00:00
deathride58andGitHub 04d290aa11 Merge pull request #3967 from Citadel-Station-13/upstream-merge-32775 
[MIRROR] Makes the operation computer tgui
 2017-11-18 05:38:59 +00:00
deathride58andGitHub 5f055aa492 Update vent_scrubber.dm 2017-11-18 00:36:11 -05:00
deathride58andGitHub d034e7dbf2 Merge pull request #3964 from Citadel-Station-13/upstream-merge-32746 
[MIRROR] Atmos Filter/Scrubber UI update
 2017-11-18 05:35:27 +00:00
deathride58andGitHub eeba86e27e Merge branch 'master' into upstream-merge-32188 2017-11-18 05:31:42 +00:00
deathride58andGitHub 9e78bcd8f9 Merge pull request #3971 from Citadel-Station-13/upstream-merge-32786 
[MIRROR] Replaces a bunch of mob loops with hopefully better ones
 2017-11-18 05:29:32 +00:00
deathride58andGitHub bc1f65b381 Update adminhelp.dm 2017-11-18 00:24:52 -05:00
deathride58andGitHub c98faf5bb5 Update _cit_helpers.dm 2017-11-18 00:23:19 -05:00
deathride58andGitHub 591efe27a3 Update robot_modules.dm 2017-11-18 00:19:35 -05:00
deathride58andGitHub bb690b24ba Update cit_crewobjectives_science.dm 2017-11-17 23:45:20 -05:00
deathride58andGitHub afce3e01b7 sHIT WRONG BRANCH - undoes edit 2017-11-17 23:43:48 -05:00
deathride58andGitHub cf34b64266 Update cit_crewobjectives_science.dm 2017-11-17 23:42:43 -05:00
deathride58andGitHub 49c72a8a91 Update on_move.dm 2017-11-17 23:39:06 -05:00
deathride58andGitHub 98ce27d0ad Update cell.dm 2017-11-17 23:37:32 -05:00
deathride58andGitHub 3cee5f3568 Update pray.dm 2017-11-17 23:36:00 -05:00
deathride58andGitHub 2d250c9b01 Update playsound.dm 2017-11-17 23:34:31 -05:00
deathride58andGitHub 9cb06c70f6 Update adminjump.dm 2017-11-17 23:33:22 -05:00
deathride58andGitHub b55312613f Update secrets.dm 2017-11-17 23:31:47 -05:00
deathride58andGitHub 4bf7fd963d Update secrets.dm 2017-11-17 23:30:31 -05:00
deathride58andGitHub eea00b4d85 Update wizard.dm 2017-11-17 23:29:09 -05:00
deathride58andGitHub a0d70d8823 Update traitor.dm 2017-11-17 23:28:09 -05:00
deathride58andGitHub 7b244b40fb Update changeling.dm 2017-11-17 23:25:20 -05:00
deathride58andGitHub d202867730 Update carbon.dm 2017-11-17 23:23:13 -05:00
deathride58andGitHub f1818eb11b Update death.dm 2017-11-17 23:22:02 -05:00
deathride58andGitHub 127846549d Update mass_hallucination.dm 2017-11-17 23:21:13 -05:00
deathride58andGitHub 38f7b829c3 Update manifest.dm 2017-11-17 23:20:44 -05:00
deathride58andGitHub e478e5640a Update tracking.dm 2017-11-17 23:20:15 -05:00
deathride58andGitHub 674cce2d85 Merge pull request #3986 from Citadel-Station-13/upstream-merge-32804 
[MIRROR] Add the ability to osay from the viewvar dropdown
 2017-11-18 04:15:58 +00:00
deathride58 7669ea4820 and copypasta falls out of my pocket 2017-11-17 22:14:09 -05:00
CitadelStationBotandkevinz000 0beef30fb7 Adds a purple bartender suit and apron, and Long Hair 3 - Requested and sprites by Okand37! (#3993) 2017-11-17 19:02:40 -08:00
deathride58 fb62491701 manual map syncs + manual missed pr mirrors 2017-11-17 21:34:49 -05:00
duncathan saltandCitadelStationBot 52fc5e8bc6 RPD ui improvements 2017-11-17 18:03:56 -06:00
JJRcopandCitadelStationBot 244e823558 Tweaks AI door open and close buttons 2017-11-17 12:53:16 -06:00
duncathan saltandCitadelStationBot 8bc84c23db fixes scrubbers being unable to scrub 2017-11-17 12:50:42 -06:00
Dax DupontandCitadelStationBot e3f172d999 Fixes hydroponics not properly dealing with fluorine (#32813) 
fluorine was misspelled
 2017-11-17 12:50:11 -06:00
deathride58 794bfb18c1 Manual mirror of https://github.com/tgstation/tgstation/pull/32496 2017-11-17 09:49:26 -05:00
orangesandCitadelStationBot a637da3b0f Add the ability to osay from the viewvar dropdown (#32804) 2017-11-17 03:49:08 -06:00
CitadelStationBotandkevinz000 43f49c74ee [MIRROR] adds 1 gbp to armhulen's account (grammar fix) (#3936) 
* adds 1 gbp to armhulen's account (grammar fix)

* Update mind.dm

* Update mind.dm
 2017-11-17 00:29:40 -08:00
CitadelStationBotandkevinz000 0d8d2c50da [MIRROR] Remove shocker circuit (#3983) 
* Remove shocker circuit (#32758)

* Remove shocker circuit
 2017-11-17 00:24:50 -08:00
CitadelStationBotandkevinz000 1453373770 [MIRROR] Nerfs power regen on the regular tesla relay circuit. (#3980) 
* Nerfs power regen on the regular tesla relay circuit. (#32782)

* nerfed power regen on both variants of tesla circuit

* lines

* ill show you consistency

* Nerfs power regen on the regular tesla relay circuit.
 2017-11-17 00:24:36 -08:00
CitadelStationBotandkevinz000 fd12953f10 [MIRROR] New -> Initialize (#3972) 
* New -> Initialize (#32777)

* New -> Initialize

* Remove loc from Initialize

* New -> Initialize
 2017-11-17 00:24:02 -08:00
JordieandCitadelStationBot b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
kevinz000andCitadelStationBot 8cf1266b72 [s] Sanitizes text input/output in circuits (#32833) 
* Adds Sanitization to TTS

* Sanitize input

* stripped_input

* strip debugger input

* Stripped inputs in pin inputs.

* stripped pin input

* stripped string pin input

* stripped char input pin.
 2017-11-17 00:36:29 -06:00
deathride58andGitHub 706e691fef Merge pull request #3981 from Citadel-Station-13/upstream-merge-32778 
[MIRROR] Makes you turn when pulling and adds sound to rolling bed and chair
 2017-11-17 04:52:22 +00:00
deathride58andGitHub 792f16ebd6 Merge pull request #3969 from Citadel-Station-13/upstream-merge-32622 
[MIRROR] Fix conflicts between helmet/mech HUDs and HUD glasses
 2017-11-17 04:49:10 +00:00
deathride58andGitHub 9057436da3 Update odysseus.dm 2017-11-16 23:32:17 -05:00
deathride58andGitHub 8f8193d0f6 Update Operating.dm 2017-11-16 21:10:06 -05:00
deathride58andGitHub 8fcf4dde02 Merge pull request #3975 from Citadel-Station-13/upstream-merge-32783 
[MIRROR] Prevents proximity sensors from beeping when unarmed.
 2017-11-17 02:06:31 +00:00
deathride58andGitHub 886ad3d7a1 Merge pull request #3968 from Citadel-Station-13/upstream-merge-32744 
[MIRROR] Fixes changeling egg when slug destroyed
 2017-11-17 02:05:08 +00:00