cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-02-09 16:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,945 Commits 31 Branches 2 Tags
39924a55fdd21c6a7d66fa85645f512a15faa00f
Commit Graph

14112 Commits

Author SHA1 Message Date
Aurorablade
39924a55fd Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-11 02:01:41 -04:00
Aurorablade
a2a96843ea wtf am i even doing anymore... 2016-08-11 01:36:28 -04: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
Aurorablade
1729187b01 got to do a bugfix BRB... 2016-08-10 01:24:38 -04: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
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
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
Aurorablade
5e90dd83ed Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into DWI 2016-08-09 02:43:27 -04:00
Aurorablade
f18735b36a More stuff at 230am... 2016-08-09 02:27:21 -04:00
Chakirski
5123e47c21 Holy fuck batman look at all those tabs! 2016-08-09 01:19:37 -05:00
Aurorablade
3b57ddd4b0 Wee 2016-08-09 00:15:18 -04: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
TheDZD
f7b6928a9f Merge pull request #5355 from Fox-McCloud/malf-ai-update 
Malf AI Powers Update
 2016-08-08 21:30:12 -04:00
TheDZD
a1448a10d8 Merge pull request #5367 from Fox-McCloud/fix-copies 
Illusion Simple Animals Have Attack Sounds
 2016-08-08 20:37:56 -04:00
TheDZD
4c3db67479 Merge pull request #5369 from Fox-McCloud/portal-fix 
Wormhole Event Fix, Portal GC Fix
 2016-08-08 20:37:27 -04:00
TheDZD
acbbccb774 Merge pull request #5359 from Fox-McCloud/accessory-armor 
Allows Accessories to Have Armor
 2016-08-08 20:37:08 -04:00
Mieszko Jędrzejczak
5320bed0af *sigh* 2016-08-09 02:05:52 +02:00
Mieszko Jędrzejczak
859608be54 Let's get drunk. 2016-08-09 01:42:49 +02:00
Fox-McCloud
989b629de4 crown and shoes 2016-08-08 19:36:41 -04:00
Mieszko Jędrzejczak
76b4ca307c Stumpy's hat. 2016-08-09 01:33:10 +02:00
Fox-McCloud
0694a35da4 Formal Captain Update 2016-08-08 19:01:37 -04:00
Tigercat2000
0821e5bd04 Merge remote-tracking branch 'upstream/master' into GAMEMODE_CODE_AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 
Conflicts:
	code/game/gamemodes/objective.dm
 2016-08-08 06:21:02 -07:00
Fox-McCloud
340d397382 Wormhole Event Fix, Portal GC Fix 2016-08-08 09:03:30 -04:00
Crazylemon64
031dd2bb3d Iiiiit's merge conflict time! 
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation
 2016-08-07 23:42:02 -07:00
Fox McCloud
b1c87f319d Merge pull request #5316 from Crazylemon64/map_writer 
Adds a "Save" buildmode
 2016-08-08 02:34:02 -04:00
Fox-McCloud
aa1e0407d4 Illusion Simple Animals Have Attack Sounds 2016-08-08 00:20:13 -04:00
Fox McCloud
63fa330885 Merge pull request #5314 from Chakirski/AIholopets 
Adds AI Holopets
 2016-08-07 23:06:59 -04:00
Fox McCloud
bf52aec722 Merge pull request #5348 from LittleBigKid2000/aesthetic-sunglasses 
Adds cosmetic sunglasses
 2016-08-07 23:06:20 -04:00
LittleBigKid2000
0eed28cdba Corgi Gender Equality (#5330) 
* Corgi Gender Equality

* I'd prefer to die on my own terms, thanks
 2016-08-07 23:06:07 -04:00
TheDZD
bc2ce6a7b0 Merge pull request #5349 from Fox-McCloud/headphones 
Adds in Headphones
 2016-08-07 22:58:35 -04:00
TheDZD
6d449de47a Merge pull request #5344 from Fox-McCloud/atom-say 
Atom Say Refactor
 2016-08-07 22:57:32 -04:00
Crazylemon64
342fcad5d5 All is ablaze 2016-08-07 13:43:15 -07:00
Crazylemon64
360f073609 Removes buffer_line, makes model saving for cluttered tiles quick 2016-08-07 13:36:18 -07:00
Crazylemon64
ffd47933e5 Map writer is now legible in DM, saves 19x faster 2016-08-07 12:02:43 -07:00
Fox-McCloud
40bbf6a788 Allows Accessories to Have Armor 2016-08-07 11:06:37 -04:00