cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,856 Commits 14 Branches 2 Tags
25876fd036ec07e022923d0eb5fbf55ab3d2c27a
Commit Graph
25856 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Aurorablade 25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
Aurorablade 276e5a0c74 Merge conflicts GO 2016-02-02 15:34:59 -05:00
Aurorablade 8daac699a8 i hate this shit right here... 2016-02-02 15:24:42 -05:00
Aurorablade e926935703 onward to merge conflicts! 2016-02-02 02:57:39 -05:00
Fox McCloud 78d40c3f87 Merge pull request #3449 from VampyrBytes/bugfix(#3414) 
Fixes #3414
 2016-02-02 00:00:55 -05:00
TheDZD 27fa36569d Automatic changelog generation for PR #3455 2016-02-02 00:00:15 -05:00
Fox McCloud 6dd6afad8b Merge pull request #3455 from Glorken/knight-fight 
Adds Knight Arena to Holodeck
 2016-02-02 00:00:14 -05:00
TheDZD a2795433ad Automatic changelog generation for PR #3462 2016-02-01 23:55:27 -05:00
Fox McCloud 0d9f2da748 Merge pull request #3462 from KasparoVy/Masks-For-BIGNOSE 
Sharing is Caring: Masks Galore
 2016-02-01 23:55:25 -05:00
KasparoVy aa4e1eb970 Sharing is Caring: Masks Galore 
Adds Vox versions of the Officer SWAT sechailer + HOS SWAT sechailer + Warden SWAT sechailer.

Adds versions of the following, re-sprited to fit Unathi, Tajara and Vulpkanin:

    Balaclava, up and down state
    All bandana colours (+ skull pattern), up and down states
    Breath mask, up and down state
    Clown mask+wig
    Cyborg mask
    Death Commando mask
    Gas mask
    All wrestling masks
    Medical mask, up and down state
    Mime mask
    Owl mask
    Plague doctor mask
    Ninja mask
    Sechailer, up and down state
    Sexy Clown mask+wig
    Sexy Mime mask+wig
    Sterile/Surgical mask, up and down state
    SWAT mask
    Welding gas mask, visor up and down state
    Officer SWAT sechailer + HOS SWAT sechailer + Warden SWAT sechailer
    All smokeables re-positioned so non-humans aren't smoking through their cheek.

Also fixes some typos, does a tiny bit of cleaning and gives the Warden their sechailer.
The sprite was just laying around, it seems.
 2016-02-01 17:49:37 -05:00
VampyrBytes 3e7f1e7499 removes unneeded srcs 2016-02-01 10:26:52 +00:00
TheDZD 8d38e190e4 Automatic changelog generation for PR #3461 2016-02-01 01:54:51 -05:00
Fox McCloud 509e4cad02 Merge pull request #3461 from Tastyfish/suicide-squish 
Better species suicide support
 2016-02-01 01:54:49 -05:00
Fox McCloud 4fdb58344c Merge pull request #3472 from TheDZD/2016-01-31-changelog 
Updates Changelog
 2016-01-31 22:21:26 -05:00
TheDZD 454d5731fb Updates Changelog 2016-01-31 22:15:58 -05:00
Fox McCloud c61b460d45 Merge pull request #3470 from pinatacolada/pinatabranch 
Fixes #3465
 2016-01-31 21:37:28 -05:00
Glorken 59c203f303 Fixes colored claymores in the right hand from appearing backwards when facing east or west. 2016-01-31 21:14:30 -05:00
pinatacolada 8df9725ea0 Fixes #3465 
Swarmers become unable to eat space pods
 2016-02-01 01:24:16 +00:00
Fox McCloud ce2fbdc345 Merge pull request #3356 from pinatacolada/master 
Makes the surgery computer useful
 2016-01-31 19:27:03 -05:00
Fox McCloud 1b94a5b0b3 Merge pull request #3448 from VampyrBytes/Bugfix-(#3425) 
Fixes #3425
 2016-01-31 19:16:36 -05:00
TheDZD 29827ea252 Automatic changelog generation for PR #3437 2016-01-31 18:45:59 -05:00
TheDZD 4ece68aeed Merge pull request #3437 from Crazylemon64/syndicate_borg_access 
Re-adds remote syndicate borg access to places
 2016-01-31 18:45:58 -05:00
