Commit Graph

29414 Commits

Author SHA1 Message Date
Fox McCloud
755ca2ee68 Merge pull request #5190 from Kyep/vamp_dethrall
Adds admin button to remove vamp thrall status
2016-07-26 06:28:37 -04:00
ParadiseSS13-Bot
d9e581080f Automatic changelog generation for PR #5178 2016-07-26 03:42:24 -04:00
Fox McCloud
e491fe33d2 Merge pull request #5178 from Krausus/biconizeVV
Replaces View Variables' Browsed Icons With Bicons
2016-07-26 03:42:21 -04:00
ParadiseSS13-Bot
47c733d093 Automatic changelog generation for PR #5191 2016-07-26 03:40:23 -04:00
Fox McCloud
fb221085a1 Merge pull request #5191 from Krausus/SlightlyBetterRnD
Replaces RnD Console Wait Screens With a Full-Window Overlay
2016-07-26 03:40:22 -04:00
ParadiseSS13-Bot
38d4a69055 Automatic changelog generation for PR #5200 2016-07-26 03:38:31 -04:00
Fox McCloud
863ee10391 Merge pull request #5200 from TheDZD/admin-check-fixes
Assorted Admin Rights Check Fixes
2016-07-26 03:38:25 -04:00
TheDZD
c7f016a702 Makes CC admin-only jobs check for R_EVENT instead of R_ADMIN, fixes some message spam for mentors that don't have enough access, fixes me fucking up and not checking for rights correctly in the telecomms reset verb. 2016-07-25 19:40:55 -04:00
ParadiseSS13-Bot
73d13946fc Automatic changelog generation for PR #5159 2016-07-24 23:37:25 -04:00
TheDZD
4a818f865c Merge pull request #5159 from Fox-McCloud/bola
Adds in Bola, Other Recipe Tweaks
2016-07-24 23:37:24 -04:00
Krausus
1b5eb0a70c Makes RnD console wait messages full-screen 2016-07-24 23:36:47 -04:00
TheDZD
42e517d16a Merge pull request #5186 from Fox-McCloud/mining-cleanup
Purges Unused Mining Files
2016-07-24 23:25:44 -04:00
ParadiseSS13-Bot
02681081df Automatic changelog generation for PR #5100 2016-07-24 23:22:21 -04:00
Fox McCloud
e0f2d4eef5 Merge pull request #5100 from TheDZD/salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt-salt
Re-adds PDA Slot
2016-07-24 23:22:15 -04:00
Kyep
aba7e7058d Fixes #5189 2016-07-24 18:58:10 -07:00
Fox-McCloud
2a3b3fbcb5 Purges Unused Mining Files 2016-07-24 07:31:04 -04:00
Krausus
77c8a4f0e0 Makes VV use bicons 2016-07-23 12:20:28 -04:00
Fox McCloud
c3da27b105 Merge pull request #5175 from LittleBigKid2000/corp-uniform-fix
Fixes corporate security uniforms not being selectable
2016-07-23 09:59:46 -04:00
Isaac Erwin
8697578444 I need to go to bed 2016-07-23 06:34:24 -04:00
Isaac Erwin
31dc49cec7 Fixes the slash thing too, because Fox doesn't have any faith in me, among other reasons 2016-07-23 06:19:02 -04:00
Isaac Erwin
3fdee319e4 Fixes corporate security uniforms not being selectable 2016-07-23 06:03:59 -04:00
Fox-McCloud
659af49a43 tweak 2 2016-07-22 18:36:10 -04:00
Fox McCloud
3215dbe875 Merge pull request #5169 from TheDZD/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
Fixes Extra "the" in Some Medical Stack Text
2016-07-22 18:33:19 -04:00
TheDZD
235f248e12 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 2016-07-22 18:27:14 -04:00
ParadiseSS13-Bot
ff0f29cd0c Automatic changelog generation for PR #5164 2016-07-22 16:28:10 -04:00
Fox McCloud
4e8f3d73b3 Merge pull request #5164 from TheDZD/pew-pew
Refactors Telegun Tempgun and Mimicgun
2016-07-22 16:28:08 -04:00
TheDZD
79d51a57da Refactors telegun, mimicgun, and tempgun 2016-07-22 16:08:17 -04:00
Fox-McCloud
b6c7e5f251 tweak 2016-07-22 15:05:56 -04:00
ParadiseSS13-Bot
c2092ac2d0 Automatic changelog generation for PR #5144 2016-07-22 14:45:14 -04:00
TheDZD
f73f1b4a17 Merge pull request #5144 from Fox-McCloud/medical-stacks
Refactors Medical Stacks
2016-07-22 14:45:12 -04:00
Fox-McCloud
8c91bc11a9 \the 2016-07-22 14:36:38 -04:00
ParadiseSS13-Bot
3906ac9a23 Automatic changelog generation for PR #5161 2016-07-22 14:23:46 -04:00
TheDZD
0020b6d406 Merge pull request #5161 from Fox-McCloud/icon-fixes
Fixes Drink Icon States
2016-07-22 14:23:44 -04:00
Fox-McCloud
567252cdd9 Fixes Drink Icon States 2016-07-22 13:52:58 -04:00
Fox-McCloud
fe8ef6ca69 Adds in Bola, Other Recipe Tweaks 2016-07-22 13:20:09 -04:00
TheDZD
5a9681b5cd Merge pull request #5157 from Fox-McCloud/moving-about-kitchen-stuff
Moves All Kitchen Stuff to Module
2016-07-22 10:01:42 -04:00
ParadiseSS13-Bot
8f0262121c Automatic changelog generation for PR #5108 2016-07-22 10:01:23 -04:00
Fox McCloud
bd42cf5212 Merge pull request #5108 from Twinmold93/teleportingpodders
Pod Disabler, Grab, and Weapon Attack Fixes
2016-07-22 10:01:20 -04:00
ParadiseSS13-Bot
60017168e2 Automatic changelog generation for PR #5137 2016-07-22 10:01:12 -04:00
Fox McCloud
f81a6c2157 Merge pull request #5137 from Kyep/ssd_alert
Makes looting/attacking SSD players more obvious
2016-07-22 10:01:10 -04:00
Fox-McCloud
6bea9ac085 Merge remote-tracking branch 'upstream/master' into medical-stacks 2016-07-22 09:40:40 -04:00
ParadiseSS13-Bot
6fa294e9a0 Automatic changelog generation for PR #5138 2016-07-22 09:31:28 -04:00
Fox McCloud
89b26ca5a7 Merge pull request #5138 from FreeStylaLT/shit-shit-shit-shit
Brig Bugfix/tweak PR
2016-07-22 09:31:26 -04:00
Fox-McCloud
e4214a8181 Moves All Kitchen Stuff to Module 2016-07-22 09:02:10 -04:00
FreeStylaLT
df1b2ddf71 fixes cobwebs, basketball, re-adds lockers to armory 2016-07-22 13:41:46 +03:00
Fox McCloud
2ebc6b4a69 Merge pull request #5145 from TheDZD/changeling
Turns Ghosts into Literal Piles of Salt
2016-07-21 13:07:21 -04:00
TheDZD
7fa74a1d1e Re-adds PDA slot 2016-07-21 13:04:02 -04:00
TheDZD
cff7304cf5 Turns ghosts into literal piles of salt 2016-07-21 12:45:26 -04:00
Fox-McCloud
a4e7a41426 Refactors Medical Stacks 2016-07-21 12:26:21 -04:00
FreeStylaLT
df6710bddf fixes conflict 2016-07-21 18:41:13 +03:00