shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,005 Commits 5 Branches 0 Tags
edce62494de0b0060328aec6763967ead7b43af1
Commit Graph
231 Commits
Author SHA1 Message Date
LeoandCitadelStationBot 060d43768e Merge pull request #31836 from AnturK/pdalogfix 
Fixes recipient in pda logs
 2017-10-18 07:23:12 -05:00
Jordan BrownandCitadelStationBot f205911b5a Adds defines for organ slots 2017-10-15 19:34:42 -05:00
LetterJayandGitHub 45619b0e1b Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601 
[MIRROR] Fix many instances of "the the"
 2017-10-14 15:37:00 -04:00
LetterJayandGitHub 0397bd57c1 Merge pull request #3377 from Citadel-Station-13/upstream-merge-31604 
[MIRROR] Adds Toggle Underline button to PDA menu
 2017-10-14 10:21:19 -04:00
LetterJayandGitHub d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
AlecWandCitadelStationBot 482e61a57e Adds Toggle Underline button to PDA menu (#31604) 
* Add Toggle Underline button to PDA.dm

-Adds Toggle Underline button to PDA menu that, when pressed, applies underline styling to all <a> elements.

* Changed 1/0 to bools

Now using TRUE and FALSE, also cleaned some HTML I missed the first time
 2017-10-13 16:51:44 -05:00
Jordan BrownandCitadelStationBot bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Emmett GainesandCitadelStationBot 55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
duncathan saltandCitadelStationBot c0e9cde5c2 Minor refactor of how gas IDs are handled 2017-10-12 00:30:09 -05:00
Tad HardestyandCitadelStationBot 01ecdff51a Improve extended examination text for many objects (#31381) 
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
 2017-10-10 03:07:38 -05:00
Kevak fb60efeacb Fixes shock collars getting stuck in pockets. 2017-10-09 22:45:02 -07:00
kevinz000andCitadelStationBot af077de46c TTV code cleanup (#31262) 
* Update transfer_valve.dm

* Update transfer_valve.dm

* Update transfer_valve.dm

* Update transfer_valve.dm

* Update transfer_valve.dm
 2017-10-08 01:04:52 -05:00
deathride58 39d3897b29 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-06 09:39:20 -04:00
Supermichael777andCitadelStationBot 63aa1c7153 Makes the pda font a prefernce 2017-10-04 19:28:57 -05:00
deathride58 5cefa71992 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-10-04 20:18:03 -04:00
LetterJayandGitHub 719b433ede Merge pull request #3108 from Citadel-Station-13/upstream-merge-31179 
[MIRROR] Adds the advanced medical scanner, gives one to the CMO
 2017-10-04 02:14:07 -04:00
XDTMandCitadelStationBot 1782fbeed7 Adds the advanced medical scanner, gives one to the CMO 2017-10-03 18:16:29 -05:00
Kevak ba99e3845a Added normal collar functionality. 
You can now name your victim's collars on top of other functionality.
 2017-10-03 12:12:52 -07:00
Kevak f4ce4a3a27 Shock Collars Are Now A Thing. 
Exactly what it says on the tin.
 2017-10-03 08:03:03 -07:00
deathride58andGitHub 8e65f4fb23 Merge branch 'master' into crewobjectivesandmiscreants 2017-10-01 23:45:49 +00:00
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
deathride58 9bdc80ba82 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-09-27 23:44:22 -04: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
deathride58andGitHub c4e3b778b3 Merge branch 'master' into crewobjectivesandmiscreants 2017-09-17 02:26:07 +00: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