Fox-McCloud
1df5fd5e9d
Strips Out Media Players
2016-08-14 00:03:09 -04:00
Fox McCloud
5173fda6b8
Merge pull request #5345 from FlattestGuitar/vomit
...
People don't vomit near corpses.
2016-08-12 20:11:25 -04:00
Mieszko Jędrzejczak
1c3cc1b5a3
Detectives don't vomit.
2016-08-13 01:42:19 +02:00
Isaac Erwin
af6ea4c77c
Removes unused stripper uniforms
2016-08-12 19:13:44 -04:00
Fox McCloud
2c91a81f26
Merge pull request #5391 from tristan1333/master
...
Spacepod Paint (Fixed)
2016-08-12 18:51:28 -04:00
Fox McCloud
e35f3a5fa9
Merge pull request #5396 from FlattestGuitar/darkorn-fluff
...
Fluff item - Dar'Konr's camo bandana.
2016-08-12 18:49:28 -04:00
TheDZD
e944f176d6
Merge pull request #5418 from Fox-McCloud/malf-ai-rework
...
Malf AI Rework
2016-08-12 18:30:41 -04:00
Fox McCloud
bc712f991e
Merge pull request #5423 from LittleBigKid2000/shuttle-request-fix
...
Fixes centcom ferry requests being displayed to all admins and mentors
2016-08-12 18:24:54 -04:00
TheDZD
9b28c9f1a8
Merge pull request #5424 from Fox-McCloud/sunglasses-fix
...
Makes Fake Sunglasses Truly Cosmetic
2016-08-12 18:21:28 -04:00
Fox-McCloud
e371291e0b
Makes Fake Sunglasses Truly Cosmetic
2016-08-11 22:39:47 -04:00
Isaac Erwin
0428c0d68a
Oh man I am not good with code pls to halp
2016-08-11 17:56:48 -04:00
Fox McCloud
a0520862d6
Merge pull request #5403 from monster860/red-blue-fix-4real
...
Makes boldnotice and danger classes be be used
2016-08-11 17:36:52 -04:00
Fox McCloud
e970a7edf3
Merge pull request #5397 from Krausus/KarmaSpending
...
Karma Spending Tweaks and Refactoring
2016-08-11 17:36:32 -04:00
Fox McCloud
9bba7a6cbf
Merge pull request #5411 from Krausus/EquipAsJobAccessFix
...
Fixes Access On "Equip As Job..." IDs
2016-08-11 17:36:21 -04:00
Isaac Erwin
6d0911b3b5
Fixes centcom ferry requests being displayed to all admins and mentors
...
Now ferry requests will only be displayed to admins who have at least
one of the permissions needed to actually move the ferry.
Also fixes the buttons (Such as the follow button) being displayed
twice for ferry request messages.
2016-08-11 17:31:24 -04:00
monster860
19460ff4af
Makes boldnotice and danger classes be be used
2016-08-11 12:20:02 -04:00
Fox-McCloud
eee7b57099
fix
2016-08-11 06:15:28 -04:00
Fox-McCloud
41a74fb865
Malf AI Rework
2016-08-11 05:16:06 -04:00
Crazylemon64
f6605ed69a
Adds extra documentation for json_to_object
2016-08-10 23:54:17 -07:00
Krausus
daad598b87
Fixes access on "equip as job..." IDs
2016-08-10 22:35:53 -04:00
tristan1333
e7c655df3a
switch (part)
...
ty fox
2016-08-11 11:19:11 +10:00
tristan1333
deed273dba
if to switch
...
From ugly if to beautiful switch
2016-08-11 09:45:11 +10:00
Crazylemon64
72febc9602
Merge branch 'master' of github.com:ParadiseSS13/Paradise into spacemanager_fix
2016-08-10 15:25:25 -07:00
TheDZD
5af653f3ea
Merge pull request #5394 from Fox-McCloud/clientless-mobs
...
Virus Outbreak and Appendicitis Clientless Blacklist
2016-08-10 18:21:29 -04:00
TheDZD
91f18ac1d7
Merge pull request #5393 from Fox-McCloud/fast-processing
...
Adds in Fast Processing
2016-08-10 18:21:00 -04:00
TheDZD
6d280e52de
Merge pull request #5375 from Fox-McCloud/formal-captain
...
Formal Captain Update
2016-08-10 18:12:09 -04:00
TheDZD
fea52d62b7
Merge pull request #5390 from Fox-McCloud/no-lag
...
Makes Resting Less Laggy
2016-08-10 18:09:31 -04:00
Tigercat2000
58103757cc
Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
...
Conflicts:
code/game/gamemodes/newobjective.dm
code/game/gamemodes/objective.dm
2016-08-10 14:16:42 -07:00
Fox McCloud
daec491d4e
Merge pull request #5268 from Crazylemon64/space_allocation
...
Removes most hard-coded z level checks
2016-08-10 17:07:36 -04:00
Fox McCloud
45cea819c8
Merge pull request #5325 from DaveTheHeadcrab/glove_revert
...
Revert "ERT Gloves"
2016-08-10 16:31:08 -04:00
SamCroswell
1c6ae3ff4a
SWAT Glove Icon
2016-08-10 15:57:56 -04:00
Crazylemon64
1b93ce9b8b
Merge branch 'master' of github.com:ParadiseSS13/Paradise into space_allocation
2016-08-10 11:02:05 -07:00
Ronald T. Mullins III
13eaf6eac6
Fix for #5386
...
Also includes mix_messages for synthignon and synth n' soda because neither of them are BLUE
2016-08-09 16:14:58 -05:00
Fox McCloud
a8ecd38ed9
Merge pull request #5387 from Alexshreds/paifix
...
When the Copy Pasta Monster Fails...
2016-08-09 16:43:34 -04:00
Krausus
eac1298720
Karma spending tweaks/refactoring
2016-08-09 15:24:09 -04:00
Mieszko Jędrzejczak
f4a2e9df7d
Goshdurn catbeets.
2016-08-09 20:22:15 +02:00
Fox-McCloud
e1179c339d
Virus Outbreak and Appendicitis Clientless Blacklist
2016-08-09 08:05:12 -04:00
Fox-McCloud
8cd140e48a
Adds in Fast Processing
2016-08-09 06:55:00 -04:00
tristan1333
06d45d696c
Fixesthings 2
2016-08-09 20:06:24 +10:00
tristan1333
5ec8d94c3b
Fixes things
2016-08-09 20:05:48 +10:00
tristan1333
5fc5ad2bd5
Update spacepod.dm
2016-08-09 19:39:21 +10:00
Tristan B
52e66d8d27
Merge https://github.com/tristan1333/Paradise-1
2016-08-09 19:16:35 +10:00
Tristan B
0f7d23dafd
spesspod paint fix
2016-08-09 19:15:13 +10:00
Fox-McCloud
11155b261a
Merge remote-tracking branch 'upstream/master' into formal-captain
2016-08-09 05:14:39 -04:00
Fox-McCloud
94340f2548
Makes Resting Less Laggy
2016-08-09 05:06:21 -04:00
Fox McCloud
0226259095
Merge pull request #5376 from FlattestGuitar/stumpy-fluff
...
Fluff item - Stumpy's hat.
2016-08-09 04:36:47 -04:00
Krausus
2bec576fdc
Adds qdels for some temporary humans
2016-08-09 02:58:36 -04:00
Chakirski
5123e47c21
Holy fuck batman look at all those tabs!
2016-08-09 01:19:37 -05:00
Fox McCloud
607642d4ef
Revert "Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more..."
2016-08-08 23:26:51 -04:00
Fox McCloud
86d0c0b2b9
Merge pull request #5147 from KasparoVy/tail-markings
...
Refactors Markings, Adds Tail (some body and head) markings, Adds Alt heads, Secondary (F)Hair Themes, Darkens Vulp/Taj + Unathi horns/frills, Sprite adjustments and more...
2016-08-08 21:58:45 -04:00
