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

13438 Commits

Author SHA1 Message Date
Aurorablade e1899e4af9 almost 2016-02-06 18:42:26 -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
Aurorablade 12b3ccb2e2 why 2016-02-04 23:57:11 -05:00
Crazylemon64 bf9b922446 Actually lets you regrow limbs while missing legs 2016-02-04 18:32:14 -08:00
VampyrBytes 11df4c50b6 Fixes being able to take off helmet when toggling combat/travel modes 2016-02-04 21:24:38 +00:00
Crazylemon64 53c12176db Removes limb loss, but re-adds breaking bones 
Adjusts the fire damage weakness to an environmental cold weakness
 2016-02-04 12:43:20 -08: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
Crazylemon64 c39059c36d Puts reagent recoloring on a toggle that's off by default 
Moderates increased burn damage down to 25%
Can now regrow limbs even if you've lost both legs
 2016-02-03 22:08:09 -08: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 3695799c97 Moves slime core back to head, and organs in a non-encased limb are more likely to take damage from combat now 
Are you happy now?
 2016-02-03 03:59:23 -08: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
Crazylemon64 170df924f4 no git bad 
don't eat the suicide messages
 2016-02-02 23:18:46 -08:00
Crazylemon64 ce4cc2e860 Makes limb disintegration actually delete the limbs 2016-02-02 22:59:11 -08:00
Crazylemon64 6324514228 Slows down the rate of slime icon updating, and reduces intensity of color 
shift
 2016-02-02 22:28:25 -08:00
Crazylemon64 7786a44de5 Makes burning slime limbs leave a burn stump 
Also prevents the color shift from triggering at low doses, to prevent
meta-ing that you've been injected with chemicals via the icon flash
whenever the icon is updated.
 2016-02-02 21:45:47 -08:00
Aurorablade 0fc841f0f9 can i sleep uyet 2016-02-03 00:40:10 -05:00
Crazylemon64 f5884759ed fix my dumb 2016-02-02 18:57:53 -08:00
Crazylemon64 9a688ede48 Mergification. Rebasing is now hopeless 2016-02-02 18:49:11 -08:00
Crazylemon64 b70dff2b0f Makes stump regrowth redistribute the damage 2016-02-02 18:48:05 -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
Crazylemon 4005de8e7d Limb regrowth delay increase as well as visible messages 2016-02-02 18:10:51 -08: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
Aurorablade 6001f3d80c ayyy merge conflicts fix 2016-02-02 20:46:38 -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
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
Tastyfish c3c3fbe577 existential problem 2016-02-02 14:30:48 -05:00
Crazylemon64 ddb58b704a Slime people change color based off of reagents inside them 2016-02-02 03:15:58 -08:00
Crazylemon64 45b5c1698c Some more changes, limb regrowth works 2016-02-02 01:26:39 -08:00
Aurorablade e926935703 onward to merge conflicts! 2016-02-02 02:57:39 -05:00
Crazylemon64 dc4c4977a4 Let's try this again 2016-02-01 21:11:11 -08: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
TheDZD ba8a2f3247 Renames adminhelp categories 2016-02-01 22:05:08 -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