shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,052 Commits 5 Branches 0 Tags
1a87aa1b33e790d82d3eb8e345b37048d0ab827f
Commit Graph
17052 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub 1a87aa1b33 Merge pull request #6890 from Citadel-Station-13/upstream-merge-38052 
[MIRROR] Fixes accidental empty ahelp replies
 2018-05-25 22:51:51 -05:00
CitadelStationBot 2e1a50a4ed Automatic changelog generation for PR #6889 [ci skip] 2018-05-25 22:50:42 -05:00
LetterJayandGitHub d4d8c89fea Merge pull request #6889 from Citadel-Station-13/upstream-merge-38019 
[MIRROR] Fixes drones being able to magically sense invisible revenants
 2018-05-25 22:50:40 -05:00
CitadelStationBot 09bc3a047b Automatic changelog generation for PR #6888 [ci skip] 2018-05-25 22:50:27 -05:00
LetterJayandGitHub 25bd4a2d55 Merge pull request #6888 from Citadel-Station-13/upstream-merge-38017 
[MIRROR] Disallow effects from being scanned by the chameleon projector
 2018-05-25 22:50:25 -05:00
CitadelStationBot 0d856ec3ce Automatic changelog generation for PR #6887 [ci skip] 2018-05-25 22:50:13 -05:00
LetterJayandGitHub 79584bd08a Merge pull request #6887 from Citadel-Station-13/upstream-merge-37971 
[MIRROR] Fix template preview being invisible on space turfs
 2018-05-25 22:50:11 -05:00
CitadelStationBot f985fa633c Automatic changelog generation for PR #6886 [ci skip] 2018-05-25 21:41:25 -05:00
LetterJayandGitHub 9740bb86f6 Merge pull request #6886 from Citadel-Station-13/upstream-merge-37946 
[MIRROR] Small QoL improvement on smartfridge item release
 2018-05-25 21:41:23 -05:00
LetterJayandGitHub 0c422d7267 Merge pull request #6908 from Citadel-Station-13/nullentry 
Removes VR SLEEPER entry from Biotech Node
 2018-05-25 20:51:46 -05:00
