cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 18:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,038 Commits 26 Branches 2 Tags
b77d200603528cf6655e48e2fa7b4e00bb202037
Commit Graph

14150 Commits

Author SHA1 Message Date
Ar3nn
f702a9feae One more refactor 2016-08-17 21:10:49 -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
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
Isaac Erwin
11e86c434e Fixes talking swords being unable to their wielders, or anyone 2016-08-14 13:48:54 -04:00
Ty-Omaha
8d608c26a2 else if 2016-08-13 20:52:55 -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
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
Ty-Omaha
35ccf346a7 Stuff 2016-08-10 21:47:37 -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
Mieszko Jędrzejczak
7490b921c7 Removes the thingy from mobs. 2016-08-09 23:33:34 +02: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
Mieszko Jędrzejczak
3373c24125 logs logs logs 2016-08-09 22:07:42 +02:00