cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 21:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,855 Commits 26 Branches 2 Tags
a5722fdfc43db4256fe16394485b3d240327eef4
Commit Graph

22917 Commits

Author SHA1 Message Date
KasparoVy
a5722fdfc4 Overhaul, adds color2R/G/B helper procs, adds marking/head accessory/body accessory (colours included) randomization in char prefs. 
Color2R/G/B helper procs and PR overhaul suggested/co-authored by Krausus.
 2016-08-12 22:37:40 -04:00
KasparoVy
9554428c59 Adds Tiger-stripe Tattoo, Tattoo-gun Species handling and Jacket-friendly Version of Existing Vox Hairstyle. 
Adds allowed species list to the Campbell circuitry tattoo. The tattoo sprite only fit the bodies of Species in the list anyway.

Adds Jacket-friendly Version of Existing Vox Hairstyle
 2016-08-11 02:56:17 -04:00
KasparoVy
3610cfd4ea Markings refactor, body/marking/head accessory/hair sprite darkening, adds tail markings, more hair styles... 
Tajara ears are on their head now, fixes a crash bug with tail wagging
with body accessories that are split-rendered, adds secondary
hair/facial hair themes, fixes issues with human/skrell arm/lower body
sprites etc.
 2016-08-09 22:01:45 -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
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
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
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
KasparoVy
d6fc1c7096 Fixes Accidental Greentext for Maroon and Redtext for Assassination Objectives. 
If you had the maroon objective as a traitor and your target was in any
sort of locker on the shuttle when it docked, it would give you green
text.

Maroon objectives now check if the target's in a locker and, if so,
checks the locker's location in order to correctly evaluate objective
completion.

If you had the assassination objective as a traitor and you killed them,
yet they were on a Z-level greater than the Derelict, it would give you
red text.

Assassinations are now location insensitive.
 2016-08-06 15:37:27 -04:00
FreeStylaLT
772fbd2136 Patched up holes I missed, moved coated rwall to walls_misc.dm 2016-08-06 15:27:48 +03:00
Fox McCloud
7bc9b0c47f Merge pull request #5295 from chopchop1614/feta 
Fixes horsemask bug
 2016-08-06 06:57:38 -04:00
Fox-McCloud
03eb9be741 Atom Say Refactor 2016-08-06 06:45:20 -04:00
chopchop1614
346dd3cd70 Update horsemask.dm 2016-08-06 11:32:54 +01:00
chopchop1614
5ea4d4ab2f Update horsemask.dm 2016-08-06 11:32:26 +01: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
2530555bf6 Merge pull request #5304 from Ar3nn/teleshock 
Fixes TK users being shocked for no reason when using shocked machinery
 2016-08-05 19:34:42 -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