Chompstation Bot
ad57e1ad13
[MIRROR] Sideports a couple of init unit tests from Neb.
2021-02-27 18:45:36 +00:00
Novacat
3e965d9416
Merge pull request #9792 from Heroman3003/wormspice
...
Adds wurmwoad to the seed dispensers.
2021-02-24 21:34:56 +00:00
Novacat
e27799eba2
Merge pull request #9445 from VOREStation/upstream-merge-7369
...
[MIRROR] Department and Round Goals
2021-02-21 22:15:39 +00:00
Novacat
2082a52b2a
Merge pull request #9764 from VOREStation/upstream-merge-7899
...
[MIRROR] Couple of small fixes.
2021-02-20 07:31:55 +00:00
Chompstation Bot
c11124cb58
[MIRROR] Absurd Amount of Food Fixes
2021-02-08 04:59:38 +00:00
Novacat
cd1ad32cb2
Merge pull request #9422 from VOREStation/upstream-merge-7762
...
[MIRROR] Plainleather & Tobacco
2020-12-08 03:38:26 +00:00
Novacat
f92c8d9fc4
Merge pull request #9362 from ShadowLarkens/patch-1
...
Prevent cyclic neighbor references in spreading plants
2020-11-25 21:50:11 +00:00
Cadyn
4183f92f2a
Building TGUI
2020-11-15 01:58:16 -08:00
Darlantan
c9d60805b7
Nerfs space vine pitcher plants
...
Also makes pitchers drop fruit on death, if they have a fruit.
2020-10-25 23:43:20 -04:00
Darlantan
9ffbd1138f
Pitcher plants
...
Adds the pitcher plant mob, obtainable from hydroponics which produces a reagent which doubles the speed of plant growth. Makes pitchers spawn from vines. Includes all the extra tweaks needed to make this stuff work.
2020-10-22 08:08:19 -04:00
Cadyn
07775449d7
Fixing conflicts
2020-10-05 18:10:53 -07:00
ShadowLarkens
3d7b051f2b
Convert /material to /datum/material
2020-09-27 16:16:44 -07:00
Razgriz
f8bd128836
Remove phorochem code
2020-09-26 15:06:20 -07:00
Razgriz
54e632ebf2
September 2020 Upstream Merge
2020-09-25 23:07:08 -07:00
Mechoid
68a37c64fa
Hydro upkeep
2020-09-16 19:40:41 -04:00
izac112
5fbb0b16b9
Voreupdate
2020-09-13 15:06:19 +02:00
izac112
4b051c23fc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2020-09-13 15:05:53 +02:00
ShadowLarkens
961848876a
Plant analyzer fix
2020-09-06 15:17:02 -07:00
Khloross
7359bbe727
implement biochemical manipulator for xenoflora with UI
2020-09-06 02:25:20 -04:00
Rykka
d2fb9a7691
Rebase onto Master for Volume Control Panel, Squash Commits
2020-08-27 19:47:38 -04:00
ShadowLarkens
097d4fa283
TGUI Research
2020-08-25 13:30:47 -07:00
Razgriz
f00fdebbb9
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
...
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
boydca001
6aca8877d4
add handling for inconsistent chem definitions
2020-07-31 02:10:01 -04:00
SplinterGP
9b4843da61
i think this is all the changes ?
2020-07-27 20:59:20 -03:00
BlackMajor
717a5fa049
aughe
2020-07-23 13:57:39 +12:00
Razgriz
02421b075e
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull
2020-07-12 16:14:45 -07:00
izac112
e684df5236
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-21 21:17:58 +02:00
Razgriz
3dabdca3f3
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2
2020-05-21 03:20:13 -07:00
Aronai Sieyes
09074eaabb
Alter playsound paradigm
2020-05-18 23:42:15 -04:00
Repede
3f4f33bbd8
Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates
...
# Conflicts:
# code/modules/mob/living/carbon/human/emote_vr.dm
2020-05-18 20:30:52 -04:00
Aronai Sieyes
e3b5d24c8b
Obsolete the PROXMOVE flag and uses
2020-05-18 13:31:54 -04:00
izac112
bbb084a354
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-16 09:06:27 +02:00
Arokha Sieyes
643e4b4af2
Update overlaying on hydro trays to be more reasonable.
2020-05-13 00:07:08 -04:00
izac112
2b3fc9a740
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
2020-05-11 18:20:43 +02:00
Razgriz
81ad690b89
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull
2020-05-06 22:36:01 -07:00
Aronai Sieyes
d172e2dd04
Cached version of icon_states() proc
2020-05-06 16:06:44 -04:00
izac112
e28994b7be
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
...
All conflicts resolved
Signed-off-by: izac112 <izac10@live.com >
2020-05-06 21:53:03 +02:00
Aronai Sieyes
e3bf07f90f
Prevent ghosts/others from messing with hydrotrays
2020-05-05 09:11:05 -04:00
Mechoid
7066d04df5
Explorer Expansion: New Horizons
2020-05-01 14:20:29 -04:00
Aronai Sieyes
874baa1d2d
Merge examine refactor for vorestation
2020-04-29 17:49:54 -04:00
Aronai Sieyes
6ebd249748
Rewrite examine() to pass a list around
2020-04-29 16:42:50 -04:00
Aronai Sieyes
ac33ebcdec
Hydroponics and virology machine icons
...
There's crossover, I guess, for some reason!
2020-04-27 17:46:20 -04:00
Repede
e44e346352
Release Update
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
# Conflicts:
# code/__defines/machinery.dm
# code/controllers/configuration.dm
# code/game/jobs/jobs.dm
# code/game/machinery/doors/blast_door.dm
# code/game/machinery/pipe/pipe_recipes.dm
# code/game/objects/items/devices/radio/radio_vr.dm
# code/modules/client/preferences_vr.dm
# code/modules/clothing/glasses/hud_vr.dm
# code/modules/clothing/under/accessories/accessory_vr.dm
# code/modules/events/event_container_vr.dm
# code/modules/gamemaster/actions/planet_weather_change.dm
# code/modules/projectiles/guns/energy/netgun_vr.dm
# code/modules/projectiles/guns/energy/protector_vr.dm
# code/modules/vore/appearance/sprite_accessories_taur_vr.dm
# code/modules/vore/appearance/sprite_accessories_vr.dm
# code/modules/vore/fluffstuff/custom_guns_vr.dm
# icons/obj/power.dmi
# vorestation.dme
2020-04-16 21:07:33 -04:00
Erik
eb9c3cd387
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020
2020-04-11 16:53:35 -07:00
Atermonera
5c03273ce8
Merge pull request #6884 from Neerti/event_system_fix
...
Rewrites the Rewritten Event System
2020-04-06 16:23:39 -04:00
Repede
7f1a6d6cc7
Fuck this shit
...
Merge branch 'release' of https://github.com/VOREStation/VOREStation
# Conflicts:
# code/controllers/autotransfer.dm
# code/controllers/subsystems/inactivity.dm
# code/game/area/Away Mission areas.dm
# code/game/area/Space Station 13 areas.dm
# code/game/jobs/job/captain.dm
# code/game/jobs/job/civilian.dm
# code/game/jobs/job/security.dm
# code/game/jobs/jobs.dm
# code/game/machinery/air_alarm.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/machinery/suit_storage_unit_vr.dm
# code/game/mecha/combat/gorilla.dm
# code/game/turfs/simulated/dungeon/wall.dm
# code/game/turfs/simulated/wall_types.dm
# code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
# code/modules/clothing/spacesuits/void/void_vr.dm
# code/modules/clothing/under/accessories/holster.dm
# code/modules/mob/language/station_vr.dm
# code/modules/mob/living/carbon/human/emote_vr.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
# code/modules/mob/new_player/sprite_accessories_vr.dm
# code/modules/power/apc.dm
# code/modules/power/lighting.dm
# code/modules/resleeving/machines.dm
# config/jobwhitelist.txt
# icons/mob/species/seromi/head.dmi
# icons/mob/species/seromi/suit.dmi
# icons/mob/species/vulpkanin/helmet.dmi
# icons/mob/species/vulpkanin/suit.dmi
# maps/tether/submaps/_tether_submaps.dm
# maps/tether/tether_areas2.dm
# maps/tether/tether_defines.dm
# maps/tether/tether_shuttles.dm
# nano/templates/apc.tmpl
# vorestation.dme
2020-04-04 14:37:55 -04:00
Aronai Sieyes
496a34ab2b
Update grown.dm
2020-04-03 12:24:58 -04:00
Atermonera
d7a9416bb8
Clean up various things
2020-04-03 03:15:06 -04:00
Atermonera
4f50c50452
Merge pull request #6928 from VOREStation/pol-runtimes
...
Fix 2 runtimes
2020-04-01 22:39:14 -04:00
Aronai Sieyes
64b04c17af
VS: Update maps for directional vendors
2020-03-31 13:56:38 -04:00
