Commit Graph

2019 Commits

Author SHA1 Message Date
Fox McCloud
87155ff7d3 Merge pull request #3802 from Tastyfish/chronx100
Donator Fluff Items: Chaplain Edition
2016-03-10 03:54:19 -05:00
TheDZD
62afa9d6d3 Merge pull request #3791 from Fox-McCloud/goon-immersion-sounds
Implements a Few Goon Sounds
2016-03-09 17:08:05 -05:00
Tastyfish
959b71ca37 Adds fluff items for chronx100 2016-03-08 23:15:13 -05:00
Fox-McCloud
2268e3c39e Implements a Few Goon Sounds 2016-03-07 23:54:12 -05:00
VampyrBytes
1148bde3a6 eating refactor (#3733) + bugfixes
Ok, messed up resolving the merge conflicts (first try), so doing a
fresh pr. This turned out to be a good thing, as after I put the changes
back I tested again, and found 2 bugs (not due to my code)

Firstly, the organ refactor had introduced a bug when taking liver
damage from being drunk. It wasn't getting the liver correctly, leaving
it with null, and was then trying to damage it.

The second was related to the amount you took in when drinking
2016-03-05 08:03:39 +00:00
Fox McCloud
ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
2016-03-04 19:51:50 -05:00
Crazylemon64
b095d40952 i r inteligunt 2016-03-01 12:11:08 -08:00
Crazylemon64
d72a086cd5 Makes the DNA scrambler not give incorrect hairstyles 2016-03-01 11:40:39 -08:00
Crazylemon64
fff283bd2a Organs now properly retain appearance upon cloning and DNA scramble 2016-02-29 22:49:46 -08:00
Aurorablade
5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Fox-McCloud
a4c61c7ee9 Ports Whetstones 2016-02-25 02:03:53 -05:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
VampyrBytes
6afc8258a8 Adds same fix to secure storage 2016-02-24 06:54:56 +00:00
VampyrBytes
c343619ebc removes unneeded brackets 2016-02-23 23:39:54 +00:00
VampyrBytes
b138c3eace prevents autoequip to locked lockboxes 2016-02-23 10:05:32 +00:00
Fox McCloud
a0263f9c89 Merge pull request #3652 from Crazylemon64/warm_regards
You can now light cigarettes off of burning mobs
2016-02-21 01:27:11 -05:00
Fox McCloud
941d992920 Merge pull request #3655 from VampyrBytes/washrefactor
refactors washing items
2016-02-20 17:41:53 -05:00
Fox McCloud
c69d0b877c Merge pull request #3656 from pinatacolada/protectstation
Makes the Protect Station board no longer consider people crew, instead of human
2016-02-20 15:35:35 -05:00
pinatacolada
90678a4c28 Makes the Protect Station board no longer consider people crew, instead of human""
I'm guessing this was an oversight?
2016-02-20 14:01:53 +00:00
VampyrBytes
386ed87126 refactors washing items
fixes #3570
Could have fixed with another if statement in sink/attackby, but it was
already pretty snowflakey, and had the potential to get worse
Items now have a wash proc that the sink calls, that can be overridden
when needed
2016-02-20 12:01:40 +00:00
Fox McCloud
716edf2533 Merge pull request #3634 from KasparoVy/packbackets
Vox-fitted Back Stuff, Adds Genetic Duffel, Fixing Typos and Refactoring Back-Icon Generation
2016-02-20 02:20:16 -05:00
Fox McCloud
2c4dfb18e5 Merge pull request #3564 from Crazylemon64/better_defibs
Might make the defib more reliable on players who have ghosted
2016-02-20 02:18:55 -05:00
Crazylemon64
6d30b44ac6 You can now light cigarettes off of burning mobs 2016-02-19 21:20:04 -08:00
Crazylemon64
250e07a915 bluh 2016-02-19 21:05:48 -08:00
Crazylemon64
ae3ab870f8 Adds the recommended fixes 2016-02-19 20:42:25 -08:00
Aurorablade
570dd619b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-18 19:01:41 -05:00
KasparoVy
679218b952 Vox-Fitted Back Stuff, Adds Geneticist Duffel, Fixing Typos and Refactoring Back Icon Generation
Using species_fit and sprite_sheets now works properly for items worn on
the back. Previously it was using the item_state name if it existed in
order to generate the on-mob icon, which was wrong. I restructured it to
work the same way as the rest of the icon generation procs.
2016-02-18 14:59:28 -05:00
Fox McCloud
5f0736e2ed Merge pull request #3624 from Tastyfish/i-have-no-mouth-and-i-must-fork
Stops utensils from working on mouthless humanoids.
2016-02-18 13:36:55 -05:00
TheDZD
cbafa08ba0 Merge pull request #3601 from FalseIncarnate/arcade
Arcade Prize Counter
2016-02-17 16:57:49 -05:00
Tastyfish
e27fb5d27f Stops utensils from working on mouthless humanoids 2016-02-16 22:52:56 -05:00
Fox-McCloud
9d7904e29f EMP Kit Tweak 2016-02-15 01:57:16 -05:00
TheDZD
af648474cf Merge pull request #3583 from Fox-McCloud/permit-refactor
Refactors Bot Weapon Identification
2016-02-13 18:23:12 -05:00
Aurorablade
9a55bb11b9 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-13 06:37:49 -05:00
Fox-McCloud
f47131fbb2 Refactors Bot Weapon Identification 2016-02-12 14:52:50 -05:00
Fox McCloud
aa7b36487b Merge pull request #3580 from VampyrBytes/PlasticBags
Fixes plastic bags suffocating when they shouldn't (#3577)
2016-02-12 13:46:06 -05:00
VampyrBytes
90c485355f Fixes plastic bags suffocating when they shouldn't (#3577)
As title. Now checks your head slot for the bag rather than relying on a
variable that might not be reset in time
2016-02-12 11:37:19 +00:00
FalseIncarnate
954d0dadfa Prize Counter WIP commit 2016-02-12 00:32:21 -05:00
Aurorablade
545d3abf19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-11 18:03:09 -05:00
KasparoVy
c00121e47a Grey Smokables 2016-02-10 23:07:26 -05:00
Crazylemon64
18cc737c0f Might make the defib more reliable, and adds a message for the ghost not being present. 2016-02-10 11:23:53 -08:00
Fox McCloud
4b973163a6 Merge pull request #3548 from Spacemanspark/Spark-plays-too-much-Pokemanz
Adds Pokemon to the game.
2016-02-10 00:51:11 -05:00
Spacemanspark
b6b3204bf7 Makes Mob Capsule code better. 2016-02-09 01:02:25 -06:00
Spacemanspark
24afe14a12 Adds in mob capsules 2016-02-08 23:40:53 -06:00
VampyrBytes
8e627b384c Bolas now affect walking people
As per #3509 bolas no longer require a running stance to trip people
2016-02-08 10:10:37 +00:00
Fox McCloud
1d984acda0 Merge pull request #3502 from VampyrBytes/cleanSlips
Cleans up slipping code
2016-02-07 15:11:23 -05:00
Fox-McCloud
78af714755 Fixes Bear Trap IEDs and Duplicate Bear Traps 2016-02-05 23:29:20 -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
Aurorablade
25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -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