shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,223 Commits 5 Branches 0 Tags
6d62d51eab9fc2bbfa3b2ddbaae2da8fa576f3a4
Commit Graph

3028 Commits

Author SHA1 Message Date
LetterJay
6d62d51eab Merge pull request #2198 from Citadel-Station-13/upstream-merge-29288 
[MIRROR] Hallucinations 3.0
 2017-08-14 18:45:45 -05:00
LetterJay
ce918273bc Merge pull request #2313 from Citadel-Station-13/upstream-merge-29779 
[MIRROR] Fixes the Hierophant not spawning its crusher trophy
 2017-08-14 18:45:28 -05:00
LetterJay
300fc768a5 Merge pull request #2265 from Citadel-Station-13/upstream-merge-29727 
[MIRROR] The inhands of the Dark Blessing chaplain weapon is now visible.
 2017-08-14 18:37:28 -05:00
LetterJay
1bb5e19596 Merge pull request #2255 from Citadel-Station-13/upstream-merge-29695 
[MIRROR] flora.dm initialize hint
 2017-08-14 18:36:58 -05:00
LetterJay
69bf7e42cf Merge branch 'master' into upstream-merge-29288 2017-08-14 18:35:28 -05:00
LetterJay
f088e812a9 Update flora.dm 2017-08-14 09:31:49 -05:00
CitadelStationBot
7faec45053 Tiny bit better splitting on add_details 2017-08-14 09:07:03 -05:00
LetterJay
f1872a8bae Merge pull request #2231 from Citadel-Station-13/upstream-merge-29615 
[MIRROR] Action buttons for spells now include their description
 2017-08-14 08:56:19 -05:00
LetterJay
822cddc718 Update Hallucination.dm 2017-08-14 08:55:45 -05:00
LetterJay
281ed6cb79 Merge pull request #2146 from Citadel-Station-13/upstream-merge-29464 
[MIRROR] Adds info about schema versioning to head of db changelog file
 2017-08-14 08:31:46 -05:00
LetterJay
80bb075eb3 Update Hallucination.dm.rej 2017-08-14 08:24:58 -05:00
LetterJay
fdfdd4fc21 Update admin_investigate.dm 2017-08-14 08:24:34 -05:00
LetterJay
4edf9880d6 Update logging.dm 2017-08-14 08:23:46 -05:00
LetterJay
cb861b28ca Merge pull request #2367 from Citadel-Station-13/upstream-merge-29841 
[MIRROR] Makes the ahelp topic give the permissions warning
 2017-08-14 08:21:38 -05:00
LetterJay
123454c45a Merge pull request #2366 from Citadel-Station-13/upstream-merge-29846 
[MIRROR] Makes mulligan antag check for gamemode required players
 2017-08-14 08:21:24 -05:00
LetterJay
7c6f9c4973 Merge pull request #2363 from Citadel-Station-13/upstream-merge-29867 
[MIRROR] Tweaks atmos canister lights.
 2017-08-14 08:20:57 -05:00
LetterJay
76da67e316 Merge pull request #2360 from Citadel-Station-13/upstream-merge-29828 
[MIRROR] Fixes turf slipping
 2017-08-14 08:20:27 -05:00
CitadelStationBot
2476d59be6 Makes the ahelp topic give the permissions warning 2017-08-14 06:54:44 -05:00
CitadelStationBot
e986657b16 Makes mulligan antag check for gamemode required players 2017-08-14 06:25:03 -05:00
CitadelStationBot
726ffe1fdd Tweaks atmos canister lights. 2017-08-14 01:25:02 -05:00
CitadelStationBot
e354c9f289 Fixes turf slipping 2017-08-13 18:00:36 -05:00
CitadelStationBot
0e7b9a008e Ports a slightly edited version of Eris APC sprites 2017-08-13 17:54:27 -05:00
LetterJay
64da23febb Merge pull request #2356 from Citadel-Station-13/upstream-merge-29840 
[MIRROR] Adds icon_states to the unused and used Eldritch whetstones
 2017-08-13 09:53:11 -05:00
LetterJay
3876ecab9e Merge pull request #2354 from Citadel-Station-13/upstream-merge-29853 
[MIRROR] critical priority roleplay grammatical patch (*surrender emote fix)
 2017-08-13 09:52:46 -05:00
LetterJay
248d151b90 Merge pull request #2351 from Citadel-Station-13/upstream-merge-29861 
[MIRROR] Fix fireaxe cabinets spawned with broken icons
 2017-08-13 09:52:14 -05:00
LetterJay
d3e8815788 Merge pull request #2350 from Citadel-Station-13/upstream-merge-29864 
[MIRROR] Fixes minebots missing action icons
 2017-08-13 09:51:45 -05:00
