Shadowfire117
08a063d7f1
Update seed_storage_vr.dm
2020-02-24 22:46:09 +01:00
Atermonera
7006fc6fb1
Implements blacklist for specific plant sprites for random seeds
2020-02-24 16:02:21 -05:00
Shadowfire
8cf7d72641
Plant port
...
Ported Sapbeans and Hardlight seeds (not the mobs) Dragonshark has made
Ported Tea plant, matcha recipes and tea recipes still not finished
Ported Meatwheat, Milkdew, Sweet breeze, Solarflower and Voltato
Ported self falling poisonous apple
Wont port mutation system changes, already chances in new code for random reagents, decided to wait with decision making plants randomly produce reagents or not, might have specific plants and/or random ones do it.
2020-02-24 17:47:35 +01:00
Leshana
2d05b084d2
Fix Runtime in seed.dm,102: Cannot read null.len
2020-02-23 22:00:36 -05:00
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
Arokha Sieyes
1d9e5be122
Replace \image macro with bicon()
2020-02-19 19:55:01 -05:00
Erik
11268a3ff4
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge
2020-02-13 20:36:32 -08:00
Arokha Sieyes
47ccc655db
Deprecate the stream operator
2020-02-12 19:38:43 -05:00
Heroman
ead75dbace
Switches comments back to block edit
2020-02-10 15:52:29 +10:00
Heroman
8822a40adf
adjust comments
2020-02-10 13:06:43 +10:00
Heroman
3e5d2abb43
Removes magic dust from random reagents accessible via randomized seeds
2020-02-10 12:53:15 +10:00
Atermonera
66b7793d25
Merge pull request #6661 from LeighKnapenberger/patch-1
...
Fixes killer tomato mutation
2020-02-01 18:08:47 -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
TheFurryFeline
0b10c316cc
Aaa
...
Typo fix to comment, ree.
2020-01-24 11:17:30 -05:00
TheFurryFeline
41ce1ae13f
No More Vines That Shrink Thee
...
Changelog Notes:
- Blacklist Macro/micro/normal cillins from list of spawnable chems in vines that can get injected into your body. This is purely for pref reasons if you don't actually like having your size changed.
2020-01-24 10:26:11 -05:00
Atermonera
5bcb9cc934
Fix various syntactic problems
2020-01-21 01:06:04 -05:00
Rykka
4a78b14451
Port over Roundstats System
2020-01-15 16:42:41 -07:00
Ketrai
b957f1bfee
Removes gnome meme sounds from harvest.
2020-01-14 19:07:26 +01:00
Razgriz
de24521619
First merge from upstream
2020-01-13 17:23:01 -07:00
Hawk_v3
ba05f70db6
Merge remote-tracking branch 'upstream/master'
2020-01-13 18:37:42 +00:00
Hawk_v3
20596d9787
Merge remote-tracking branch 'upstream/master'
2020-01-13 00:01:47 +00:00
Razgriz
2b38acc2c6
Add files via upload
2020-01-11 03:50:46 -07:00
drexample
5e01ad45a5
coding standards are my passion
2020-01-11 06:59:33 +03:00
drexample
1be4fe8b3c
hooh
2020-01-11 06:42:54 +03: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
Heroman
c693bf558d
Does virgo-side of xenoflora expansion
2020-01-09 08:30:42 +10:00
Novacat
09e10e2901
Merge pull request #6406 from VOREStation/upstream-merge-6592
...
[MIRROR] Xenoflora expansion take2
2020-01-08 17:18:49 -05:00
Ketrai
85667c2a9b
adds gnomes. ( #6595 )
...
* adds gnomes
* Makes the house nice and bright.
* copypasta error
* Odd
* makes gnomes adminspawn only.
Co-authored-by: KitKetKetrai <49008286+KitKetKetrai@users.noreply.github.com >
2020-01-08 13:47:41 -05:00
Mechoid
ec5e851399
Xenoflora expansion take2
2020-01-08 13:46:25 -05:00
Hawk_v3
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00:00
Unknown
9d7c9714f3
Merge remote-tracking branch 'VOREStation/master' into making-of-shadekin
2019-11-15 12:12:55 -05:00
Schnayy
cf0344d059
Merge pull request #6522 from Mechoid/BotanyAgain2
...
Botany Fix, again? [Why]
2019-11-12 16:18:35 -05:00
Atermonera
20ee2c0ed2
Merge pull request #6519 from Mechoid/BotanyBugs
...
Fix Fruit Runtime
2019-11-10 18:52:11 -05:00
Hawk_v3
f976948ce3
Merge remote-tracking branch 'upstream/master'
2019-11-07 19:54:10 +00:00
Atermonera
dda52e4410
Merge pull request #6499 from Mechoid/Dangit_reagents
...
Fixfix Grown.dm runtime
2019-10-29 17:25:25 -04:00
Heroman3003
a3fb3e3950
Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin
2019-10-29 09:33:48 +10: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
Hawk_v3
ac61a5cc37
Merge remote-tracking branch 'upstream/master'
2019-09-19 19:54:34 +01:00
Heroman
283c913d95
Adds missing seeds to seed storage
2019-09-19 07:54:25 +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
Hawk_v3
2a73ca4304
Merge remote-tracking branch 'upstream/master'
2019-07-23 22:51:24 +01:00
Atermonera
a78cdc85cc
Merge pull request #6308 from Heroman3003/kitchenfixes
...
Fixes some kitchen screwery
2019-07-22 00:43:05 -04:00
Hawk_v3
8654b6bdf4
Merge remote-tracking branch 'upstream/master'
2019-07-19 22:05:31 +01:00
Anewbe
3c21b379f6
Merge pull request #6298 from Nalarac/patch-12
...
Fixes Plant Produced Stacks
2019-07-13 15:58:19 -04:00
Hawk_v3
4668b23fea
Merge remote-tracking branch 'upstream/master'
2019-07-10 01:50:50 +01:00
Anewbe
19fd2bbab1
Merge pull request #6277 from Mechoid/ActuallyAddTheSeeds
...
Actually adds the new seeds to the vendors.
2019-07-09 14:00:39 -04:00
Heroman3003
864704565c
Returns logs from plants ( #6274 )
...
* Returns logs from plants
* Returns production of planks from fruit with wood pulp
2019-07-08 17:33:01 -04:00
Atermonera
1472642b88
Merge pull request #6262 from Mechoid/CivilianExpansion1
...
Civilian Expansion 1: The Plantening
2019-07-07 17:29:32 -04:00
