cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 17:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,869 Commits 26 Branches 2 Tags
18d7335f4e73d9ef85bebfb36ec918bd9a160e6a
Commit Graph

20074 Commits

Author SHA1 Message Date
VampyrBytes
18d7335f4e Fixes #3497 
Deathsquad pulse rifle now fires correct round type
 2016-02-04 17:45:00 +00:00
Fox McCloud
b727d83e7d Merge pull request #3496 from Tastyfish/chaplain-headset 
Gave chaplain service radio headset
 2016-02-03 22:24:53 -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
Fox McCloud
d1049ad383 Merge pull request #3423 from Crazylemon64/cloning_brain_scan 
Adds a brain scan mode to the cloning system
 2016-02-03 22:23:10 -05:00
Fox McCloud
78755b150a Merge pull request #3501 from Crazylemon64/construct_attack_fix 
Removes horrible sins against nature from cult code
 2016-02-03 18:18:12 -05:00
Fox McCloud
7f939dc8a7 Merge pull request #3503 from Crazylemon64/borer_mind_understands 
Trapped minds can now understand what the host mob can
 2016-02-03 18:16:47 -05:00
Crazylemon
aa31de9ce8 Trapped minds can now understand what the host mob can 2016-02-03 12:57:29 -08:00
Crazylemon64
1c1bd52c54 Makes brain scan a selected mode rather than a button, for working nice with autoprocess 2016-02-03 10:06:41 -08: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
1e1444ad2c Merge pull request #3485 from Crazylemon64/less_griefy_borers 
Enhances symbiosis of Borers
 2016-02-02 21:05:13 -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
Crazylemon
748367c591 Removes salicyclic acid - duplicated by hydrocodone 2016-02-02 16:33:22 -08:00
Tastyfish
c3fbef1f64 Gave chaplain service radio headset 2016-02-02 19:15:26 -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
9bce7e9b05 Merge pull request #3493 from Tastyfish/firefix 
Fixed fire alarm time left
 2016-02-02 18:25:53 -05:00
Tastyfish
8d55ceb371 Fixed fire alarm time left 2016-02-02 18:12:04 -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
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
Crazylemon
1d819b42f4 Gives salbutamol and capulettium+ 
as a means of resuscitation and silencing, respectively
 2016-02-01 17:23:12 -08:00
Crazylemon
048b15571b Adds some checks to borers to make them less murderboney 
Also adds some chems to better facilitate a "symbiote" relationship
 2016-02-01 16:54:11 -08: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
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
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