cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-30 03:12:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,883 Commits 30 Branches 2 Tags
21dd91d031daf878aef9c94f2fcae52b99f8ea80
Commit Graph

22936 Commits

Author SHA1 Message Date
Crazylemon64
21dd91d031 Curse you automerge 2016-08-10 11:14:00 -07:00
Crazylemon64
1b93ce9b8b Merge branch 'master' of github.com:ParadiseSS13/Paradise into space_allocation 2016-08-10 11:02:05 -07:00
Aurorablade
d92447203c Fixes #5202 2016-08-10 01:37:34 -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
0226259095 Merge pull request #5376 from FlattestGuitar/stumpy-fluff 
Fluff item - Stumpy's hat.
 2016-08-09 04:36:47 -04:00
Fox McCloud
8104ccec05 Merge pull request #5389 from Krausus/NoMindNoClothesNoService 
Fixes Mindless Spell Checking Runtime
 2016-08-09 04:05:38 -04:00
Krausus
906a3d3ba2 Fixes noclothes check on mindless mobs' spells 2016-08-09 03:44:09 -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
Fox McCloud
e708dcc482 Merge pull request #5282 from FreeStylaLT/burn_baby_burn 
DISCO INFERNO (Adds wall melting, makeable Coated rwalls)
 2016-08-08 21:57:18 -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
Mieszko Jędrzejczak
76b4ca307c Stumpy's hat. 2016-08-09 01:33:10 +02:00
Crazylemon64
1d7b94d71a I thought I fixed this 2016-08-08 14:18:43 -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
b5e106f37b src 2016-08-08 01:53:15 -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
Chopchop1614
b81e746027 Fixes changeling bug (#5350) 
* fox's suggestion

* changeling updates

* changeling fixes

* Update changeling.dm

* Update changeling.dm
 2016-08-07 23:00:41 -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
Fox McCloud
ce773d22a2 Merge pull request #5346 from KasparoVy/locker_z_level_voodoo_fix 
Fixes Accidental Greentext for Maroon and Redtext for Assassination Objectives, Resolves #5306
 2016-08-07 20:01:29 -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
KasparoVy
6edee2b55a No locker permastuns. 2016-08-07 11:48:09 -04:00
Fox-McCloud
40bbf6a788 Allows Accessories to Have Armor 2016-08-07 11:06:37 -04:00
FreeStylaLT
6833ce0cc5 removes fox's comments 2016-08-07 12:49:44 +03:00
Fox-McCloud
35557881ab Malf AI Powers Update 2016-08-07 04:48:21 -04:00
Fox McCloud
5c47e4d9ce Merge pull request #5328 from pinatacolada/sweden 
Makes the swedish gene more swedish
 2016-08-06 21:05:51 -04:00
Crazylemon64
a9f3d0464e Makes the json-maploader legible in DM 2016-08-06 17:40:33 -07:00
Fox-McCloud
f5826a0c2b Adds in Headphones 2016-08-06 19:55:08 -04:00
Isaac Erwin
4b46c2cf6b Adds cosmetic sunglasses 2016-08-06 19:43:55 -04:00
chopchop1614
fe242bcee0 Update bscrystal.dm 2016-08-07 00:33:52 +01:00
chopchop1614
3658b3b5ad Update stack_recipe.dm 2016-08-07 00:33:32 +01:00
chopchop1614
692754c81a fox's changes 2016-08-07 00:31:36 +01:00
chopchop1614
8d26c41cb1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into keta 2016-08-07 00:16:03 +01:00
chopchop1614
c4756e39e1 fox's suggestion 2016-08-07 00:11:00 +01:00
KasparoVy
7b502a0989 get_turf instead of snowflake_check 2016-08-06 16:10:06 -04:00