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 |
|
LetterJay
|
0553cf121f
|
Merge pull request #2369 from Citadel-Station-13/upstream-merge-29655
[MIRROR] Tiny bit better splitting on add_details
|
2017-08-14 09:20:27 -05:00 |
|
CitadelStationBot
|
7faec45053
|
Tiny bit better splitting on add_details
|
2017-08-14 09:07:03 -05:00 |
|
CitadelStationBot
|
d58b2f7af3
|
Automatic changelog generation for PR #2231 [ci skip]
|
2017-08-14 08:56:20 -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
|
bc3e5419f2
|
Merge pull request #2368 from Citadel-Station-13/revert-2346-upstream-merge-29813
Revert "[MIRROR] The wiki button now asks what page you want to be taken to"
|
2017-08-14 08:33:23 -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 |
|
CitadelStationBot
|
77ce8f8031
|
Automatic changelog generation for PR #2363 [ci skip]
|
2017-08-14 08:20:58 -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
|
b2f93c506b
|
Automatic changelog generation for PR #2359 [ci skip]
|
2017-08-14 08:20:10 -05:00 |
|
LetterJay
|
0b923ace24
|
Merge pull request #2359 from Citadel-Station-13/upstream-merge-29809
[MIRROR] Ports a slightly edited version of Eris APC sprites
|
2017-08-14 08:20:09 -05:00 |
|
LetterJay
|
c73e58d587
|
Revert "[MIRROR] The wiki button now asks what page you want to be taken to"
|
2017-08-14 08:19: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 |
|
CitadelStationBot
|
6d72705ff5
|
Automatic changelog generation for PR #2356 [ci skip]
|
2017-08-13 09:53:12 -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
|
5db9c632c3
|
Merge pull request #2353 from Citadel-Station-13/upstream-merge-29855
[MIRROR] Cleaned up stacked pipes
|
2017-08-13 09:52:32 -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 |
|
CitadelStationBot
|
be46c419e2
|
Automatic changelog generation for PR #2350 [ci skip]
|
2017-08-13 09:51:47 -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
|
f257b44a19
|
Automatic changelog generation for PR #2346 [ci skip]
|
2017-08-13 09:49:43 -05:00 |
|
LetterJay
|
0eddd2f58d
|
Merge pull request #2346 from Citadel-Station-13/upstream-merge-29813
[MIRROR] The wiki button now asks what page you want to be taken to
|
2017-08-13 09:49:41 -05:00 |
|
LetterJay
|
8bdc12f916
|
Merge pull request #2345 from Citadel-Station-13/upstream-merge-29816
[MIRROR] Fixes admin mass deleting... not actually mass deleting...
|
2017-08-13 09:49:32 -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
|
1291b12273
|
Cleaned up stacked pipes
|
2017-08-13 01:28:11 -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
|
1b3ccfdfeb
|
The wiki button now asks what page you want to be taken to
|
2017-08-13 01:26:42 -05:00 |
|
CitadelStationBot
|
6cb9a0088f
|
Fixes admin mass deleting... not actually mass deleting...
|
2017-08-13 01:26:39 -05:00 |
|