cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-06-20 21:03:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,813 Commits 10 Branches 2 Tags
8d55ceb371cfef268c19ffa1d74b2a12420cc402
Commit Graph

20033 Commits

Author SHA1 Message Date
Tastyfish 8d55ceb371 Fixed fire alarm time left 2016-02-02 18:12:04 -05:00
Fox McCloud 78d40c3f87 Merge pull request #3449 from VampyrBytes/bugfix(#3414) 
Fixes #3414
 2016-02-02 00:00:55 -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
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
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 c61b460d45 Merge pull request #3470 from pinatacolada/pinatabranch 
Fixes #3465
 2016-01-31 21:37:28 -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 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 f12e56cd69 Merge pull request #3445 from Fox-McCloud/summon-guns 
Updates Summon Guns
 2016-01-31 18:44:12 -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
Tastyfish c714f14b28 Shuttle fixes 2016-01-30 22:29:42 -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
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
Tastyfish ef79569075 Fixed continuous rounds 2016-01-30 20:33:45 -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
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
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
TheDZD 868504bdc4 Merge pull request #3430 from Fox-McCloud/liches 
Adds in Lichdom and Lesser Summon Guns Spells--Wiz Tweaks
 2016-01-29 21:47:10 -05:00
Fox-McCloud 1321158fbf Refactors Human Explosion Damage 2016-01-29 21:45:57 -05:00
Fox-McCloud 887ce1f37e fixes blind spell 2016-01-29 21:31:16 -05:00
TheDZD aea371f60b Merge pull request #3432 from Tastyfish/support-manifest 
Adds Supply section to manifest
 2016-01-29 21:03:02 -05:00
Fox-McCloud 1404d66fff tweaks 2016-01-29 19:40:46 -05:00
SakuraTheBabyfur 30833c968c Fixes AI not being able to call the shuttle 2016-01-29 19:03:19 -05:00
Tastyfish 37277fb21c Made HoP show up in supply too, with QM a third color 2016-01-29 15:03:26 -05:00
Crazylemon64 0ef973b37e People with squishy limbs can now squish 2016-01-29 10:51:07 -08:00
Fox-McCloud 1ff23cd3ca lesser summon guns, wizman update 2016-01-29 09:12:37 -05:00
Crazylemon64 7267f890f6 Re-adds syndicate borg access to places 2016-01-28 23:48:00 -08:00
Fox McCloud 6a904adc1b Merge pull request #3436 from Crazylemon64/vox_sprite_fix 
Fixes voxxy sprite bug! Yaya!
 2016-01-29 02:13:06 -05:00
Crazylemon64 b47b7063dc Fixes voxxy sprite bug! Yaya! 2016-01-28 23:07:00 -08:00
FalseIncarnate 98dfd5f90d Magic Eight Ball 
Adds in a new toy: Magic Eight Ball!
- Discern your fate with the wondrous Magic Eight Ball!
- Obtainable from Claw Game prize balls

Adds in the mighty MAGIC CONCH SHELL.
- Submit to the will of the all-knowing Magic Conch.
- Admin-spawn only (too powerful)
 2016-01-28 23:40:37 -05:00
Crazylemon64 9072a7075d Skrell's alcohol weakness is tracked on the liver 2016-01-28 20:17:00 -08:00
Tastyfish 511a9757de Renamed manifest section Support to Service 2016-01-28 22:30:45 -05:00
FalseIncarnate 70804d49fc Fixes plants attempting to sting ghosts 
Fixes #3427
 2016-01-28 21:38:54 -05:00
Tastyfish ba2f797ed3 Adds Supply section to manifest 2016-01-28 21:12:20 -05:00
Fox-McCloud 7a29f1c0da runtime fix 2016-01-28 20:27:05 -05:00
Fox-McCloud cfa857cd35 Adds in Lichdom Spell 2016-01-28 18:57:00 -05:00
TheDZD 3c35269615 Merge pull request #3417 from Fox-McCloud/spoopy 
Adds in Skeleton Race
 2016-01-28 16:02:18 -05:00
Fox McCloud 9a2a307ad7 Merge pull request #3426 from Crazylemon64/astral_rune_fix 
Having many runes on the same tile will not break astral project
 2016-01-28 02:52:46 -05:00
Crazylemon64 0c92ebd701 Having many runes on the same tile will not break astral project 2016-01-27 23:32:57 -08:00
TheDZD c2c760b555 Merge pull request #3415 from Fox-McCloud/riot-shields 
TG Riot Shield Port and Tweaks
 2016-01-27 22:18:12 -05:00