shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,099 Commits 5 Branches 0 Tags
482e61a57e141ae2e74c1220b74611ed24ed3cf7
Commit Graph
4979 Commits
Author SHA1 Message Date
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
LetterJayandGitHub b9c07e7f66 Merge pull request #3363 from Citadel-Station-13/upstream-merge-31607 
[MIRROR] Fixes preferences generation
 2017-10-13 11:24:46 -04:00
kevinz000andCitadelStationBot c84a270403 Fixes preferences generation (#31607) 2017-10-13 09:16:03 -05:00
Jordan BrownandCitadelStationBot 9d448fda76 Merge pull request #31602 from AnturK/tunnels 
Fixes diagonal tunnels
 2017-10-13 09:14:34 -05:00
LetterJayandGitHub 692e226d24 Merge pull request #3346 from Citadel-Station-13/upstream-merge-31621 
[MIRROR] Add require_comms_key = TRUE to some topic that need it
 2017-10-13 08:58:00 -04:00
LetterJayandGitHub 09d929e9ca Merge branch 'master' into upstream-merge-31643 2017-10-13 07:59:09 -04:00
LetterJayandGitHub 58b8a02802 Update gas_mixture.dm 2017-10-13 02:59:04 -05:00
LetterJayandGitHub 2e8b198d9a Merge branch 'master' into upstream-merge-31621 2017-10-13 03:58:03 -04:00
LetterJayandGitHub b08f278127 Merge pull request #3320 from Citadel-Station-13/upstream-merge-31580 
[MIRROR] Fixes init times
 2017-10-13 02:02:16 -04:00
LetterJayandGitHub 5b292cebb3 Merge pull request #3344 from Citadel-Station-13/upstream-merge-31581 
[MIRROR] Fixes space transition (again)
 2017-10-13 02:02:04 -04:00
LetterJayandGitHub 6f9d1893ca Merge pull request #3342 from Citadel-Station-13/upstream-merge-31396 
[MIRROR] Adds tick check to ore boxes
 2017-10-13 02:01:52 -04:00
LetterJayandGitHub fb444f173a Merge pull request #3351 from Citadel-Station-13/upstream-merge-31582 
[MIRROR] Notify admins when someone activates a smoke machine
 2017-10-13 02:00:46 -04:00
LetterJayandGitHub 51f5d5423c Merge pull request #3358 from Citadel-Station-13/upstream-merge-31502 
[MIRROR] Adds a fireball from the heavens as an admin smite
 2017-10-13 00:21:01 -04:00
LetterJayandGitHub f488fa3ac3 Merge pull request #3356 from Citadel-Station-13/upstream-merge-31565 
[MIRROR] Stargazers are now station-restricted, and cogged APCs are now quiet
 2017-10-13 00:20:54 -04:00
LetterJayandGitHub f4852314dd Merge pull request #3353 from Citadel-Station-13/upstream-merge-31588 
[MIRROR] Fixes stationary mob parallax
 2017-10-13 00:20:46 -04:00
LetterJayandGitHub b43a207390 Merge pull request #3349 from Citadel-Station-13/upstream-merge-31586 
[MIRROR] Fixes canisters breaking multiple times
 2017-10-13 00:20:38 -04:00
LetterJayandGitHub 116f06f428 Merge pull request #3348 from Citadel-Station-13/upstream-merge-31579 
[MIRROR] Fixes foam darts on cardboard cutouts and shooting range targets
 2017-10-13 00:07:14 -04:00
LetterJayandGitHub ea7b3d101d Merge pull request #3347 from Citadel-Station-13/upstream-merge-31585 
[MIRROR] Fixes empty light fixtures showing as working lights in DM
 2017-10-13 00:06:06 -04:00
LetterJayandGitHub 31914b7723 Merge pull request #3341 from Citadel-Station-13/upstream-merge-31549 
[MIRROR] Fixes plastic explosive issues
 2017-10-13 00:04:47 -04:00
LetterJayandGitHub b0f1ecda37 Merge pull request #3336 from Citadel-Station-13/upstream-merge-31569 
[MIRROR] Fixes conveyor belt layering
 2017-10-12 23:55:05 -04:00
LetterJayandGitHub f072cac695 Merge pull request #3335 from Citadel-Station-13/upstream-merge-31618 
[MIRROR] Fixes topic key validation
 2017-10-12 23:54:03 -04:00
LetterJayandGitHub 69d27f7231 Merge pull request #3334 from Citadel-Station-13/upstream-merge-31619 
[MIRROR] Fixes adminwho having namecheck as a keyword
 2017-10-12 23:50:00 -04:00
LetterJayandGitHub aaa76a47f5 Merge pull request #3333 from Citadel-Station-13/upstream-merge-31617 
[MIRROR] Fixes topic handlers
 2017-10-12 23:49:26 -04:00
LetterJayandGitHub 25396db2df Merge pull request #3332 from Citadel-Station-13/upstream-merge-31605 
[MIRROR] Fixes cryo
 2017-10-12 23:45:42 -04:00
LetterJayandGitHub d02dcb496e Merge pull request #3331 from Citadel-Station-13/upstream-merge-31542 
[MIRROR] makes vacuums "cold", sort of
 2017-10-12 23:40:55 -04:00
LetterJayandGitHub 0263f44791 Merge pull request #3330 from Citadel-Station-13/upstream-merge-31554 
[MIRROR] Fix lavaland turfs looking awkward to AIs
 2017-10-12 23:38:00 -04:00
LetterJayandGitHub 3ee44b45f9 Merge pull request #3329 from Citadel-Station-13/upstream-merge-31556 
[MIRROR] Fixes client vv not working.
 2017-10-12 23:27:54 -04:00
LetterJayandGitHub b1232af6f5 Merge pull request #3327 from Citadel-Station-13/upstream-merge-31610 
[MIRROR] Fix world/Topic calling the wrong handler proc
 2017-10-12 23:25:34 -04:00
ArmhulenandCitadelStationBot 49d5d08456 Adds a fireball from the heavens as an admin smite (#31502) 
* really gamers?

* yeah yeah YEAH

* cucked again!

* it works

* I SAID IT WORKS
 2017-10-12 20:37:58 -05:00
Jordan BrownandCitadelStationBot 14dcd3aee5 Activates global warming 2017-10-12 20:04:15 -05:00
Ashe HiggsandCitadelStationBot f9436e53c4 Stargazers are now station-restricted, and cogged APCs are now quiet (#31565) 
* Clockwork power generator tweaks

* Includes a blob_allowed check
 2017-10-12 18:32:37 -05:00
Jordan BrownandCitadelStationBot 7ef36802ff Merge pull request #31588 from ninjanomnom/shuttle-parallax 
Fixes stationary mob parallax
 2017-10-12 16:07:12 -05:00
Jordan BrownandCitadelStationBot ca4907b881 Merge pull request #31582 from feemjmeem/smoke-log-announcing 
Notify admins when someone activates a smoke machine
 2017-10-12 16:03:50 -05:00
YPOQandCitadelStationBot 848016ab15 Fixes canisters breaking multiple times (#31586) 2017-10-12 15:48:17 -05:00
vuonojenmustaturskaandCitadelStationBot 12ef284e68 Fixes foam darts on cardboard cutouts and shooting range targets (#31579) 2017-10-12 15:46:05 -05:00
Jordan BrownandCitadelStationBot 572f3b8905 Merge pull request #31585 from ShizCalev/empty-light-editor-fix 
Fixes empty light fixtures showing as working lights in DM
 2017-10-12 15:27:37 -05:00
Jordan BrownandCitadelStationBot 13bffff94b Add require_comms_key = TRUE to some topic that need it 2017-10-12 13:23:35 -05:00
AnturKandCitadelStationBot 6221aed70c Fixes space transition (again) 2017-10-12 12:42:38 -05:00
kevinz000andCitadelStationBot 46c9ddb81c Adds tick check to ore boxes (#31396) 
* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm

* Update satchel_ore_boxdm.dm
 2017-10-12 12:39:18 -05:00
ShizCalevandCitadelStationBot 4fe003af83 Fixes plastic explosive issues (#31549) 2017-10-12 12:38:08 -05:00
ShizCalevandCitadelStationBot f696ada7c8 Fixes conveyor belt layering (#31569) 2017-10-12 12:34:19 -05:00
Jordan BrownandCitadelStationBot 76654718f1 Fixes topic key validation 2017-10-12 12:23:00 -05:00
Jordan BrownandCitadelStationBot e595c2f2fc Fixes adminwho having namecheck as a keyword 2017-10-12 12:22:51 -05:00
Jordan BrownandCitadelStationBot 8ff51df06f Fixes topic handlers 2017-10-12 12:21:41 -05:00
Jordan BrownandCitadelStationBot 763bcc59ee Merge pull request #31605 from AnturK/cryofix 
Fixes cryo
 2017-10-12 11:56:09 -05:00
duncathan saltandCitadelStationBot 425915615b makes vacuums "cold", sort of (#31542) 2017-10-12 11:47:51 -05:00
LetterJayandGitHub 06061f0870 Merge pull request #3301 from Citadel-Station-13/upstream-merge-31530 
[MIRROR] Allows snoring while unconscious
 2017-10-12 12:37:03 -04:00
LetterJayandGitHub dc5aeb33e6 Merge pull request #3294 from Citadel-Station-13/upstream-merge-31475 
[MIRROR] Removes spawns from assembly code
 2017-10-12 12:36:53 -04:00
Tad HardestyandCitadelStationBot 00606b9303 Fix lavaland turfs looking awkward to AIs (#31554) 2017-10-12 10:40:38 -05:00
Kyle Spier-SwensonandCitadelStationBot 6c27182bec Fixes client vv not working. (#31556) 2017-10-12 10:39:28 -05:00