LetterJay
81dc5d2c09 Merge pull request #2349 from Citadel-Station-13/upstream-merge-29826 
[MIRROR] get_head_slots() now returns wear_neck
 2017-08-13 09:51:29 -05:00
LetterJay
47eb2e528f Merge pull request #2348 from Citadel-Station-13/upstream-merge-29843 
[MIRROR] Adds callback select system
 2017-08-13 09:51:17 -05:00
CitadelStationBot
1e3ea07d8b Adds icon_states to the unused and used Eldritch whetstones 2017-08-13 01:28:24 -05:00
CitadelStationBot
dae3e121f2 critical priority roleplay grammatical patch (*surrender emote fix) 2017-08-13 01:28:16 -05:00
CitadelStationBot
80f1fb8c58 Fix fireaxe cabinets spawned with broken icons 2017-08-13 01:28:03 -05:00
CitadelStationBot
714fc5ed4a Fixes minebots missing action icons 2017-08-13 01:27:58 -05:00
CitadelStationBot
3f562c113c get_head_slots() now returns wear_neck 2017-08-13 01:27:54 -05:00
CitadelStationBot
e972a90ba9 Adds callback select system 2017-08-13 01:27:51 -05:00
CitadelStationBot
6cb9a0088f Fixes admin mass deleting... not actually mass deleting... 2017-08-13 01:26:39 -05:00
LetterJay
f615bc0dff Merge pull request #2342 from Citadel-Station-13/bear-fix 
Bear ears/tails fix
 2017-08-12 07:05:38 -05:00
LetterJay
a9a7807473 Merge pull request #2339 from Citadel-Station-13/upstream-merge-29819 
[MIRROR] His Grace now shows up on the orbit list
 2017-08-12 06:36:57 -05:00
LetterJay
dd6c9d6a04 Merge pull request #2334 from Citadel-Station-13/upstream-merge-29811 
[MIRROR] Fixes cable cuff inhand
 2017-08-12 06:36:15 -05:00
LetterJay
c00f0a99f0 Merge pull request #2335 from ktccd/Flavor-elevator 
Refactored flavortext to be savable in DNA. (RIP old changeling-meta-hunting)
 2017-08-12 06:35:45 -05:00
LetterJay
122727059b Merge pull request #2333 from Citadel-Station-13/upstream-merge-29804 
[MIRROR] Ports weaponry to Initialize
 2017-08-12 06:35:25 -05:00
LetterJay
c174eb3f5d Merge pull request #2331 from Citadel-Station-13/upstream-merge-29803 
[MIRROR] Ports weapons to Initialize()
 2017-08-12 06:35:09 -05:00
LetterJay
8ca2a8d3bd Merge pull request #2330 from Citadel-Station-13/upstream-merge-29799 
[MIRROR] Fixes help text for embedded objects
 2017-08-12 06:34:56 -05:00
LetterJay
1520c4facd Merge pull request #2327 from Citadel-Station-13/upstream-merge-29800 
[MIRROR] Massively improves downloading/viewing logs.
 2017-08-12 06:34:41 -05:00
LetterJay
6b6e5d0018 Merge pull request #2326 from Citadel-Station-13/upstream-merge-29805 
[MIRROR] decapitalizes flyswatter in weaponry.dm
 2017-08-12 06:34:28 -05:00
LetterJay
e783997250 Merge pull request #2295 from Citadel-Station-13/upstream-merge-29742 
[MIRROR] GM completion check and mulligan now check to see if players are logged out
 2017-08-12 06:33:44 -05:00
LetterJay
962d983079 Merge pull request #2294 from Citadel-Station-13/upstream-merge-29746 
[MIRROR] Fixes adminhelp sending the wrong message to players
 2017-08-12 06:33:29 -05:00
LetterJay
73426d56ea file path fix 2017-08-12 06:31:50 -05:00
Poojawa
5a7126a0dd Panic Bunker for moderator/trialmin access 2017-08-12 01:15:42 -05:00
ktccd
4188db53a5 Flavortext transition finished 
Now properly moves OLD flavortext to the new format and then removes the
old format.
If no old format is found, it defaults to loading the new format.
Flavortext is now stored in your DNA, and is loaded into your characters
flavor_text variable upon creating the character or messing with the
DNA.
This allows cloners/pods/changelings to use the correct flavortext.
 2017-08-11 23:48:46 +02:00
ktccd
1b2f2120ec DO NOT MERGE - Fixes random resetting of file 
I did a bad with the direction of >> and <<. My bad.
Fixed now, I will test FURTHER to confirm that old files are not deleted
or ruined.
 2017-08-11 23:10:05 +02:00