LetterJay 8c77b2d700 vr sleeper removal 2018-05-25 17:35:06 -05:00
letterjay b6a03872df Fixes accidental empty ahelp replies 2018-05-25 09:36:23 -05:00
Dax Dupontandletterjay 6ecadf6d93 Fixes accidental empty ahelp replies (#38052) 2018-05-25 09:36:23 -05:00
letterjay 517503f24e Fixes drones being able to magically sense invisible revenants 2018-05-25 08:08:58 -05:00
vuonojenmustaturskaandletterjay 10327267bb Fixes drones being able to magically sense invisible revenants (#38019) 
* revfix

* Update revenant.dm
 2018-05-25 08:08:57 -05:00
letterjay 1d2f5f6a8f Disallow effects from being scanned by the chameleon projector 2018-05-25 07:38:02 -05:00
vuonojenmustaturskaandletterjay 1d1dc1aca8 Disallow effects from being scanned by the chameleon projector (#38017) 
* henk

* iseffect
 2018-05-25 07:38:01 -05:00
letterjay f221490f7e Fix template preview being invisible on space turfs 2018-05-25 07:35:31 -05:00
Tad Hardestyandletterjay f41df8a925 Fix template preview being invisible on space turfs (#37971) 2018-05-25 07:35:31 -05:00
letterjay d74a9fedb3 Small QoL improvement on smartfridge item release 2018-05-25 04:51:15 -05:00
yoriiandletterjay 01de74c83c Small QoL improvement on smartfridge item release (#37946) 
* item goes to hand

* this will compile

* Ugly hack give me a medal if this compiles.

* This one is real ugly now, speedmerge please
 2018-05-25 04:51:15 -05:00
CitadelStationBot cc088d9113 Automatic changelog generation for PR #6866 [ci skip] 2018-05-25 02:37:41 -05:00
LetterJayandGitHub 2d52fed76d Merge pull request #6866 from Citadel-Station-13/upstream-merge-37994 
[MIRROR] Adds a sprite for the "quit vr" action button[cast ur mf votes inside]
 2018-05-25 02:37:39 -05:00
CitadelStationBot 34bf101429 Automatic changelog generation for PR #6865 [ci skip] 2018-05-25 02:37:20 -05:00
LetterJayandGitHub 273e2aa13d Merge pull request #6865 from Citadel-Station-13/upstream-merge-38000 
[MIRROR] Removes a couple thousand empty lists
 2018-05-25 02:37:18 -05:00
LetterJayandGitHub 567118067f Merge pull request #6864 from Citadel-Station-13/upstream-merge-37999 
[MIRROR] Fixes reactive repulse armour not throwing people
 2018-05-25 02:36:49 -05:00
CitadelStationBot 098e0f8a38 Automatic changelog generation for PR #6863 [ci skip] 2018-05-25 02:36:21 -05:00
LetterJayandGitHub ac8640c9b5 Merge pull request #6863 from Citadel-Station-13/upstream-merge-38004 
[MIRROR] Fixes mimery blockade showing up under spell tab
 2018-05-25 02:36:19 -05:00
LetterJayandGitHub 6750abeb9e Merge pull request #6862 from Citadel-Station-13/upstream-merge-38020 
[MIRROR] Fix outdated R&D console comment
 2018-05-25 02:35:58 -05:00
CitadelStationBot c8f5fbd14f Automatic changelog generation for PR #6857 [ci skip] 2018-05-25 02:35:45 -05:00
LetterJayandGitHub 2908431bac Merge pull request #6857 from Citadel-Station-13/upstream-merge-37951 
[MIRROR] adds logging to mayhem bottle and blood frenzy
 2018-05-25 02:35:43 -05:00
CitadelStationBotandkevinz000 37f2768380 [MIRROR] Adds a missing + in techwebs point adjustment code (#6845) 
* Adds a missing + in techwebs point adjustment code

* Update _techweb.dm
 2018-05-24 20:55:23 -07:00
LetterJayandGitHub b89254ced7 Merge pull request #6807 from Citadel-Station-13/upstream-merge-37448 
[MIRROR] [READY]Refactors techwebs to have different types of points - PR HAS NO GAMEPLAY IMPACT
 2018-05-24 11:58:57 -05:00
LetterJayandGitHub d19ecc5a4f Update magweapon.dm 2018-05-24 11:21:33 -05:00
LetterJayandGitHub e79113faca Update all_nodes.dm 2018-05-24 11:21:04 -05:00
CitadelStationBot 8860b57b33 Automatic changelog generation for PR #6748 [ci skip] 2018-05-24 01:00:19 -05:00
LetterJayandGitHub cefa34ba48 Merge pull request #6748 from deathride58/poojgoneplzrevert 
Emag QoL and addition of emag recharge devices
 2018-05-24 01:00:17 -05:00
deathride58andGitHub 99d78cb07a Merge branch 'master' into poojgoneplzrevert 2018-05-24 03:28:39 +00:00
CitadelStationBot 3deb3f4fa1 Automatic changelog generation for PR #6620 [ci skip] 2018-05-23 22:26:46 -05:00
LetterJayandGitHub 9ff3e78bbb Merge pull request #6620 from Citadel-Station-13/upstream-merge-37598 
[MIRROR] Adds grenadine.
 2018-05-23 22:26:44 -05:00
LetterJayandGitHub 63a857901f Merge pull request #6642 from Citadel-Station-13/upstream-merge-37623 
[MIRROR] Some dbadmin fixes
 2018-05-23 22:26:22 -05:00
letterjay 4e8e7eb1d2 Adds a sprite for the "quit vr" action button[cast ur mf votes inside] 2018-05-23 21:18:54 -05:00
MrDoomBringerandletterjay 1a40822f17 Adds a sprite for the "quit vr" action button (#37994) 
* is that a motherfucking 90s reference

* WHEN YA FUCK UP BADLY ENOUGH ON ADDING A SPRITE TGHAT YA GOTTA MANUALLY CHANGE CHANGELOG.HTML
 2018-05-23 21:18:54 -05:00
letterjay 1e7e682d0b Removes a couple thousand empty lists 2018-05-23 21:15:41 -05:00
vuonojenmustaturskaandletterjay 36b3cbe4bf Removes a couple thousand empty lists (#38000) 
door.shockedby
 2018-05-23 21:15:41 -05:00
letterjay fe24ef6bab Fixes reactive repulse armour not throwing people 2018-05-23 21:00:10 -05:00
KorPhaeronandletterjay 64ead10924 Fixes reactive repulse armour (#37999) 2018-05-23 21:00:10 -05:00
letterjay 5c8b1025c5 Fixes mimery blockade showing up under spell tab 2018-05-23 19:44:16 -05:00
AlexTheSysop42andletterjay 14de47bd4b Fixes mimery blockade showing up under spell tab (#38004) 2018-05-23 19:44:16 -05:00
letterjay eac0c0cd68 Fix outdated R&D console comment 2018-05-23 16:12:05 -05:00