cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-22 23:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,861 Commits 29 Branches 2 Tags
f4a2e9df7d7ef55fefd850c689b5b5915ed8504f
Commit Graph

14074 Commits

Author SHA1 Message Date
Mieszko Jędrzejczak
f4a2e9df7d Goshdurn catbeets. 2016-08-09 20:22:15 +02: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
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
Mieszko Jędrzejczak
76b4ca307c Stumpy's hat. 2016-08-09 01:33:10 +02:00
Fox-McCloud
340d397382 Wormhole Event Fix, Portal GC Fix 2016-08-08 09:03:30 -04: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
Fox-McCloud
35557881ab Malf AI Powers Update 2016-08-07 04:48:21 -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
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
Fox-McCloud
03eb9be741 Atom Say Refactor 2016-08-06 06:45:20 -04:00
Fox McCloud
e4756ba621 Merge pull request #5342 from Earthdivine/Secrets-Rename 
Strike Team Clarity
 2016-08-05 19:59:44 -04:00
Fox McCloud
38206e5b61 Merge pull request #5334 from FlattestGuitar/holy 
Nerfs holy water.
 2016-08-05 19:33:40 -04:00
Earthdivine
bd4fa6de04 Changed "Send in a strike team" to "Send in the Deathsquad." for more clarity. 2016-08-05 18:19:11 -05:00
Isaac Erwin
f5c0455de5 Oh 2016-08-05 18:58:38 -04:00
Isaac Erwin
f2c1c7406d Various grammar/spelling fixes 2016-08-05 18:43:33 -04:00
Mieszko Jędrzejczak
3888bcb1f1 Makes holy water stutters non-op 2016-08-05 00:38:31 +02:00
Fox McCloud
7476da1c49 Merge pull request #5294 from yurivw/shuttleoptions 
Removed unused options in secrets menu
 2016-08-04 17:48:41 -04:00
Fox McCloud
2b467d50c8 Merge pull request #5318 from Chakirski/SpritFixes 
Fixes Sprite Voodoo and Hoodies
 2016-08-04 17:47:26 -04:00
Krausus
e9886d05fc Human overlay caching and minor overlay fixes 2016-08-04 11:14:56 -04:00
Chakirski
1f703104e4 Less stealth more sprite. 2016-08-03 22:54:00 -05:00
TheDZD
44ae3a4a68 Merge pull request #5309 from Fox-McCloud/field-generators 
Field Generator Cleanup, Singularity Fixes,
 2016-08-03 23:29:09 -04:00
Crazylemon64
40fe120067 Whoops 2016-08-03 20:04:14 -07:00
Crazylemon64
2f3e529db0 No more lighting overlays 2016-08-03 19:44:47 -07:00
Fox-McCloud
15d7d16ec8 oops 2016-08-03 22:34:29 -04:00
Crazylemon64
05a95086bd Comments bgone 2016-08-03 19:07:23 -07:00
Crazylemon64
3fbb00d5f7 Can now save and load the cyberiad 2016-08-03 18:58:41 -07:00
Chakirski
d54e842692 I can already tell only some of these will ever be used. 2016-08-03 19:49:44 -05:00