ZomgPonies
1bd2acf0d0
Revert "More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues."
...
This reverts commit 95b069b7d4
2014-07-30 00:16:53 -04:00
Zuhayr
95b069b7d4
More adjustments. Implemented gas exuding/consumption (currently unused). Implemented cuttings, fixed some issues.
2014-07-29 14:44:34 -04:00
Zuhayr
a7ffa5747b
Fixed diona pods being mutable, fixed a few other tweaks, added cuttings.
2014-07-29 14:44:15 -04:00
Zuhayr
0e3e46e310
Fixes some transposed values.
2014-07-28 13:49:37 -04:00
Zuhayr
d1059b488b
Bevy of newhydro fixes.
...
Conflicts:
code/game/machinery/vending.dm
code/modules/projectiles/guns/energy/special.dm
icons/obj/hydroponics.dmi
2014-07-28 13:49:18 -04:00
ZomgPonies
7840276f63
We use a different methodology for respawning as NPCs.
2014-07-26 14:50:24 -04:00
Zuhayr
c0ba021bcd
Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
...
Conflicts:
code/datums/supplypacks.dm
code/game/machinery/hydroponics.dm
code/modules/reagents/reagent_containers/glass.dm
code/modules/reagents/reagent_containers/spray.dm
maps/tgstation2.dmm
2014-07-26 14:03:46 -04:00
Zuhayr
5a773dba35
Fixed seeds not showing up properly in the vendor.
2014-07-26 13:55:36 -04:00
ZomgPonies
99c96c0c9c
Let's stay up to date with Zuzu's PR shall we?
2014-07-26 12:04:54 -04:00
Zuhayr
ebb9f724aa
Hydroponics rewrite, details will be in PR. Big commit.
...
Conflicts:
baystation12.dme
code/controllers/master_controller.dm
code/game/gamemodes/events/spacevines.dm
code/game/machinery/seed_extractor.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/mob.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/food/snacks/grown.dm
icons/obj/hydroponics.dmi
maps/tgstation2.dmm
2014-07-25 11:10:01 -04:00
Zuhayr
13797e99ed
New machines, adjusted Cael's seeds, rewrote space vines.
...
Conflicts:
code/defines/obj/hydro.dm
code/game/machinery/hydroponics.dm
code/modules/hydroponics/grown_inedible.dm
code/modules/hydroponics/hydroitemdefines.dm
2014-07-25 10:06:19 -04:00
Jesus Hussein Chris
95f7280781
Generic attack sounds for all melee weapons
...
Overrides the generic sounds with more suitable ones where needed.
Weapons that do no damage don't have sound effects.
Conflicts:
code/game/gamemodes/wizard/artefact.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/weapons/melee/misc.dm
code/game/objects/items/weapons/storage/toolbox.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/items/weapons/weaponry.dm
code/game/objects/weapons.dm
code/modules/hydroponics/hydroitemdefines.dm
code/modules/surgery/tools.dm
2014-01-22 10:15:43 -05:00
