cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
70,047 Commits 9 Branches 0 Tags
ecf834c452ae2bf93b51e1ad9e42a69448308e0c
Commit Graph

89 Commits

Author SHA1 Message Date
Casey
c2f7c28dbb GBWilds 2022-04-24 00:33:52 +00:00
Casey
f89834cd72 Merge pull request #12293 from Heroman3003/11743-fix 
11743 fix
 2022-02-20 00:07:37 +00:00
Casey
22d7e1b856 Tether passage blockades 2022-02-13 06:41:40 +00:00
Casey
fe8c4753eb Offmap Tweaks 2021-12-03 07:14:17 +00:00
Nadyr
3e1386d5ea powder that makes you say yes 2021-10-27 18:26:46 -04:00
Chompstation Bot
c665ac0dcb [MIRROR] Kills Doorstop 2021-10-27 15:20:35 +00:00
Nadyr
744c106c86 Merge branch 'master' into upstream-merge-11179 2021-07-20 20:59:10 -04:00
Chompstation Bot
15cafbe65b Optimize a couple things 2021-07-20 21:30:20 +00:00
Chompstation Bot
7437154387 Allows hiding mobs/areas from observers without completely forbidding 2021-07-20 15:03:10 +00:00
Chompstation Bot
9acb3a208e Removes unnecessary, unused, and redundant helpers. 2021-07-14 17:57:22 +00:00
Chompstation Bot
0f30402e40 [MIRROR] Portable mapping devices 2021-06-14 18:37:53 +00:00
Aronai Sieyes
0028ef1ef0 Merge pull request #10568 from VOREStation/upstream-merge-8111 
[MIRROR] Add Secret ZLevels
 2021-06-07 05:33:52 +00:00
Chompstation Bot
04b2b0af70 Add secret zlevels 2021-05-26 01:44:00 +00:00
Nadyr
ec6d98455a powder that makes you say yes 2021-05-25 18:40:57 -04:00
Chompstation Bot
5af77e4b11 Maybe make deepspace levels slightly more robust? 2021-05-25 21:32:11 +00:00
Nadyr
6229ad5753 powder that makes you say yes 2021-05-22 16:45:35 -04:00
Chompstation Bot
e432a9e7ac Add portable mapping devices 2021-05-22 19:26:57 +00:00
Nadyr
4bf315409c powder that makes you say yes 2021-05-19 08:32:38 -04:00
Chompstation Bot
9784331cdb Add persistent smartfridges with lossiness 2021-05-19 08:08:40 -04:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Chompstation Bot
5a70c39b08 [MIRROR] Lobby Improvements 2021-03-09 22:32:57 +00:00
BlackMajor
8673bcad39 Adjustments following feedback 2021-01-14 03:36:05 +13:00
Chompstation Bot
db1c95c6a7 Move away from Travis CI to GitHub Actions 2020-11-24 19:00:16 +00:00
Razgriz
00149c260b Removed meaningless and old comment 2020-08-14 03:06:12 -07:00
Razgriz
0396c9cb41 Update maps.dm 2020-08-09 21:25:50 -07:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112
dd22d0093c fixes 2020-06-17 04:36:50 +02:00
izac112
4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02:00
Killian
bd50595244 improved traffic, take two 2020-06-10 22:26:23 +01:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Arokha Sieyes
323f7e651f Fix/rename some timing stuff 2020-05-08 01:51:52 -04:00
Aronai Sieyes
db5d6470de Fix a nightshift bug in determining time 2020-05-07 16:07:43 -04:00
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07: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
50595eb76c Remove debug logging statement 2020-05-04 18:20:43 -04:00
Aronai Sieyes
aa6d22097b Port SSnightshift from Paradise 
Makes the station have a night mode.
 2020-05-03 17:51:05 -04:00
Razgriz
09293a0b02 Merge branch 'master' into UpstreamMergeApril2020 2020-04-22 03:17:50 -07:00
Razgriz
2b72ff2c16 Update maps.dm 2020-04-19 21:42:02 -07: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
TheFurryFeline
47bc153139 Real Final Toches. 
Fixed the runtimes, yay.
 2020-04-16 20:59:54 -04:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Aronai Sieyes
7d074edf6b VS: Update announcer for telecomms refactor 2020-04-11 12:03:10 -04:00
Aronai Sieyes
e2d2964546 Refactor telecomms to send messages to logically adjacent zlevels 2020-04-11 12:03:10 -04:00
Aronai Sieyes
abd28b5d6d Fix per-zlevel skyboxes not really allowing custom ones 
It's not going to break the world to remove this 'assumption' cache
 2020-04-06 12:08:33 -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
ShadowLarkens
2e23dcdb49 Speed up mapload significantly 
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
 2020-03-19 00:29:24 -04:00
Arokha Sieyes
b18e974e4c Skybox tweaks 
Use instances on maps so they can be edited later
 2020-03-12 14:36:16 -04:00
Leshana
86c435f4b7 Ports Skybox Parallax 
- Port based on Baystation's implementation and customized for our code and usages.
- Switched space icon_state permutation to a "dust" overlay that is permutated the same way. As an overlay, the dust can be *above* the parallax planes. Space turfs are now white to allow skybox to BLEND_MULTIPLY onto them.
- Added skybox hud effect that replaces background space turfs with an image moved to create a parallax effect.
- Added skybox subsystem to generate and manage skybox parallax images, and lots of images for it!
 2020-03-11 11:11:40 -04:00
Killian
13e5e7a495 traffic & lore update 2020-03-06 06:25:27 +00:00