Mieszko Jędrzejczak
a95ea95893
Update drinks.dm
2016-02-21 14:19:24 +01:00
Mieszko Jędrzejczak
23d33051fb
Beep Boop IPC booze
2016-02-21 13:19:18 +01: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
TheDZD
84f01d99b9
Merge pull request #3627 from VampyrBytes/adminreagents
...
fixes #3615
2016-02-19 22:47:00 -05:00
VampyrBytes
4272fb8729
takes unneeded iftype check out of for loop
...
also adds catch in case datum paths get sent through
2016-02-19 11:03:24 +00:00
Aurorablade
570dd619b7
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-18 19:01:41 -05:00
VampyrBytes
e25d9320bd
admin_only not adminOnly
2016-02-18 07:53:38 +00:00
Aurorablade
29293dde10
look ma no brain
2016-02-17 22:03:02 -05:00
VampyrBytes
bcfb77359f
reagent not regent
2016-02-17 19:07:56 +00:00
VampyrBytes
adf52304ee
fixes #3615
...
Reagents now have an admin only marker.
adminReagentCheck takes a list of paths and removes anything containing
admin only reagents
removed possibility of random drinks containing adminordrazine
2016-02-17 12:30:07 +00:00
Tastyfish
e27fb5d27f
Stops utensils from working on mouthless humanoids
2016-02-16 22:52:56 -05:00
Aurorablade
9a55bb11b9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-13 06:37:49 -05:00
FalseIncarnate
4d89ef5aba
Adds Chimichangas
...
💀 + 💩 + L
2016-02-12 01:17:43 -05:00
Aurorablade
545d3abf19
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-11 18:03:09 -05:00
TheDZD
3a9e13fdae
Merge pull request #3527 from Fox-McCloud/syndi-donk
...
Tweaks Syndicate Donk Pockets
2016-02-08 21:34:12 -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
Fox-McCloud
1f569053cc
Tweaks Syndicate Donk Pockets
2016-02-06 23:25:01 -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
2e244feb0c
Sink and Toilet Fixes
2016-02-06 01:25:52 -05:00
Crazylemon64
eba74c1392
Gives chemistry breathing room - moves welding tank to a wall-mount version
2016-02-05 03:20:57 -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
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
Aurorablade
25876fd036
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-02 15:35:54 -05: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
d75be4d0fd
For those who want to get off of Mr Bone's Wild Ride
2016-01-30 20:19:05 -08:00
Crazylemon64
be18146f08
Increases the number of memes in the codebase
2016-01-29 06:36:32 -08:00
Crazylemon64
9072a7075d
Skrell's alcohol weakness is tracked on the liver
2016-01-28 20:17:00 -08:00
Aurorablade
b2881bdc94
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-26 21:17:25 -05:00
Fox-McCloud
45433edc73
Fixes Kahlua, Silencer, and BananaHonk
2016-01-25 19:06:27 -05:00
Fox-McCloud
f5220f7ce3
Assault Surplus Create and Knife Refactor
2016-01-22 10:04:24 -05:00
Aurorablade
95dca71432
Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise ; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-21 21:11:26 -05:00
Aurorablade
51013b97c0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-01-15 08:10:24 -05:00
Fox-McCloud
0a9766314e
Monkey Cube Lag
2016-01-15 05:08:54 -05:00
Jey
37091bb2f3
- removed the throttle on monkeycube expansion.
2016-01-14 17:34:09 -05:00
Jey
f1e4e2a787
fix for monkeycube expand related lag.
...
changed the new human call instead of using set_species incidently dropping the number of delete from ~50 to ~10 per monkey cube.
added a limit to monkeycube expand to only expand one every 0.2 second instead of doing them all at once in the event of a mass expand.
2016-01-14 13:05:22 -05:00
TheDZD
c2ad89b0ec
Merge pull request #3200 from Fox-McCloud/clone-damage
...
Clone Damage Fix
2016-01-13 16:05:10 -05:00
Fox-McCloud
a746786ee0
Clone Damage Fix
2016-01-11 20:56:00 -05:00
Fox-McCloud
81da5906c8
even more optimization
2016-01-10 21:02:00 -05:00
Fox-McCloud
34fbc33c38
More Mutadone Optimizations
2016-01-10 19:35:54 -05:00
Fox-McCloud
f4b82fed69
Fixes Mutadone Causing Massive Performance Issues
2016-01-10 09:52:52 -05:00
TheDZD
bbcac90906
Merge pull request #3135 from Fox-McCloud/timestop
...
Timestop Spell Port and Sepia Slimes
2016-01-07 19:56:45 -05:00
Fox-McCloud
d6caea6aa0
Strange Reagent Fix
2016-01-07 16:16:45 -05:00
Fox-McCloud
ebdd9d3897
Timestop Spell Port and Sepia Slimes
2016-01-06 03:30:08 -05:00