TheDZD ff348fefd8 Automatic changelog generation for PR #3445 2016-01-31 18:44:13 -05:00
TheDZD f12e56cd69 Merge pull request #3445 from Fox-McCloud/summon-guns 
Updates Summon Guns
 2016-01-31 18:44:12 -05:00
TheDZD b655d9e735 Merge pull request #3463 from Fox-McCloud/config-fix 
Fixes Game Options Config
 2016-01-31 18:41:14 -05:00
Fox-McCloud 134b407499 Fixes Game Options Config 2016-01-31 01:34:07 -05:00
Fox-McCloud 57073340cf you shall not cast 2016-01-31 01:04:27 -05:00
Tastyfish b3e7e9595b Better species suicide support 2016-01-31 00:41:33 -05:00
TheDZD f0d9c6cb12 Automatic changelog generation for PR #3458 2016-01-30 23:05:14 -05:00
Fox McCloud 19ff2e4bf3 Merge pull request #3458 from Tastyfish/shuttle-fixes 
Shuttle fixes
 2016-01-30 23:05:12 -05:00
Tastyfish c714f14b28 Shuttle fixes 2016-01-30 22:29:42 -05:00
Aurorablade c4d151ce34 you buy organ, yaya? 
Is fresh.
 2016-01-30 21:37:55 -05:00
TheDZD 1d40ba8e14 Automatic changelog generation for PR #3440 2016-01-30 21:21:52 -05:00
Fox McCloud c2d791a40a Merge pull request #3440 from Crazylemon64/skrell_liver 
Skrell's alcohol weakness is tracked on the liver
 2016-01-30 21:21:51 -05:00
TheDZD c7e80ac4b2 Automatic changelog generation for PR #3439 2016-01-30 21:21:31 -05:00
Fox McCloud 26085be1f8 Merge pull request #3439 from Crazylemon64/squishy_limbs_squish 
People with squishy limbs can now squish
 2016-01-30 21:21:30 -05:00
Fox McCloud 0e84f3c265 Merge pull request #3456 from Tastyfish/continuous-rounds 
Fixed continuous rounds
 2016-01-30 21:20:41 -05:00
Tastyfish ef79569075 Fixed continuous rounds 2016-01-30 20:33:45 -05:00
TheDZD 6c61bff09e Automatic changelog generation for PR #3435 2016-01-30 19:11:41 -05:00
Fox McCloud 5f5c0e093a Merge pull request #3435 from FalseIncarnate/master 
Magic Eight Ball
 2016-01-30 19:11:39 -05:00
Glorken 5e2591aa71 Adds Knight Arena to Holodeck 
Creates a holodeck option akin to the thunderdome, but with knight armor
and claymores. Also adds blue and red claymore sprites.
 2016-01-30 17:26:52 -05:00
TheDZD 3e46df67ac Merge pull request #3453 from Tastyfish/plasma-tech 
Some items had typo in their origin tech
 2016-01-30 16:58:08 -05:00
Tastyfish 7027c217bf Some items has plasma typo in origin tech 2016-01-30 15:04:33 -05:00
VampyrBytes 1a512ccf76 Fixes #3414 
reset's hud warnings during species change so they don't get stuck on
 2016-01-30 09:05:29 +00:00
VampyrBytes bb15d5f133 Fixes #3425 
There were a couple of things going on... the spawn(-1) which should
have meant that the door shut straight away was being negated by the
sleeps. Also, If the door had just been used, it would still be marked
as operating and so wouldn't shut
 2016-01-30 08:49:56 +00:00
Fox McCloud 208889ed8d Merge pull request #3446 from TheDZD/2016-01-29-changelog 
Updates Changelog
 2016-01-29 23:17:22 -05:00
TheDZD d473a2b6cd Changelog 2016-01-29 23:13:59 -05:00
TheDZD 50d77408f6 Merge pull request #3444 from Fox-McCloud/explosion-damage-refactor 
Refactors Human Explosion Damage
 2016-01-29 23:07:45 -05:00
Fox-McCloud 9ff52f91a8 Updates Summon Guns 2016-01-29 22:54:07 -05:00
Fox-McCloud 500cc7b12a apparently, this is a thing 2016-01-29 21:51:09 -05:00