Razgriz
de24521619
First merge from upstream
2020-01-13 17:23:01 -07:00
Razgriz
aa71656f97
Standards conformation
2020-01-11 03:50:10 -07:00
Sharkmare
f568be89d9
The cake, Serg event. ( #120 )
...
Adds items for an event, Made by Shadowfire117 and Ketrai
2020-01-11 00:20:57 +01:00
Hawk_v3
a48b6f7cb2
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
Cerebulon
183b1d99b1
Coffee Shop Revamp
2019-12-22 22:54:01 -05:00
Hawk_v3
8654b6bdf4
Merge remote-tracking branch 'upstream/master'
2019-07-19 22:05:31 +01:00
Unknown
45577f8c34
Microwave was too fast, fixed.
2019-07-04 21:48:36 -04:00
Unknown
a5961d8e0e
Ease of Eating Changes
...
On request from Duke
- Microwave cooking times cut to 25% of normal times
- You now need 1/5 of the amount of clonexcadone for meat
- Cargo pizzas start out cooked
2019-07-04 21:32:52 -04:00
Hawk_v3
41f0bd9f6d
Merge remote-tracking branch 'upstream/master'
2019-04-14 19:44:13 +01:00
Novacat
466516b066
Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"
2019-04-08 15:24:27 -04:00
Repede
e4dd365fe1
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/controllers/subsystems/mapping_vr.dm
# code/datums/datum.dm
# code/datums/datumvars.dm
# code/datums/supplypacks/voidsuits.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/defib.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/world.dm
# code/modules/client/preference_setup/loadout/loadout_accessories.dm
# code/modules/client/preference_setup/loadout/loadout_eyes.dm
# code/modules/client/preference_setup/loadout/loadout_head.dm
# code/modules/client/preference_setup/loadout/loadout_suit.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/food/food/snacks.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/reagents/Chemistry-Recipes.dm
# code/world.dm
# config/custom_items.txt
# config/example/config.txt
# config/example/game_options.txt
# icons/mob/robots.dmi
# icons/obj/mining.dmi
# maps/submaps/surface_submaps/wilderness/wilderness.dm
# vorestation.dme
2019-04-07 19:40:12 -04:00
Heroman
5a9e1f1566
Ports some fixes
2019-04-07 14:02:34 +10:00
Heroman
b11015107c
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
kevinz000
6415e4193f
[READY]Makes a bunch of processes subsystems instead
2019-03-27 16:03:51 -04:00
Unknown
a92eb4a414
Reverts to Polaris File
2019-03-27 12:50:51 -04:00
Neerti
373e1c766a
Fixes infinite microwave sound when recipe fails
2019-03-27 12:45:09 -04:00
Unknown
4e67e1b9ab
Conflict Resolution
2019-03-27 04:11:30 -04:00
Anewbe
09b01407e3
Adds Various Sounds, Looping Sound System
2019-03-27 03:55:21 -04:00
Atermonera
131636b1d2
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
Spades
6e2172a5ae
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
Spades
c6c7d98a2d
Merge branch 'master' into upstream-merge-5735
2019-01-14 11:20:55 -05:00
Spades
1338225afa
Resolves some merge conflicts
2019-01-05 16:29:19 -05:00
Hawk_v3
b6988c5a09
Merge remote-tracking branch 'upstream/master'
2018-12-15 19:37:28 +00:00
Unknown
b48efb138f
More merge conflict fixes
...
I think I got them all.
2018-12-13 00:33:32 -05:00
kevinz000
fc178c1e04
Makes math helpers defines for performance
2018-12-06 16:15:00 -05:00
Atermonera
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
Hawk_v3
eac48b5283
Merge remote-tracking branch 'upstream/master'
2018-10-24 22:07:16 +01:00
Shophaune
fad2beb82e
Fixes duplication of corpses by holding and then cooking ( #5693 )
...
* Add files via upload
* Revert "Merge pull request #1 from Shophaune/plant-bag-ui-bug-fix"
This reverts commit 62a60d4f87774508621506b347c679191e1a242f, reversing
changes made to 6f909ce590
2018-10-22 20:54:02 -04:00
Hawk_v3
71b8f6582d
Merge remote-tracking branch 'upstream/master'
2018-10-16 22:10:17 +01:00
Arokha Sieyes
ce187f64ed
Fixup other vorestation things
...
Stop using the web editor please
2018-10-16 12:05:32 -04:00
Anewbe
12e34de332
Move almost everything food related into the kitchen module.
2018-10-15 15:47:14 -04:00
