Repede
4cf7f71be6
Merge branch 'release' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/area/Away Mission areas.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/items/weapons/teleportation.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/events/event_container_vr.dm
# code/modules/mining/ore_box.dm
# code/modules/paperwork/paper.dm
# code/modules/rogueminer_vr/zone_console.dm
# config/custom_items.txt
# icons/mob/items/lefthand_suits.dmi
# icons/mob/items/righthand_suits.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/suits.dmi
# maps/tether/tether_defines.dm
2020-02-22 12:38:04 -05:00
Novacat
4f4a29b5fc
Merge pull request #6568 from VOREStation/stream
...
Remove use of <<
2020-02-14 09:34:12 -05:00
Heroman3003
718feb1ebe
Adds pineapple pizzabox ( #6682 )
2020-02-13 17:11:43 -05:00
Atermonera
cae97cf4c0
Merge pull request #6659 from Darlantanis/MetamorphicPintGlas
...
Metamorphic Pint Glass
2020-02-13 00:31:59 -05:00
Arokha Sieyes
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
Novacat
33c13b4a28
Merge pull request #6551 from Heroman3003/pizza-un-nerf
...
Undoes unnecesary nerfs on pizzas
2020-02-10 00:48:02 -05:00
Heroman
292a403d6a
Undoes unnecesary nerfs on pizzas
2020-02-10 10:01:02 +10:00
Atermonera
c9e3257d17
2020 Civilian Wing Overhaul
2020-02-08 13:56:05 -05:00
izac112
933385020f
Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
...
# Conflicts:
# code/modules/mining/machine_stacking.dm
# Resolved
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm # Resolved mostly besides line 717 "plasteel: undefined var"
# even though the only change in this line is removing the comment
# icons/mob/widerobot_vr.dmi
# Resolved
# maps/tether/tether-07-station3.dmm
# Resolved
2020-01-31 18:23:50 +01:00
Atermonera
4e523c9b5e
Merge pull request #6649 from Trexdude/patch-1
...
Fixes Bagel Poppy Recipe
2020-01-25 22:16:18 -05:00
Schnayy
98d0b5a2bc
Adds drink sprites for missing ones. Replaces lemonade to match the other -ade drinks. ( #6644 )
2020-01-23 23:52:12 -05:00
Novacat
0679ed4042
Merge pull request #6481 from VOREStation/upstream-merge-6632
...
[MIRROR] Move Microwave recipes to their own subtype of the recipe datum.
2020-01-21 01:44:50 -05:00
Novacat
ae5fe87e38
Update microwave.dm
2020-01-21 01:36:15 -05:00
Novacat
1688d86772
Merge pull request #6478 from VOREStation/upstream-merge-6621
...
[MIRROR] Moar descriptions for things
2020-01-21 01:33:06 -05:00
Unknown
c6a709b5e4
Merge remote-tracking branch 'VOREStation/master' into upstream-merge-6632
2020-01-21 01:28:43 -05:00
Unknown
f163a60eed
Updoot
2020-01-21 01:24:28 -05:00
Novacat
c72899c7e6
Update microwave.dm
2020-01-21 01:13:37 -05:00
Atermonera
f7da338790
Move Microwave recipes to their own subtype of the recipe datum.
2020-01-21 00:35:38 -05:00
Atermonera
d10a72a77f
Adds a mega cooking recipe
2020-01-20 23:15:01 -05:00
Atermonera
9b93339969
Moar descriptions for things
2020-01-20 22:50:39 -05:00
Hawk_v3
20596d9787
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
Ketrai
28eb142141
Adds a recipe for food cubes
2020-01-08 19:45:49 +01:00
Ketrai
c8531c827f
Fixed conflicts. Adds water bottle to the machine coz logic.
2020-01-07 23:07:50 +01:00
Ketrai
9112a9a2b6
Food cubes
...
woop
removes a line of unneeded code
2020-01-07 22:51:12 +01:00
Hawk_v3
70711c03e1
Merge remote-tracking branch 'upstream/master'
2019-12-29 20:34:58 +00:00
Novacat
f2fb0d9f6a
Merge pull request #6360 from Ketrai/sharksbranch
...
Adds a new fish, measelsharks!
2019-12-29 15:11:46 -05:00
Hawk_v3
a48b6f7cb2
Merge remote-tracking branch 'upstream/master'
2019-12-29 19:01:58 +00:00
Ketrai
15c1c45b34
Makes it so you can use sharkmeat for fish-dishes
2019-12-23 17:57:13 +01:00
Cerebulon
183b1d99b1
Coffee Shop Revamp
2019-12-22 22:54:01 -05:00
Ketrai
0e65a0b8a6
Adds sharks
2019-12-22 17:32:49 +01:00
Hawk_v3
5b13642c12
Merge remote-tracking branch 'upstream/master'
2019-12-08 18:15:35 +00:00
TheFurryFeline
9c830286ef
Food Trash Fixy
...
Helllloooo? Roast beef's on a plate, not a hecking tray! Fixing the resulting trash.
Changelog notes:
- Changes Roast Beef trash to a plate, not waffles.
2019-11-30 15:23:55 -05:00
Hawk_v3
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00:00
Atermonera
a45472b446
Update Chat System to use to_chat(src, "") instead of src << ""
2019-11-05 19:22:38 -05:00
Hawk_v3
3c8cd11eac
Reupdated Station 1 map
2019-10-24 21:57:58 +01:00
Mechoid
169d8acedd
Medical Expansion
2019-10-19 23:28:38 -04:00
Unknown
9fbb5c247e
Glucose Container
2019-10-13 16:14:59 -04:00
Hawk_v3
b22f2284fe
Merge remote-tracking branch 'upstream/master'
2019-09-23 20:55:18 +01:00
Heroman
d82c986d0a
Makes sushi require fish meat
2019-09-20 05:59:16 +10:00
Hawk_v3
6d4ec50e08
Merge remote-tracking branch 'upstream/master'
2019-09-01 19:02:01 +01:00
Unknown
853f3964a3
Pathing errors
2019-08-31 00:57:37 -04:00
Unknown
9467621800
Fixes some errors
2019-08-31 00:35:19 -04:00
Unknown
0d73c8ad76
Early Polaris Ports
...
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434
No vorestation edit markings because they are polariscode ports.
2019-08-30 23:55:58 -04:00
Hawk_v3
0f3c802427
Merge remote-tracking branch 'upstream/master'
2019-08-22 21:32:01 +01:00
Mechoid
ae48659a68
Exploration Expansion 1: Or, How I Learned To Love The Tree
2019-08-21 17:23:07 -04:00
Heroman
4dc79f669e
Ports early fixes
2019-08-19 10:00:46 +10:00
Hawk_v3
0c85b3a4dd
Merge remote-tracking branch 'upstream/master'
2019-08-09 21:35:04 +01:00
Atermonera
0469a309cc
Adds NOCONDUCT to Some Items
2019-08-08 16:07:50 -04:00
Unknown
fb61850896
Mining/Explorer Tweaks
...
- ORM Vendor no longer provides phase pistols
- Steel Machete renamed to Plasteel Machete
- Industrial Hardsuit modules renamed to simply Hardsuit modules
- Adds some of the new mining stuff to the explorer vendor
- Fixes missing survivalfood flag from liquidprotein rations
2019-08-01 16:25:58 -04:00
Anewbe
ffeb6ba7eb
Merge pull request #6349 from MagmaRam/b52fix
...
Fixes the metamorphic glass sprite for the B-52
2019-07-28 14:00:16 -04:00
