cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-31 20:53:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,911 Commits 26 Branches 2 Tags
e116dd3cfec77d820c8de421dda63d1f5b9c0dbc
Commit Graph

12085 Commits

Author SHA1 Message Date
Fox McCloud
e116dd3cfe Merge pull request #3541 from VampyrBytes/VampPassives 
Fixes Vamp Passives (#2812)
 2016-02-08 18:23:04 -05:00
VampyrBytes
e526753c75 Fixes Vamp Passives (#2812) 
Fixes Vampire thermal vision
Improved regen was working, but the message was commented out due to
spam, it now shows without spamming
 2016-02-08 20:44:04 +00:00
Robertha89
df963a6aa5 Adds head patting 2016-02-08 13:35:26 +01:00
Fox McCloud
1d984acda0 Merge pull request #3502 from VampyrBytes/cleanSlips 
Cleans up slipping code
 2016-02-07 15:11:23 -05:00
TheDZD
f45a09122c Merge pull request #3522 from Fox-McCloud/sink-and-toilet-fixes 
Sink and Toilet Fixes+Refactor
 2016-02-07 15:03:23 -05:00
KasparoVy
65e3b13d2e Readds Bald Tajaran Hairstyle, Fixes non-Human Masks 2016-02-07 02:10:44 -05:00
Fox McCloud
217c62f9f5 Merge pull request #3516 from Crazylemon64/cleaner_chemistry 
Moves Chemistry's welding tank to a wall-mounted version
 2016-02-06 07:46:30 -05:00
Fox-McCloud
fec86a78e4 as requested 2016-02-06 03:01:45 -05:00
Fox McCloud
c072f9a8e4 Merge pull request #3510 from VampyrBytes/EliteSyndieSuit 
fixes #3421
 2016-02-06 01:45:08 -05:00
Fox-McCloud
2e244feb0c Sink and Toilet Fixes 2016-02-06 01:25:52 -05:00
Fox McCloud
b5a5ca6e54 Merge pull request #3477 from VampyrBytes/bugfix(#3466) 
Bugfix(#3466)
 2016-02-06 00:20:25 -05:00
Crazylemon
db5e0d56c3 Removes vestigial code from the PR 
A chem cache, which was intended as a replacement for the reagents
storage locker, and fethas' surgery helper file that I accidentally
carried over because automatically removing files on checkout is not
git's specialty
 2016-02-05 10:06:55 -08:00
Crazylemon64
eba74c1392 Gives chemistry breathing room - moves welding tank to a wall-mount version 2016-02-05 03:20:57 -08:00
VampyrBytes
11df4c50b6 Fixes being able to take off helmet when toggling combat/travel modes 2016-02-04 21:24:38 +00:00
VampyrBytes
05e7858257 Fixes syndie suit name part of #3421 
Fixes name and description of elite syndie suit after mode toggle

Don't close #3421 yet, I'm looking into the other part but need more
info
 2016-02-04 19:46:54 +00:00
VampyrBytes
18d7335f4e Fixes #3497 
Deathsquad pulse rifle now fires correct round type
 2016-02-04 17:45:00 +00:00
VampyrBytes
9d5c754f11 rename argument for clarity 2016-02-04 07:33:35 +00: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
VampyrBytes
de45fc9aba Cleans up slipping code 
Puts slipping into one proc rather than being dealt with individually by
each item.

The only changes to functionality here are where it would have been
possible to slip on some items whilst flying. It will make any changes
decided on in #3490 or any future changes far more easy to implement
 2016-02-03 09:44:32 +00: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
7ef6c917a3 Fixes issues caused when you don't need to breathe 
Allows oxyloss regen (at normal raste) and turns off oxygen and toxin
hud warnings when you don't need to breathe
 2016-02-01 11:11:36 +00: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