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

1832 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
69bf7e42cf Merge branch 'master' into upstream-merge-29288 2017-08-14 18:35:28 -05:00
LetterJay
822cddc718 Update Hallucination.dm 2017-08-14 08:55:45 -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
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
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
CitadelStationBot
2476d59be6 Makes the ahelp topic give the permissions warning 2017-08-14 06:54:44 -05:00
CitadelStationBot
726ffe1fdd Tweaks atmos canister lights. 2017-08-14 01:25:02 -05:00
CitadelStationBot
0e7b9a008e Ports a slightly edited version of Eris APC sprites 2017-08-13 17:54:27 -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
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
CitadelStationBot
dae3e121f2 critical priority roleplay grammatical patch (*surrender emote fix) 2017-08-13 01:28:16 -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
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
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
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
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
ktccd
d7ac827ea6 Testing Transition code, DO NOT MERGE YET!! 
As it says, do not merge until I confirm that it works.
 2017-08-11 21:59:35 +02:00
ktccd
62a7d4301f Refactored flavortext. 
Flavortext is now stored in DNA features and can thus be stolen by
changelings and restored by cloners/pods/etc.
Also added genitals_use_skintone to the random features proc, 'cause it
was missing (my bad, I was even newer at messing with DNA back then :S).
 2017-08-11 20:13:01 +02:00
CitadelStationBot
bd8289b29f Massively improves downloading/viewing logs. 2017-08-10 10:49:22 -05:00
LetterJay
805aa06807 adds bear tails/ears to humans as well 2017-08-09 11:23:09 -05:00
LetterJay
dc502b99a6 Merge pull request #2314 from Citadel-Station-13/upstream-merge-29753 
[MIRROR] Makes dummy humans queue instead of harddel
 2017-08-09 02:22:33 -05:00
LetterJay
05cbf7927a Merge pull request #2311 from Citadel-Station-13/upstream-merge-29775 
[MIRROR] Fixes repairing jumpsuits.
 2017-08-09 02:22:17 -05:00
LetterJay
7b371b02e3 Merge pull request #2306 from Citadel-Station-13/upstream-merge-29756 
[MIRROR] Oocky in icky descriptions
 2017-08-09 02:21:38 -05:00
LetterJay
9e0b151240 Merge pull request #2303 from Citadel-Station-13/upstream-merge-29768 
[MIRROR] Standardized CENTCOM spelling
 2017-08-09 02:20:26 -05:00
LetterJay
470b19b1c1 Merge pull request #2302 from Citadel-Station-13/upstream-merge-29769 
[MIRROR] fixes some initialize errors
 2017-08-09 02:20:14 -05:00
LetterJay
f9bf13a5d9 Merge pull request #2301 from Citadel-Station-13/bears 
adds bear ears and bear tail
 2017-08-09 02:19:56 -05:00
LetterJay
a43304a1e5 Merge pull request #2300 from Citadel-Station-13/upstream-merge-29748 
[MIRROR] Adds a Test Areas (Station Z) verb
 2017-08-09 02:19:47 -05:00
LetterJay
5651bb3497 Merge pull request #2299 from Citadel-Station-13/upstream-merge-29712 
[MIRROR] Laptops now have actual sprites for using the supermatter monitoring instead of defaulting to a generic one.
 2017-08-09 02:19:36 -05:00
CitadelStationBot
2004d399c9 Makes dummy humans queue instead of harddel 2017-08-08 22:26:10 -05:00
CitadelStationBot
764ebb2e5e Fixes the Hierophant not spawning its crusher trophy 2017-08-08 22:24:01 -05:00
CitadelStationBot
0a7a8fcf90 Fixes repairing jumpsuits. 2017-08-08 15:04:21 -05:00
CitadelStationBot
fcd1a2dc86 Oocky in icky descriptions 2017-08-08 09:05:58 -05:00
CitadelStationBot
cdbaf5c4e8 Standardized CENTCOM spelling 2017-08-08 09:05:44 -05:00
CitadelStationBot
b11bfa2d94 fixes some initialize errors 2017-08-08 09:05:39 -05:00
LetterJay
7b4cbf7784 adds bear ears and bear tail 2017-08-08 07:19:30 -05:00
CitadelStationBot
c2419e84f5 Adds a Test Areas (Station Z) verb 2017-08-08 05:50:22 -05:00
CitadelStationBot
d3b5f0aa6d Laptops now have actual sprites for using the supermatter monitoring instead of defaulting to a generic one. 2017-08-08 05:49:17 -05:00
ktccd
dad39bb1a4 Fixes displaying digestion alert for preys 
visible_message doesn't actually send anything to a dead mob, probably
because they can't hear.
Moved that it's own message piece instead. [0.5h testing memes]
 2017-08-08 10:22:04 +02:00
CitadelStationBot
fbabd14798 Fixes adminhelp sending the wrong message to players 2017-08-07 12:26:15 -05:00
LetterJay
41f42aabca Merge pull request #2292 from Citadel-Station-13/upstream-merge-29724 
[MIRROR] More Initialize() garbage
 2017-08-07 07:26:53 -05:00