TheDZD
c00b89e2af
Merge pull request #3805 from Fox-McCloud/science-nerf
...
Heavily Rebalances Science
2016-03-10 19:16:38 -05:00
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
Fox-McCloud
3ac2f23377
Heavily Rebalances Science
2016-03-09 02:58:05 -05:00
Tastyfish
959b71ca37
Adds fluff items for chronx100
2016-03-08 23:15:13 -05:00
Fox-McCloud
bc639a357c
more sounds
2016-03-08 22:35:31 -05:00
TheDZD
4e47626af7
Merge pull request #3767 from Tastyfish/silence
...
Tranquillité, Prospérité & Mimeré
2016-03-08 19:32:29 -05:00
Fox McCloud
9660d08fa0
Merge pull request #3762 from VampyrBytes/EatingRefactor
...
eating refactor (#3733 ) + bugfixes
2016-03-08 17:28:57 -05:00
Fox-McCloud
2268e3c39e
Implements a Few Goon Sounds
2016-03-07 23:54:12 -05:00
Fox-McCloud
221ff8ee08
Implements Goon's Gibbing Sounds
2016-03-06 23:05:07 -05:00
Tastyfish
738e81f8df
A couple tweaks to the mime stuff
2016-03-06 04:57:03 -05:00
Tastyfish
d189d70f4a
Adds tranquillite
...
Changes Recitence to be approx on par with Honker
Adds invisible wall barrier
2016-03-06 01:49:30 -05:00
TheDZD
4b610d8dda
Merge pull request #3758 from Fox-McCloud/remove-halloss
...
Removes Halloss
2016-03-05 22:39:19 -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
Fox-McCloud
4d9627e986
Removes Halloss
2016-03-03 23:26:41 -05:00
Crazylemon
8e63a9eea3
Merge branch 'master' of github.com:ParadiseSS13/Paradise into human_icons_tweak
2016-03-03 16:20:15 -08: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
Crazylemon64
7e510dfdb6
Changing a person's appearance now works better
...
Also fixes some problems on changing gender
2016-02-29 19:31:29 -08:00
Fox-McCloud
e2bb00a5b1
Miming Refactor
2016-02-28 22:40:00 -05:00
FalseIncarnate
d66624e7bd
Prize Counter and Toy Fixes
...
Prize counters now spend your tickets when you purchase something
- Had removed the ticket spending during my testing, forgot to re-add it
before submit
Toy Crossbows now properly display the name of their user when they
"start scrounging for ammo"
Water balloons can now be filled from sinks, ANY reagent dispenser
structure (not just watertanks), and drinking glasses in addition to
beakers and buckets.
- Watch out for security hurling pepper-spray balloons!
2016-02-27 11:06:42 -05:00
TheDZD
7caf8d8a5e
Merge pull request #3696 from Fox-McCloud/whetstone
...
Ports Whetstones
2016-02-26 17:48:38 -05:00
FalseIncarnate
a4b1f361a5
Buildable Prize Counter Boards and Non-silent Rocks
...
Fixes Prize Counter circuit boards not being listed in the circuit
imprinter despite having the required research levels
Fixes #3694
2016-02-25 22:44:21 -05: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
Fox McCloud
8d092d226a
Merge pull request #3678 from VampyrBytes/Lockboxes
...
prevents autoequip to locked lockboxes
2016-02-24 02:04:03 -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
Tastyfish
4f3ce4ecbc
Adds picture frames
2016-02-21 21:00:45 -05: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
f56914781d
Merge pull request #3651 from Tastyfish/better-name-edit
...
Refactors renaming so it works consistently
2016-02-20 17:51:43 -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
TheDZD
84f01d99b9
Merge pull request #3627 from VampyrBytes/adminreagents
...
fixes #3615
2016-02-19 22:47:00 -05:00
Tastyfish
85cfccf2d9
Refactors renaming so it works consistently
2016-02-19 21:03:33 -05: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
fe78b45b41
Merge pull request #3578 from Tastyfish/pda-apps
...
Complete refactor & partial redesign of the PDA
2016-02-18 13:39:37 -05:00
Fox McCloud
1dc0b8ffbd
Merge pull request #3620 from Tastyfish/catwalks
...
Fixed a couple catwalk / rod things.
2016-02-18 13:37:26 -05:00
