shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,103 Commits 5 Branches 0 Tags
5fdeb55876dd7158522e303bde60ba7dae06f6d3
Commit Graph
158 Commits
Author SHA1 Message Date
bawhoppenandCitadelStationBot 82981339ed Adds desc to things lacking them. 2017-10-01 15:07:37 -05:00
LetterJayandGitHub 47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
LetterJayandGitHub f1858a3a63 Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988 
[MIRROR] Alt-clicking descriptions when examining
 2017-09-30 12:57:52 -04:00
nicbnandCitadelStationBot 078128aa91 Paper markdown (#30873) 
* why it doesn't work

* list thing

* oops

* fixes list. maybe

* Less regex

* wip

* Done I think. I think

* return your functions

* Replace $10 by $a
 2017-09-30 08:11:01 -05:00
LetterJayandGitHub 595f2cb08f Merge pull request #2983 from Citadel-Station-13/upstream-merge-30985 
[MIRROR] Fixes frozen PDAs in the game logs
 2017-09-29 01:39:50 -04:00
LetterJayandGitHub 4af02dff06 Merge pull request #2984 from Citadel-Station-13/upstream-merge-30613 
[MIRROR] Applying PDA overhaul Upstream
 2017-09-29 01:39:28 -04:00
ShizCalevandCitadelStationBot 9da41c3596 Stops revheads from being metagamed with healthscanners & medical HUDs. (#31110) 
* Stops revheads metagaming

* Added comment.
 2017-09-28 22:00:16 -05:00
kingofkosmosandCitadelStationBot f0c684c15e Alt-clicking descriptions when examining 2017-09-28 21:51:53 -05:00
TungstenandCitadelStationBot c6c6f67d03 Applying PDA overhaul Upstream (#30613) 
* Applying PDA overhaul Upstream

Yeet?

* Used lordpidey's change

Like this?

* The build failed so I'm changing it back

* Update PDA.dm

* Update PDA.dm

* Make the settings visible only on the main screen

mode 0 is the hub, and the hub is the main menu. I think it'd be a lot more convenient for players to always have these options on the main menu if they need them. Makes it really easy to swap colors and fonts at the beginning of the round. I can put it in a settings menu if everyone really thinks it's necessary, but then someone would have to help me actually make the damn icons show up.

* Update PDA.dm

* Update PDA.dm

* Wait, I'm an idiot. I was editing the wrong thing.

* Here's your switch statements boi

* Declare font_index at the "Toggle_Font" code

I declared it exactly where it's relevant, but I think this looks unclean. I also redefined it which I actually needed to do.

* Replaced it where it was

cuz the build broke

* Make the color changer a picker instead of a field

An attempt

* Made these defines

@optimumtact @Cyberboss Like this?
 2017-09-28 21:43:32 -05:00
orangesandCitadelStationBot 367fcc9974 Merge pull request #30985 from tgstation/Cyberboss-patch-5 
Fixes frozen PDAs in the game logs
 2017-09-28 21:42:20 -05:00
LetterJayandGitHub d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969 
[MIRROR] DisplayTimeText mk2
 2017-09-27 23:39:03 -04:00
Ashe HiggsandCitadelStationBot e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
Jordan BrownandCitadelStationBot 0a43bddaa1 Merge pull request #30863 from pubby/bluepipe 
Bluespace pipes
 2017-09-25 12:28:14 -05:00
LetterJayandGitHub d8736482fd Update transfer_valve.dm 2017-09-25 11:55:09 -05:00
ShizCalevandCitadelStationBot 169aa85d9c DisplayTimeText mk2 2017-09-24 18:59:57 -05:00
orangesandCitadelStationBot 6278d49662 Href tokens 2017-09-24 17:34:37 -05:00
CitadelStationBotandPoojawa a286d0c313 [MIRROR] Gives engineering cyborgs an item they can use in place of circuits for basic construction (#2875) 
* Gives engineering cyborgs an item they can use in place of circuits for basic construction

* fixes
 2017-09-22 23:35:54 -05:00
CitadelStationBotandPoojawa 2a860d1954 [MIRROR] More Initialize() fixes, requires someone to test with DB (#2857) 
* More Initialize() fixes, requires someone to test with DB

* fucking mirror failure
 2017-09-22 23:35:22 -05:00
CitadelStationBotandPoojawa d8a1fc936e [MIRROR] Stops AIs from taking actions while depowered (#2813) 
* Stops AIs from taking actions while depowered

* Update ai.dm
 2017-09-18 01:45:59 -05:00
CitadelStationBotandPoojawa d96f3f40a5 [MIRROR] PDA game log entry contains ckey (#2808) 
* PDA game log entry contains ckey

* PDA game log entry contains ckey
 2017-09-17 11:58:11 -05:00
CitadelStationBotandPoojawa e4af04823a [MIRROR] Fix pressure plate spam (#2775) 
* Fix pressure plate spam (#30736)

* Fix pressure plate spam

* Not everything has feet

* Pressure plates . = ..()

* Fix pressure plate spam
 2017-09-16 04:35:45 -05:00
CitadelStationBotandPoojawa e4db027692 [MIRROR] Fixes to more Initialize procs (#2733) 
* Fixes to more Initialize procs

* Update ai_monitored.dm

* Update cleanable.dm

* Update instruments.dm

* Update musician.dm

* Update noticeboard.dm

* Update mimic.dm

* Update interactive.dm
 2017-09-13 22:54:12 -05:00
CitadelStationBotandPoojawa 083fc1a7b4 [MIRROR] Standardized power displays (#2539) 
* Standardized power displays

* Update tgui.js

* Delete tgui.js.rej
 2017-09-13 17:57:16 -05:00
LetterJayandGitHub cd0997aa1e Merge branch 'master' into upstream-merge-30297 2017-09-12 23:36:35 -05:00
LetterJayandGitHub c0a467c2fc Merge pull request #2709 from Citadel-Station-13/upstream-merge-30415 
[MIRROR] Nightmare
 2017-09-12 23:31:38 -05:00
LetterJayandGitHub 4ee17d5167 Merge pull request #2698 from Citadel-Station-13/upstream-merge-30583 
[MIRROR] Fixes initialize hints for a fair number of mobs and items
 2017-09-12 23:31:28 -05:00
LetterJayandGitHub 3ff2263a33 Update taperecorder.dm 2017-09-12 03:22:47 -05:00
LetterJayandGitHub 59319b6bea Update taperecorder.dm 2017-09-12 03:04:56 -05:00
LetterJayandGitHub dac6cc56e4 Merge branch 'master' into upstream-merge-30494 2017-09-12 02:40:24 -05:00
LetterJayandGitHub 1d19ee6bbf Merge pull request #2566 from Citadel-Station-13/upstream-merge-30117 
[MIRROR] Crew monitoring rework part 1: crew pinpointers
 2017-09-11 22:41:24 -05:00
LetterJayandGitHub e2f9ec4f18 Merge pull request #2686 from Citadel-Station-13/upstream-merge-30538 
[MIRROR] Uplink lock codes now pick from the phonetic alphabet global list
 2017-09-11 18:54:53 -05:00
LetterJayandGitHub 16c7706618 Merge branch 'master' into upstream-merge-30117 2017-09-11 18:10:15 -05:00
KorPhaeronandCitadelStationBot 4d2fe460ed Nightmare 2017-09-11 16:23:47 -05:00
LetterJayandGitHub c46c442896 Merge pull request #2635 from Citadel-Station-13/upstream-merge-30454 
[MIRROR] Gets rid of manual overlay manipulation
 2017-09-11 15:21:43 -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
vuonojenmustaturskaandCitadelStationBot 053b283745 Fixes initialize hints for a fair number of mobs and items 2017-09-11 12:20:19 -05:00
kingofkosmosandCitadelStationBot 63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
LeoandCitadelStationBot 44e62d8016 Uplink lock codes now pick from the phonetic alphabet global list (#30538) 
* Uplink lock codes now pick from the phonetic alphabet global list

* Update virus_cart.dm
 2017-09-10 14:17:16 -05:00
LetterJayandGitHub 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
tortellinitonyandCitadelStationBot d73b82cf11 Gets rid of manual overlay manipulation 2017-09-06 23:39:08 -05:00
LetterJayandGitHub 24a7aa5a9f Merge branch 'master' into upstream-merge-30079 2017-09-06 09:24:23 -05:00
LetterJayandGitHub cf46abecb3 Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004 
[MIRROR] Moved emagged var to obj/item parent.
 2017-09-06 09:15:11 -05:00
CitadelStationBot 50b88388da Crew monitoring rework part 1: crew pinpointers 2017-08-30 17:03:20 -05:00
CitadelStationBot 6f013d3d47 Stealth Option for RadioactiveMicro 2017-08-29 17:05:32 -05:00
kevinz000 f45f5bbf3d quadruple wew 2017-08-29 10:02:18 -07:00
kevinz000 5591afc9ce double wew 2017-08-29 09:53:11 -07:00
CitadelStationBot 18904f2f0f Maintains that weird entire-tcomms-setup-in-one-machine thing 2017-08-26 11:08:01 -05:00
kevinz000andGitHub c638386507 Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460) 
* fuck pubby

* fuck you too ceres

* ree

* this is going to be a disaster isn't it

* disaster

* dme

* -_-

* tg

* woops

* proper sync

* Welcome to conflict hell.

* lets hope this fixes more things than it breaks

* gdi

* goddamnit
 2017-08-24 21:07:58 -07:00
LetterJayandkevinz000 188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00