Commit Graph

23032 Commits

Author SHA1 Message Date
Ar3nn
b77d200603 ..() the second 2016-08-17 21:51:37 -04:00
Ar3nn
57b65483f9 ..() 2016-08-17 21:40:53 -04:00
Ar3nn
f702a9feae One more refactor 2016-08-17 21:10:49 -04:00
Ar3nn
ff467b984e Oops 2016-08-17 12:26:31 -04:00
Ar3nn
45e5e7b837 Come at it from a better angle 2016-08-17 00:30:25 -04:00
Ar3nn
11fea60587 Properly spawns robot debris 2016-08-16 20:56:11 -04:00
TheDZD
2fbd6edf7d Merge pull request #5432 from Alexshreds/ORM4engies
ORM 4 Engies 2016
2016-08-14 22:36:40 -04:00
TheDZD
a34f6a9877 Merge pull request #5437 from Fox-McCloud/remove-mutiny
Removes Mutiny
2016-08-14 22:34:25 -04:00
Fox McCloud
eda5549d2d Merge pull request #5382 from Ty-Omaha/Features
Allows Sechailer Phrases to be Selectable
2016-08-14 22:28:56 -04:00
Fox McCloud
c98fc79c74 Merge pull request #5448 from Crazylemon64/vv_list_fix
Fixes the VV list view
2016-08-14 22:23:02 -04:00
Crazylemon64
e38a0a1d64 Cleaner associativity viewing
We've got a cap of 500 elements on lists we're looking at, so this isn't
going to break the bank
2016-08-14 11:33:33 -07:00
Crazylemon64
1bba2ba41f Makes the thing SLIGHTLY more robust. Not impossible to fool, though 2016-08-14 11:06:00 -07:00
Crazylemon64
01d4de04ac Adds monster's enhancement 2016-08-14 10:59:27 -07:00
Isaac Erwin
11e86c434e Fixes talking swords being unable to their wielders, or anyone 2016-08-14 13:48:54 -04:00
Crazylemon64
02b0d643c1 Don't make fixes at 2 in the morning 2016-08-14 09:44:59 -07:00
Crazylemon64
cce439d205 Fixes the VV list view 2016-08-14 02:43:14 -07:00
Fox McCloud
d124d7e62a Merge pull request #5426 from Norgad/spicy
Adds sprites for Coated Reinforced-Walls
2016-08-13 23:08:09 -04:00
Fox McCloud
d60cb4cfa0 Merge pull request #5442 from LittleBigKid2000/welded-firelocker-fix
Fixes welded fireclosets not showing up properly
2016-08-13 20:58:43 -04:00
Ty-Omaha
8d608c26a2 else if 2016-08-13 20:52:55 -04:00
Isaac Erwin
8b9b28a3c5 Fixes welded fireclosets not showing up properly 2016-08-13 13:14:30 -04:00
FreeStylaLT
b9e57a987a caw caw 2016-08-13 14:19:37 +03:00
Fox-McCloud
3dcc4bdecd Removes Mutiny 2016-08-12 22:44:11 -04:00
TheDZD
9aafb49019 Merge pull request #5436 from Fox-McCloud/singulo-start-fix
Fixes Start Singulo
2016-08-12 20:57:29 -04:00
Fox McCloud
73b0d3f263 Merge pull request #5398 from FlattestGuitar/attack-log
Adds attack logs for golems being summoned.
2016-08-12 20:50:09 -04:00
Fox-McCloud
18a6523b68 Fixes Start Singulo 2016-08-12 20:48:59 -04:00
Mieszko Jędrzejczak
3c99a07878 how did I lose the s 2016-08-13 02:36:06 +02:00
Mieszko Jędrzejczak
5b4ac65079 better logs 2016-08-13 02:26:58 +02: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
739cf9102b Merge pull request #5339 from IcyV/Chameleon-Flag
Adds an explosive chameleon-flag for traitors
2016-08-12 18:59:31 -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
60f3b2d415 tweak 2016-08-12 18:21:13 -04:00
Chakirski
6041a2dd93 Diamond Engineers 2016-08-12 15:30:06 -05:00
Norgad
6c844081d4 i can sprite
maybe
2016-08-12 18:03:16 +12: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
IcyV
c89540a396 Fixes the flag sometimes not deleting right away.
Hilarious to see chained explosions but not very practical.
2016-08-11 12:02:03 -07:00
monster860
19460ff4af Makes boldnotice and danger classes be be used 2016-08-11 12:20:02 -04:00
Fox-McCloud
08224f729c announcement fix 2016-08-11 09:13:44 -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