cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-06-17 12:23:06 +01:00
Code Issues Packages Projects Releases Wiki Activity
67,259 Commits 9 Branches 0 Tags
f58a3c742bdff8affc266ab45ede9780ccbd4025
Commit Graph

102 Commits

Author SHA1 Message Date
Nadyr c1256426da Merge branch 'master' into upstream-merge-11324 2021-08-01 17:49:14 -04:00
Chompstation Bot 0857ab35f3 Few more outdoors fixes 2021-08-01 16:26:38 +00:00
Chompstation Bot 21b6022a3a [MIRROR] Adds optional area-based definition for outdoors-ness 2021-08-01 15:41:46 +00:00
Chompstation Bot 15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Nadyr 9583078357 Merge branch 'master' into upstream-merge-10969 2021-07-09 23:49:21 -04:00
Chompstation Bot 9a9da55cd2 Make the sun bleed even better 2021-07-08 04:54:20 +00:00
Chompstation Bot 16c5baeb02 Bleed outdoor light onto walls and such 2021-07-08 01:32:53 +00:00
Chompstation Bot 15fd9df408 The One Where You Can Aim Lights 2021-06-30 19:29:41 +00:00
Chompstation Bot 55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation Bot 0a3805ce5c File tweaks 2021-06-12 01:00:59 +00:00
Nadyr 93b1ce71fd Update sif.dm 2021-05-08 08:14:31 -04:00
Chompstation Bot 644108b2d9 [MIRROR] weather sounds adjustments 2021-05-05 18:46:21 +00:00
CHOMPStationBot 83b0442129 [MIRROR] [MIRROR] Optimizes SSplanets initialization (#1788) 
* Merge pull request #10119 from VOREStation/upstream-merge-8015

[MIRROR] Optimizes SSplanets initialization

* [MIRROR] Optimizes SSplanets initialization

Co-authored-by: Novacat <35587478+Novacat@users.noreply.github.com>
 2021-04-10 22:35:12 -07:00
Novacat a876b82922 Merge pull request #10109 from Heroman3003/virgo4 
Updates Virgo 4 lighting
 2021-04-09 12:16:35 +00:00
Nadyr 871db4f853 Merge pull request #1159 from CHOMPStationBot/upstream-merge-9589 
[MIRROR] Makes the beach cool
 2021-04-03 04:24:43 -04:00
Nadyr f447d3c309 Create virgo4_vr 2021-04-03 03:31:47 -04:00
Chompstation Bot 413bafbb91 Some minor mapfixes 2021-04-03 02:40:33 -04:00
Nadyr 2d6c3c92e6 Merge branch 'master' into upstream-merge-9632 2021-03-30 02:41:50 -04:00
Razgriz 72ba1d42b8 Restore sif's rain 
Lets see if this is any good. All we had to do was uncomment it.
 2021-02-09 19:13:05 -07:00
Verkister 0fe6e22fb1 Merge pull request #9463 from KillianKirilenko/kk-misc 
Add/Restore Rain Ambience
 2021-02-09 18:24:17 +00:00
Chompstation Bot 0a01392af4 Uplink and Adminverb Tweaks 2021-02-02 15:20:23 +00:00
Chompstation Bot 8df94e2b56 Makes the beach cool 2021-01-23 17:16:14 +00:00
izac112 5188edf1d9 Adds back wind 2020-08-23 02:00:36 +02: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 e8d1c964f3 Time datum fixes 2020-05-03 17:49:55 -04:00
Repede 42496d4fb1 Map atmosphere fixes and cleanup of map defines and code for atmos stuff. 
Thanks Aronai.
 2019-12-02 17:30:40 -05:00
Repede 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
Repede 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
RadiantFlash7 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
Hawk_v3 2cc8800ede Merge remote-tracking branch 'upstream/master' 2019-10-08 15:14:36 +01:00
Unknown dade2aa80b Conflict Resolution 2019-10-06 13:12:11 -04:00
Atermonera 89aad128cf Blind port of Bay Radiation Subsystem 2019-10-06 03:30:36 -04:00
Hawk_v3 b22f2284fe Merge remote-tracking branch 'upstream/master' 2019-09-23 20:55:18 +01:00
Unknown b4c8b5be84 Reorganized 2019-09-17 19:07:04 -04:00
Unknown 4cc2380c70 Moves Virgo 3B atmospheric defines out of tether defines 2019-09-17 16:12:41 -04:00
Unknown a0090f16fc Moves Planet definition to code 2019-09-17 14:56:15 -04:00
Hawk_v3 27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01:00
Atermonera 9ea820fd7f Merge pull request #6058 from Neerti/permastuns_are_bad 
Removes umbrella permastuns. Adds wind mechanics.
 2019-04-26 19:32:29 -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
Unknown 7c7dc0da33 Ports Weather Improvements 2019-03-29 16:32:07 -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
Neerti 86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
Spades 6e2172a5ae Merge branch 'master' into upstream-merge-5654 2019-03-01 05:42:07 -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 b3c29b0e89 Merge remote-tracking branch 'upstream/master' 2018-11-20 00:02:11 +00:00
Anewbe 87e428d29e Merge pull request #5706 from VOREStation/aro-hail 
Hail tweaks
 2018-11-09 22:03:21 -05:00
Hawk_v3 beb7579ed3 Vore Updates and merges 2018-10-03 18:25:39 +01:00
Atermonera b07144a7c8 Merge pull request #5587 from Anewbe/wind 
Wind in storms slightly nerfed
 2018-09-22 12:10:33 -07:00