Commit Graph

572 Commits

Author SHA1 Message Date
Ryan784
a52092b294 Fixes #1789 and most alt-clicking related bugs (#1808)
Fix for the alt-clicking related bugs; users being able to alt-click and
have it work regardless of distance.
2017-02-24 19:30:09 +02:00
NanakoAC
6e16ad88ff Nanako's cooking rework (#1743) 2017-02-17 20:08:45 +02:00
Alberyk
5a355914fc Port bay newest loadout system (#1648)
-ports bay newest loadout system, which is pretty much a tab of their own, with different sections instead of a single list
-adds code that allows for several tweaks of custom loadout, like color, item path and contents
-adds dumb lunchboxes that can be filled with some food selection
-adds the option to select pre-filled vacuum-flasks or flasks
-also tries to fix the issues with xeno gear again
2017-01-29 21:52:09 +02:00
Lohikar
0cba68911d Lighting Overhaul & General process improvements (#1612)
This is it. The big one.
Risk: Very large. This modifies or rewrites several important systems.
Some things still need balancing, but that's probably better done if/when this hits dev.

changes:

New smooth lighting system.
Machinery split into three processes: machinery, powernet, pipenet Removed due to breakage. Refactored into multi-step process.
Mob process rewritten.
NanoUI process rewritten.
Objects process rewritten.
Tweaked color output of station lights.
Slime core lights now emit colored light.
Fixed light update frequency issue with fire alarms, hydroponics trays, and airlocks.
Increased light emission from bolted airlocks.
Miscellaneous performance improvements.
New datum pool implementation.
New lighting usage profiler.
Lighting system now tracks UV light, which is not visible to players.
Space now has a parallax effect.
Disabled Spin View verbs due to incompatibility with the new lighting system.
Disabled hallucination view spin due to incompatibility with the new lighting system.
Lighting system now initializes in the lobby before the round starts to reduce BoR deadtime.
Added UV light tracking to lighting engine; dionae now gain energy exclusively from UV light.
Added colored lighting to a few consoles that used default (white) light.
2017-01-29 01:13:54 +02:00
Alberyk
59584ae772 Tray, paper bin and bottle fixes (#1631)
- Fixes #1630 
-fix juggernauts breaking the shit out of door real fast
-fix trays having literaly no delay when smacking someone with one
- Fixes #1628 
-changes the recipe of sbiten, because it makes literaly zero sense for it to use vodka instead of mead, also added a bottle of it, spritted by datberry
-fixed bottles spawning without a name and icons on the cargo spawn, the base objects for bottles are just empty bottles now
-fix missing eye tape on mob sprite
-remove the last bit of "you can't fire a gun on help intent"
2017-01-23 23:41:33 +02:00
Alberyk
68dc556434 Automatic pistol, nutriment and sprites fixes (#1617)
-fix #1217
-fix being unable to put the tactical pistol into belts/holsters, also remove needless code from it
-fix the scout rifle not accepting other magazines
-fix the hardsuit nutriment being useless and just dealing minor toxin damage
-fix missing tactical masks and tapes from unathi and tajaran sprites
-fix tapes cuffs, blinders and etc not updating when equiped to said mob
-some extra tweaks to the hud code
2017-01-21 17:23:11 +02:00
LordFowl
93143a8e45 Vaurca Update Dec2016 (#1289)
Adds Vaurca subspecies and a whole slew of content related to them. Also, custom organs for them.
2016-12-25 01:11:09 +02:00
NanakoAC
6cef8c9074 Attack Proc fixes (#1259)
Baymerge changed the attack proc, i think by removing a default value, and a lot of things broke because they weren't using the function correctly.

This proc does three main things.

Adds a default to /obj/item/proc/attack to target the chest when no target zone is supplied.

Fixes the lack of a target zone in many attack procs, properly defining it so it'll get passed to the parent, and ensure that bodypart-specific targeting works.

Removes most instances of code to retrieve the user's selected zone, and instead to use the zone passed into the attack function. saves duplication of effort.
2016-12-24 03:34:23 +02:00
skull132
cdd4772177 Merge branch 'master' into merge/level_dev_master
# Conflicts:
#	code/game/machinery/vending.dm
#	maps/exodus-1.dmm
#	maps/exodus-2.dmm
2016-12-19 00:23:19 +02:00
skull132
9b094ad0eb Merge branch 'upstream/development' into development
# Conflicts:
#	code/_helpers/time.dm
#	code/game/objects/items/devices/floor_painter.dm
#	code/game/objects/items/stacks/medical.dm
#	code/global.dm
#	code/modules/cargo/randomstock.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/paperwork/faxmachine.dm
2016-12-18 01:06:45 +02:00
LordFowl
c46ae8cb42 Christmas Update (#1203)
Several minor mapping changes, basically accounting to stringing up christmas lights and wreaths. Some chairs and tables were removed to make way for glorious Christmas Tree. May their sacrifices be well remembered.
2016-12-06 17:01:21 +02:00
Bedshaped
5cddb85f6e Fixes #1164 (#1166) 2016-11-18 22:01:24 +02:00
inselc
da2f74a9ff Bugfixes: Fax machines, CentCom turrets, Robo-limb emag. New feature for monkey cubes (#1116)
Fixes #1059, #131 
Resolves #1020 
Fixes #1100 
Resolves #663
2016-11-06 20:34:29 +02:00
skull132
e9b688e1f6 Merge branch 'development-2' into development
Christ on a stick. SO MANY ERRORS. REEE.

# Conflicts:
#	baystation12.dme
#	code/_helpers/lists.dm
#	code/_helpers/logging.dm
#	code/_helpers/text.dm
#	code/_onclick/click.dm
#	code/controllers/configuration.dm
#	code/controllers/master_controller.dm
#	code/datums/supplypacks.dm
#	code/game/antagonist/antagonist.dm
#	code/game/antagonist/antagonist_print.dm
#	code/game/antagonist/outsider/commando.dm
#	code/game/antagonist/outsider/ninja.dm
#	code/game/area/areas.dm
#	code/game/gamemodes/cult/cult_items.dm
#	code/game/gamemodes/game_mode.dm
#	code/game/jobs/access.dm
#	code/game/machinery/atmoalter/canister.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/mecha/mech_fabricator.dm
#	code/game/mecha/mecha.dm
#	code/game/objects/effects/spiders.dm
#	code/game/objects/items.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/flash.dm
#	code/game/objects/items/devices/lightreplacer.dm
#	code/game/objects/items/devices/paicard.dm
#	code/game/objects/items/devices/scanners.dm
#	code/game/objects/items/devices/suit_cooling.dm
#	code/game/objects/items/devices/uplink.dm
#	code/game/objects/items/robot/robot_upgrades.dm
#	code/game/objects/items/toys.dm
#	code/game/objects/items/weapons/cards_ids.dm
#	code/game/objects/items/weapons/handcuffs.dm
#	code/game/objects/items/weapons/manuals.dm
#	code/game/objects/items/weapons/material/kitchen.dm
#	code/game/objects/items/weapons/material/misc.dm
#	code/game/objects/items/weapons/material/swords.dm
#	code/game/objects/items/weapons/melee/energy.dm
#	code/game/objects/items/weapons/melee/misc.dm
#	code/game/objects/items/weapons/scrolls.dm
#	code/game/objects/items/weapons/storage/belt.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/tools.dm
#	code/game/objects/objs.dm
#	code/game/objects/structures/crates_lockers/closets.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/game/objects/structures/janicart.dm
#	code/game/sound.dm
#	code/game/turfs/simulated.dm
#	code/game/verbs/ooc.dm
#	code/global.dm
#	code/modules/admin/verbs/debug.dm
#	code/modules/admin/verbs/modifyvariables.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/clothing.dm
#	code/modules/clothing/head/hardhat.dm
#	code/modules/clothing/head/helmet.dm
#	code/modules/clothing/head/jobs.dm
#	code/modules/clothing/head/misc_special.dm
#	code/modules/clothing/shoes/jobs.dm
#	code/modules/clothing/spacesuits/alien.dm
#	code/modules/clothing/spacesuits/captain.dm
#	code/modules/clothing/spacesuits/miscellaneous.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces.dm
#	code/modules/clothing/spacesuits/rig/suits/alien.dm
#	code/modules/clothing/spacesuits/spacesuits.dm
#	code/modules/clothing/spacesuits/void/merc.dm
#	code/modules/clothing/spacesuits/void/void.dm
#	code/modules/clothing/suits/armor.dm
#	code/modules/clothing/suits/jobs.dm
#	code/modules/clothing/suits/storage.dm
#	code/modules/clothing/suits/utility.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/clothing/under/jobs/security.dm
#	code/modules/economy/Events.dm
#	code/modules/economy/Events_Mundane.dm
#	code/modules/economy/economy_misc.dm
#	code/modules/events/blob.dm
#	code/modules/events/event.dm
#	code/modules/events/event_container.dm
#	code/modules/events/event_manager.dm
#	code/modules/events/money_lotto.dm
#	code/modules/events/prison_break.dm
#	code/modules/events/spacevine.dm
#	code/modules/hydroponics/trays/tray.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/emote.dm
#	code/modules/mob/holder.dm
#	code/modules/mob/language/station.dm
#	code/modules/mob/living/bot/cleanbot.dm
#	code/modules/mob/living/carbon/alien/diona/diona.dm
#	code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
#	code/modules/mob/living/carbon/give.dm
#	code/modules/mob/living/carbon/human/emote.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/outsider/vox.dm
#	code/modules/mob/living/carbon/human/species/station/golem.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/carbon/metroid/metroid.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_defense.dm
#	code/modules/mob/living/living_defines.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/admin.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/drone/drone.dm
#	code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
#	code/modules/mob/living/silicon/robot/emote.dm
#	code/modules/mob/living/silicon/robot/robot_items.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
#	code/modules/mob/living/silicon/silicon.dm
#	code/modules/mob/living/simple_animal/bees.dm
#	code/modules/mob/living/simple_animal/friendly/cat.dm
#	code/modules/mob/living/simple_animal/friendly/corgi.dm
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	code/modules/mob/living/simple_animal/friendly/mouse.dm
#	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/simple_animal.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob.dm
#	code/modules/mob/mob_grab_specials.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_alien.dm
#	code/modules/organs/organ_external.dm
#	code/modules/paperwork/faxmachine.dm
#	code/modules/projectiles/ammunition/boxes.dm
#	code/modules/projectiles/ammunition/bullets.dm
#	code/modules/projectiles/guns/energy/nuclear.dm
#	code/modules/projectiles/guns/energy/rifle.dm
#	code/modules/projectiles/guns/energy/special.dm
#	code/modules/projectiles/guns/projectile.dm
#	code/modules/projectiles/guns/projectile/automatic.dm
#	code/modules/projectiles/guns/projectile/pistol.dm
#	code/modules/projectiles/guns/projectile/revolver.dm
#	code/modules/projectiles/guns/projectile/shotgun.dm
#	code/modules/projectiles/projectile/bullets.dm
#	code/modules/projectiles/projectile/special.dm
#	code/modules/reagents/reagent_containers.dm
#	code/modules/reagents/reagent_containers/food/drinks.dm
#	code/modules/research/designs.dm
#	code/modules/research/destructive_analyzer.dm
#	code/modules/research/rdconsole.dm
#	code/modules/spells/artifacts.dm
#	code/modules/spells/spellbook.dm
#	code/modules/tables/tables.dm
#	code/world.dm
#	config/example/config.txt
#	icons/mob/items_lefthand.dmi
#	icons/mob/items_righthand.dmi
#	icons/obj/lighting.dmi
2016-10-31 00:01:52 +02:00
skull132
1910f487af Conflict clearance, vol deux. 2016-10-07 00:59:00 +03:00
skull132
87e041aa75 Merge remote-tracking branch 'bay12-upstream/master' into development 2016-10-07 00:58:39 +03:00
NanakoAC
f01c7b68f8 Borg Gripper and Module Tweaks (#985)
Fills in some strange holes in cyborg functionality, fixing several borgs that were not quite fit at doing their jobs:

-Adds rolling pin and knife to service borgs; should allow them to cook a full range of foods. I've been getting regular nagging about this one from the community
-Adds the ability to pick up assemblies for engineering/research borgs, allowing them to construct some complex devices, notably bots and motionsensing cameras.
-Several items added to research borg: Dropper and reagent scanner, for chemistry, pen for renaming bots and writing research notes, and a plant bag for working in xenoflora
-Added altclick functionality for setting transfer rates on beakers. Essential for chemistry and cooking, since borgs can't use rightclick verbs on gripped items.
2016-09-25 17:28:39 +03:00
NanakoAC
4c0ce0acc3 Fixes #970, fixes #953 (#978) 2016-09-21 07:04:23 +03:00
NanakoAC
a5478a5360 Animal Tweaks: Second attempt (#849)
* Merge branch 'AnimalTweaks_Fix4' into AnimalTweaks_Fix5

# Conflicts:
#	code/modules/mob/living/living.dm

* REMOVED VENT THINGS FROM CHANGELOG

* switch statement for helper
2016-09-12 07:06:40 +01:00
James Smith
b4369f3a1d RPE fixes/upgrades (#890)
The RPED now functions properly in more cases, including the destructive analyzer. It can also now intake beakers for rapid exchange on machines that use them.
2016-09-11 01:39:41 +03:00
NanakoAC
5d91bf1698 Medical/Cyborg Tweaks (#864)
changes:

tweak: "Surgeon and Crisis cyborg modules renamed to Medical and Rescue, Janitor cyborg module renamed to Custodial."
tweak: "Tweaked equipment of cyborg modules."
rscadd: "Grippers can now grab valid items inside any unsecure container"
2016-09-07 10:11:10 +02:00
NanakoAC
75e13303ea Medical, borg and misc tweaks (#714)
tweak: "Tweaked surgeon cyborg modules: Added chemistry gripper, removed fire extinguisher, and added soporific to their hypospray."
tweak: "Removed chemistry gripper from crisis borg."
maptweak: "The chemistry and botany fridges are now see-through, so you can more easily chat with people on the other side."
tweak: "Cost of cyborg renaming module vastly decreased"
tweak: "Renamed medical's Chemical Closet, to Chemistry Equipment Closet. Nobody ever stores chemicals in an unrefridgerated closet."
rscadd: "Added two boxes of empty spraybottles to the chemistry equipment closet."
2016-08-15 19:51:23 +03:00
Alberyk
14c6b05842 Autolathe additions, combat hyposprays and tommyguns to the uplink (#735)
Adding more ammo options to the autolathe, as well suit cooling units for ipcs, the tommy gun for tators and fixing some borked crate prize at mining.
2016-08-15 00:37:08 +03:00
Bedshaped
77b3b01847 Bloodpack and IV drip additions (#627) 2016-08-14 22:04:14 +03:00
Alberyk
3ad27e826a Fixing unathi snack descriptions (#705)
Because, confusion happened and it is getting fixed.
2016-08-10 23:51:30 +03:00
NanakoAC
305ab8dd37 Feeding and squeaking tweaks (#681)
An extension based on live testing yesterday. 
Reduced the volume of mouse squeaks a bit, fixed Ian's automated feeding, and addded a couple new food related features to him

I made his scan delay drop when food is around, but scale up to a slower-than normal value if left alone, and added checking for held food. As well as tweaking some food-related vars on corgis
2016-08-05 15:21:41 +03:00
NanakoAC
ecf8425a19 Animal Feeding and Hunger (#634)
changes:

rscadd: "Added hunger and feeding system for simple animals, this includes cats, dogs, mice, lizards, chickens, cows, etc"
rscadd: "Animals can now actually consume food instead of nibbling them eternally."
rscadd: "Animals can now be hand-fed by using food on them."
rscadd: "Animals will move more slowly when starving. Examining an animal will show if its hungry."
Basically added a very simple metabolising system for animals, and fixed up various eating/feeding functions. They only metabolise food, any other reagents are just removed and ignored for now, since most chemicals were designed for carbon mobs and often aren't valid
2016-08-02 21:43:03 +03:00
Alberyk
04e7ef4580 Adding unathi snacks (#621)
Kinda of Jackboot's idea, also Araskael sprited those.
2016-07-24 23:55:17 +03:00
NanakoAC
b7291faccd Voidsuit Naming Fix (#580)
Fixed many little instances where voidsuits were wrongly referred to as hardsuits
2016-07-24 23:50:36 +03:00
NanakoAC
92ba70df81 Alcohol Tweaks (#530)
- bugfix: "Fixed dizziness effects on alcohol, psilocybin, and cryptobiolin taking a long to start up and sometimes never starting for low doses"
  - tweak: "Sip size from alcohol bottles is now the same as for glasses, which is half what it was"
  - tweak: "Rebalanced all alcoholic drinks with more believable alcohol values, and adjusted alcohol metabolism. Generally drinks are stronger but metabolise more slowly, pace yourself!"
  - rscadd: "Different species now have varying susceptibility to alcohol. Tajarans get drunk slightly faster, skrell are twice as fast as humans, unathi can drink more, and vaurca get drunk very slowly, but alcohol poisons them"
  - bugfix: "Dousing people in alcohol and setting them on fire, now only works with spirits and liqeurs stronger than 40% ABV, and the heat of the resulting fire is based on the strength"
2016-07-12 14:53:15 +03:00
skull132
443a49a49b Merge branch 'master' into development 2016-07-10 14:25:54 -04:00
LordFowl
a6c1085e37 Fowl's Bugfixes 1 (#521) 2016-07-10 01:13:29 +03:00
skull132
5006341832 Merge branch 'master' into development 2016-07-05 16:15:39 -04:00
NanakoAC
1ecd7629ae Safeties for sprays, fixes #403 (#516)
Pepperspray no longer makes a spraying sound when the safety is on
Spraybottles can now be locked with an alt click
2016-07-05 23:33:56 +03:00
Alberyk
fe50c59d19 Adding unique drinks from old code (#452)
Porting some unique alcohols from the old code.
2016-07-05 21:21:48 +03:00
Alberyk
800c207e2d Fix #460 (#501)
No more lethal syringe invisible sprite. This should fix #460 .
2016-06-30 01:34:35 +03:00
LordFowl
56e288e910 Vaurca Content 2 (#426)
Vaurca hivemind language added.
Vaurca appropriate name generator added.
Tied Vaurca language to their neural socket organ.
Added a method for non-Vaurca to intercept the Vaurca hivenet so long as they construct the correct item.
Sprites for Vaurca organs.
Neutered all Vaurca.
Cutting open a Vaurca for surgery now requires heavier equipment.
Injecting a Vaurca with a syringe now will take time.
Adds various Vaurca cosmetic items available via loadout.
Adds a few new burst-fire weapons exploiting the burstfire fix - obtainable via research or adminbus.
Ports the ability to stick heads on spears from Paradise-code.
Added an error message when trying to bite someone before the cooldown expires.
Removed spoken Vaurca language.
Heavily nerfed K'ois' properties.
Halved the nutrition value of nutriment, returning it to old-code state.
Nerfed the damage dealt by bite, while reducing the cooldown.
Fixed burstfire weapons spamming attack messages when fired, allowing for more automatic weapons.
Fixed Vaurca player ability to select coloured eyes.
2016-06-24 14:55:44 +03:00
NanakoAC
6881213b75 Nutrition Rearranging, Skrell and Unathi diets (#331)
* Nutrition Rearranging, Skrell and Unathi diets

*Rearranged nutrition code a little - Added a Digest proc and put the
three stat changing lines in there (blood, nutrition, healing) to
standardise it. and reduce code duplication
*Added blood_factor and regen_factor variables to nutriment, to easily
set how much bloodrestore or healing an inherited food will do. This
reduces numeric literals in code
*protein now has a blood factor of 12 instead of 6
*Unathi now cannot digest nutriment, it will do nothing.
*Added seafood protein as a descendant of protein.
*Skrell can safely eat seafood protein (By Senpai Jackboot's request)
*Space Carp, and all recipes made with carp fillets, now contain seafood
protein instead of animal protein, and thus are safe for skrell to eat.
*Skrell are now immune to carpotoxin

* Altered Carpotoxin immunity

After feedback from senpai jackboot, carpotoxin is taken away from
skrell, and given to unathi instead.
2016-05-30 23:29:56 +03:00
NanakoAC
a96d655632 Fixed Sterilizine not sterilising wounds. Also tweaked spraybottle message visibility
*Sterilizine will now reduce the germ level of all wounds on the mob on
contact, proportional to the quantity sprayed
*Spraybottles will now display the "<Person> sprays <otherperson> with
the <spraybottle>" message when spraying on any mob
2016-05-22 10:53:04 +01:00
skull132
af73877426 Merge pull request #310 from skull132/vampire_rewrite
Vampire rewrite
2016-05-18 22:03:04 +03:00
LordFowl
f85e66640b Compatibility Patch
Modifies grown.dm, station.dm, snacks.dm, and preferences.dm to be
compatible with the latest devbuild.
2016-05-05 20:32:40 -04:00
LordFowl
c7ca0887e7 Vaurca Changes
Various vaurca-based changes, as detailed in the changelogs.
2016-05-05 19:10:05 -04:00
skull132
3e8ac5ee39 Vampire Re-write: Block 1
The largest chunk of this rewrite.

Reworks the vampire powers, and makes them completely modular, as with changeling. Also adds a few powers, and so on.

A massive list of TO-DOs remains.
2016-04-26 20:29:14 +03:00
skull132
3d3dbcb8f0 JMP logs for days
Adds JMP messages to most forms of physical attacks.
2016-03-25 18:27:37 +02:00
skull132
fe48f26d71 Porting forensics from Aurora. 2016-02-01 17:08:47 +02:00
PsiOmegaDelta
1c04164a2a Can now expand monkey cubes.
Apparently open containers don't call afterattack. Marks monkey cubes as closed. Fixes #12085.
2016-01-31 14:19:54 +01:00
PsiOmegaDelta
21c8920271 Fixes food and radiocarbon spectrometer reagent injection.
Fixes #11913. Fixes #12048.
2016-01-27 11:22:46 +01:00
Ryan784
5f655dbbdb Vampire Gamemode Developement Test
The Vampire gamemode, as ported right now. The gamemode is in, as well
as creating a vampire through the traitor panel. All abilities seem to
function, unable to test enthrall however (though I have a feeling it
will have to be redone). Enthralling someone without a CKey will give
you the correct response, however.

Any abilities having to do with lums will need to be redone. Vamphud as
well.

If looking over this and pointing out errors/fixing is faster than
simply porting it yourself, then feel free to do so!
2016-01-20 22:14:21 -05:00
Hubblenaut
0aa4f10013 Center_of_mass for snacks/dishes 2016-01-17 16:12:02 +01:00
PsiOmegaDelta
e745093acc Corrects snack macros. 2016-01-14 08:42:24 +01:00