5188edf1d9
Adds back wind
2020-08-23 02:00:36 +02:00
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
e8d1c964f3
Time datum fixes
2020-05-03 17:49:55 -04:00
42496d4fb1
Map atmosphere fixes and cleanup of map defines and code for atmos stuff.
...
Thanks Aronai.
2019-12-02 17:30:40 -05:00
9c61982751
Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into map
...
# Conflicts:
# code/game/machinery/vending_yw.dm
# icons/vore/custom_clothes_yw.dmi
# vorestation.dme
2019-11-29 19:13:53 -05:00
7035e30fc3
Fixed blizzard so animals do not get killed
...
Fixed the exploration shuttle console
Fixed the snowsuits sprites and actually works in cold temp
2019-11-24 16:57:06 -05:00
2aac0c0171
Map Overhaul+instruments
...
new instruments added, Changed snowoverlay to snow floor decal,
Exploration ship jump submap done.
Plains finished, Just needs teleporters setup.
Tons of improvements to hallways.
Floor colors!
Remade engineering (again)
Disposals finalized,
2019-11-23 22:06:21 -05:00
2cc8800ede
Merge remote-tracking branch 'upstream/master'
2019-10-08 15:14:36 +01:00
dade2aa80b
Conflict Resolution
2019-10-06 13:12:11 -04:00
89aad128cf
Blind port of Bay Radiation Subsystem
2019-10-06 03:30:36 -04:00
b22f2284fe
Merge remote-tracking branch 'upstream/master'
2019-09-23 20:55:18 +01:00
b4c8b5be84
Reorganized
2019-09-17 19:07:04 -04:00
4cc2380c70
Moves Virgo 3B atmospheric defines out of tether defines
2019-09-17 16:12:41 -04:00
a0090f16fc
Moves Planet definition to code
2019-09-17 14:56:15 -04:00
27e73883fc
Merge remote-tracking branch 'upstream/release'
2019-05-04 21:03:48 +01:00
9ea820fd7f
Merge pull request #6058 from Neerti/permastuns_are_bad
...
Removes umbrella permastuns. Adds wind mechanics.
2019-04-26 19:32:29 -04:00
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
7c7dc0da33
Ports Weather Improvements
2019-03-29 16:32:07 -04:00
4e67e1b9ab
Conflict Resolution
2019-03-27 04:11:30 -04:00
09b01407e3
Adds Various Sounds, Looping Sound System
2019-03-27 03:55:21 -04:00
86174593bf
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
6e2172a5ae
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
fc178c1e04
Makes math helpers defines for performance
2018-12-06 16:15:00 -05:00
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
b3c29b0e89
Merge remote-tracking branch 'upstream/master'
2018-11-20 00:02:11 +00:00
87e428d29e
Merge pull request #5706 from VOREStation/aro-hail
...
Hail tweaks
2018-11-09 22:03:21 -05:00
beb7579ed3
Vore Updates and merges
2018-10-03 18:25:39 +01:00
b07144a7c8
Merge pull request #5587 from Anewbe/wind
...
Wind in storms slightly nerfed
2018-09-22 12:10:33 -07:00
3b5874d3f1
Weather refactor.
2018-08-11 18:42:36 -04:00
99bc87e829
Wind in storms slightly nerfed
2018-08-10 22:20:13 -05:00
6bdf355e6d
Finishes thunderstorms.
2018-07-31 14:45:26 -04:00
8639d49c34
Begins work on lightning.
2018-07-28 11:08:30 -04:00
2b21dbfd99
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# config/custom_items.txt
# config/jobwhitelist.txt
# maps/tether/tether-05-station1.dmm
# maps/tether/tether-06-station2.dmm
2018-06-23 17:53:13 -04:00
d482eac947
Weather is shorter, hail is less deadly.
2018-06-16 14:02:09 -04:00
1c0867d95f
Reworks weather to fit the faster weather ticker
2018-06-15 18:47:19 -05:00
98b3af60fa
Move planets to SSplanets
2018-06-15 19:05:38 -04:00
462effc1d2
Creates SSplanets subsystem
...
For SPEEDYNESS
It probably works. I mean it's hard to sit there for 8 hours and test it. But it seems to work okay. At worst if it doesn't you'll have weather that doesn't make sense. ;v
2018-06-02 19:09:35 -04:00
b83e867682
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
# code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
# code/modules/power/lighting.dm
2018-06-02 18:33:44 -04:00
40b1a56bdc
Revert "Revert "Upgrades Planetary Weather to vis_contents ( #5170 )""
2018-06-01 20:35:28 -04:00
4018e14d12
Revert "Upgrades Planetary Weather to vis_contents ( #5170 )"
...
This reverts commit e3e1a7ad9c
2018-05-15 00:57:55 -04:00
33202c5c38
Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01
...
# Conflicts:
# code/modules/mob/living/simple_animal/animals/giant_spider.dm
# html/changelogs/.all_changelog.yml
2018-05-10 13:48:20 -04:00
e3e1a7ad9c
Upgrades Planetary Weather to vis_contents ( #5170 )
...
* Upgrades Planetary Weather to vis_contents
Makes the weather on Sif use vis_contents instead of overlays, which should fix all weather-related icon issues, and may or may not be faster.
Weather updates instantly now.
Fixes indoor PoIs having outdoor weather.
* Tries to appease Travis
2018-04-28 20:40:11 -07:00
372e145108
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/seromi.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
Fixed conflicts, fixed race racism money bs
2018-04-27 21:45:13 -04:00
6c686e6a2f
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync-04252018
...
# Conflicts:
# README.md
# code/game/jobs/job/job.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/mob/living/carbon/human/examine.dm
# code/modules/mob/living/carbon/human/npcs.dm
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# html/changelogs/.all_changelog.yml
# maps/RandomZLevels/Academy.dmm
# maps/RandomZLevels/beach.dmm
# maps/RandomZLevels/blackmarketpackers.dmm
# maps/RandomZLevels/challenge.dmm
# maps/RandomZLevels/example.dmm
# maps/RandomZLevels/jungle.dmm
# maps/RandomZLevels/listeningpost.dmm
# maps/RandomZLevels/spacebattle.dmm
# maps/RandomZLevels/stationCollision.dmm
# maps/RandomZLevels/wildwest.dmm
# maps/RandomZLevels/zresearchlabs.dmm
# maps/northern_star/polaris-1.dmm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# maps/southern_cross/southern_cross-7.dmm
# maps/submaps/surface_submaps/mountains/CrashedMedShuttle1.dmm
# maps/submaps/surface_submaps/plains/Boathouse.dmm
# maps/submaps/surface_submaps/wilderness/Blackshuttledown.dmm
# maps/submaps/surface_submaps/wilderness/Boombase.dmm
# maps/submaps/surface_submaps/wilderness/DJOutpost1.dmm
# maps/submaps/surface_submaps/wilderness/DecoupledEngine.dmm
# maps/submaps/surface_submaps/wilderness/Drugden.dmm
# maps/submaps/surface_submaps/wilderness/Rockybase.dmm
# maps/submaps/surface_submaps/wilderness/Shack1.dmm
# maps/virgo/virgo-6.dmm
# vorestation.dme
2018-04-25 17:23:33 -04:00
c4d714dea8
Replaces set_light with direct update_lumcount for planet suns.
...
Setting lights on every single turf takes way too long. Instead of havingto create a light source for every single outdoor turf, we find the corners to light up and apply the sunlight to them directly.
We also make sure to avoid having planet sunlight being 4x too strong, which would happen if we naively looped over all corners of all outdoor turfs.
Note: This has the side effect of making the sun's light and color ACCURATELY reflected on turfs. Previous code doubled up on light and appeared brighter than it should.
2018-04-18 21:54:58 -04:00
471e544a61
Revert "Merge pull request #4779 from Neerti/2/1/2018_make_the_sun_not_lag_again"
...
This reverts commit f4df29713d337e5e7436
2018-04-18 18:08:16 -04:00
d81c990e22
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/1/2018_make_the_sun_not_lag_again
2018-04-13 11:26:12 -04:00
46577b7321
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/mecha/combat/gorilla.dm
# code/modules/vore/eating/bellymodes_vr.dm
2018-03-06 18:11:39 -05:00
68a5fabe11
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/game/objects/items/devices/translator.dm
# code/game/objects/items/weapons/dna_injector.dm
# code/modules/client/preference_setup/loadout/loadout_ears.dm
# code/modules/mob/living/simple_animal/aliens/hivebot.dm
# html/changelogs/.all_changelog.yml
# maps/southern_cross/southern_cross-3.dmm
2018-03-03 13:09:57 -05:00
3c4996b475
Hail is less omnicidal
2018-02-28 14:45:10 -06:00
izac112