cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 14:12:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,868 Commits 26 Branches 2 Tags
fec86a78e4fe85b4c283c0d4e352bdb7450a10c8
Commit Graph

12068 Commits

Author SHA1 Message Date
Fox-McCloud
fec86a78e4 as requested 2016-02-06 03:01:45 -05:00
Fox-McCloud
2e244feb0c Sink and Toilet Fixes 2016-02-06 01:25:52 -05:00
Fox McCloud
351152f9fc Merge pull request #3495 from Tastyfish/pillnames 
Shortened default pill/patch name
 2016-02-03 22:24:43 -05:00
Fox McCloud
6e4555cdcd Merge pull request #3494 from Tastyfish/buckets 
Buckets and set transfer amount improvement
 2016-02-03 22:24:33 -05:00
Crazylemon64
181eb47d8f goodbye, crusty code 2016-02-03 00:42:44 -08:00
Fox McCloud
b30a0dfacb Merge pull request #3441 from Crazylemon64/squishy_hair 
Squishy Slime Hair Woooooo
 2016-02-02 21:14:54 -05:00
TheDZD
6261a4fe4e Merge pull request #3480 from Crazylemon64/borer_event_boost 
Makes borer more likely to occur
 2016-02-02 21:05:04 -05:00
TheDZD
7c11321cd9 Merge pull request #3438 from Crazylemon64/skele_drinks_milk 
Milk is now a strong healing reagent for skeletons
 2016-02-02 21:00:28 -05:00
Tastyfish
e43f912c99 Shortened default pill name 2016-02-02 18:54:31 -05:00
Tastyfish
4b9c1a3219 Buckets and set transfer amount improvement 2016-02-02 18:35:02 -05:00
Fox McCloud
ca27fad887 Merge pull request #3482 from Tastyfish/suicide-squish 
Some more species suicide messages
 2016-02-02 17:47:38 -05:00
Crazylemon64
5e403b49ec Add's DZD's tweak 2016-02-02 13:50:41 -08:00
Tastyfish
c3c3fbe577 existential problem 2016-02-02 14:30:48 -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
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
Tastyfish
cb2d166141 Some more species suicide messages 2016-02-01 15:24:32 -05:00
Crazylemon
a7c6ae2871 Chocolate no longer makes people ripperonis 2016-02-01 12:23:05 -08:00
Crazylemon
7795c77abf Tweaks chances 2016-02-01 12:10:08 -08:00
Crazylemon64
1d920c58e8 Makes borer more likely to occur 2016-02-01 11:42:30 -08:00
Crazylemon64
029bcc7daa Merge branch 'master' of https://github.com/Crazylemon64/Paradise into skele_drinks_milk 2016-02-01 10:56:40 -08:00
Crazylemon64
0913ea5664 desnowflakes el memerinnos 2016-02-01 10:54:48 -08:00
Crazylemon64
7116ee4987 Merge branch 'species_reagent_reactions' of https://github.com/Crazylemon64/Paradise into skele_drinks_milk 2016-02-01 10:40:39 -08:00
Crazylemon64
2f11aa1b0a Species now can have reagent-specific reactions 2016-02-01 10:29:17 -08:00
Crazylemon64
945dbe0f0e Woo everything's done 2016-02-01 09:19:05 -08: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
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
Tastyfish
b3e7e9595b Better species suicide support 2016-01-31 00:41:33 -05:00
Crazylemon64
d75be4d0fd For those who want to get off of Mr Bone's Wild Ride 2016-01-30 20:19:05 -08:00
Crazylemon64
294ad1f2a6 Haven't quite gotten preferences working yet 2016-01-30 20:06:14 -08: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
Fox McCloud
5f5c0e093a Merge pull request #3435 from FalseIncarnate/master 
Magic Eight Ball
 2016-01-30 19:11:39 -05:00
Crazylemon64
ee8042d856 All is clear, ready to go 2016-01-30 12:48:54 -08: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
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
Crazylemon64
8f558e6f19 First pass of squishy slime hair 2016-01-29 16:37:46 -08:00
Crazylemon64
0ef973b37e People with squishy limbs can now squish 2016-01-29 10:51:07 -08:00
Crazylemon64
be18146f08 Increases the number of memes in the codebase 2016-01-29 06:36:32 -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