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
Tastyfish
5b76727d73
Changes neurotoxin drink name because of name clash with supertoxin
2016-03-03 15:26:55 -05:00
Fox-McCloud
33f0d59d9d
Ensures there are Potatoes
2016-02-29 07:11:06 -05:00
Tastyfish
aed9859b9a
Fixes a bunch of things to not circumvent SetStun/SetWeaken/SetParalyse that has no business doing so.
2016-02-28 01:11:36 -05:00
TheDZD
21b7ccbdba
Merge pull request #3717 from Fox-McCloud/silence
...
Fixes Capulettium Plus
2016-02-26 19:56:54 -05:00
Fox-McCloud
eebdcb693b
Fixes Capulettium Plus
2016-02-26 18:54:44 -05:00
Fox McCloud
bc33bfdda6
Merge pull request #3689 from FalseIncarnate/kitchen
...
Cocoa Spelling and Relative Pathing Cleanup
2016-02-25 17:01:25 -05:00
Aurorablade
5f98feb0bc
meanwhile as i driver tiger INSANE
2016-02-25 16:17:39 -05:00
FalseIncarnate
978722c891
Returns chocolate milk recipe to normal
...
Reverts/fixes an accidental change that would cause issues with making
chocolate bars
2016-02-24 16:44:25 -05:00
FalseIncarnate
d2ae37c540
Cocoa Spelling and Relative Pathing Cleanup
...
Standardized the spelling of "Cocoa", as this was inconsistent
- One spot refers to it as cacao still, but that is because it is in the
legit latin scientific name. Everything else is now cocoa (not coco).
Chocolate now will provide some nutrition (and make you fat if you eat a
lot)
- Cocoa Powder (the arguably main component of chocolate) provided
nutrition, but that nutrition mysteriously vanished when you combine it
with milk and sugar. Now chocolate provides the same nutrition as the
cocoa powder in it
Merged a number of cases where foods had both chocolate and cocoa to now
have just chocolate
- In the case where both were present, the volumes were combined to
maintain food sizes
Renamed cocoa pile to chocolate pile, as this was wrong
- The cocoa pile claimed to be a pure cocoa powder pile, but was
actually just chocolate that was dumped on the floor.
Removed a fair amount of relative pathing, but there's still more to go.
2016-02-24 16:34:23 -05:00
Aurorablade
9a804ebd31
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor
2016-02-24 06:27:16 -05:00
Mieszko Jędrzejczak
2812daf59b
Removed some redundant code that was already under ethanol
2016-02-23 00:55:46 +01:00
Mieszko Jędrzejczak
c184c6a65a
Names. Again.
2016-02-23 00:41:26 +01:00
Mieszko Jędrzejczak
d3573135d2
Fixed fixed spans.
...
Turns out they weren't fixed afterall...
2016-02-23 00:27:05 +01:00
Mieszko Jędrzejczak
2de6d5fbdd
Name to synthanol, again.
2016-02-23 00:02:21 +01:00
Mieszko Jędrzejczak
10202ac78d
Made it child of ethanol
...
Synthanol is now a child of ethanol. Cheers!
2016-02-22 23:19:00 +01:00
Mieszko Jędrzejczak
3aa923b7da
Fixed spans when drinking/feeding
2016-02-22 16:29:55 +01:00
Mieszko Jędrzejczak
90d90f3571
Added files via upload
2016-02-21 18:48:54 +01:00
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
