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
54,289 Commits 9 Branches 0 Tags
c25bd646df1b6f52ea3ecab5f7718cb0403cea01
Commit Graph

286 Commits

Author SHA1 Message Date
Shadow-Quill
2f2f9ef5bb edit comment 2020-04-17 18:49:50 -05:00
Shadow-Quill
9be061fc31 As per request. 
Co-Authored-By: Izac Joof Forsgren <izac10@live.com>
 2020-04-17 18:49:00 -05:00
Shadow-Quill
5307de17df Merge branch 'master' into MatterVote 2020-04-17 06:22:28 -05:00
Shadow Quill
eb157c5bf4 Matteralarm vote~ 2020-04-17 03:53:37 -05: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
Aronai Sieyes
8512c48b3d Swap overlay cache for appearance cache in SSskybox 2020-04-15 18:37:13 -04:00
Aronai Sieyes
13b5238ca0 Merge pull request #7273 from VOREStation/sscleanup/remove-processScheduler 
Remove the processScheduler
 2020-04-15 15:25:46 -04:00
Aronai Sieyes
31f7f5b256 Fix shuttles not updating skybox 2020-04-14 17:31:32 -04:00
Leshana
3be0330db2 Remove the goonstation /datum/controller/processScheduler as it is no longer used. 2020-04-14 16:17:32 -04:00
Aronai Sieyes
d9b3739669 Merge branch 'master' into vplk-shuttle-construction 2020-04-13 09:30:05 -04:00
Aronai Sieyes
0d39c5535e Merge pull request #7200 from VOREStation/aro-offmap-rebase2 
ITV Talon offmap spawn jobs
 2020-04-13 09:28:19 -04:00
Aronai Sieyes
984415e9c9 Merge pull request #7177 from VOREStation/sscleanup/openspace 
Refactor the Open Space controller into MC Subsystem
 2020-04-12 21:55:20 -04:00
Leshana
f23af78ae9 Setup auto-configuration of shuttle consoles. 
- Its now possible to put shuttle consoles on a shuttle without a specific subtype or mapediting the shuttle_tag on them.
- After shtutle initialization, SSshuttles gives each initialized shuttle the chance to scan its areas for consoles it wants to claim and configure.
 2020-04-11 18:13:19 -04:00
Aronai Sieyes
942ed8d806 Adds an overmap helper to find what sector you're in 2020-04-11 12:03:10 -04:00
Leshana
5bf15efcbc Refactor the Open Space controller into MC Subsystem 
- Basically just refactor doWork() into fire() with the capablity to return in the middle with MC_TICK_CHECK.
- Move some vars around to be more organized.
- Only functional change is that when a turf is queued twice in one cycle, the second queue moves it to the end of the list instead of it being in the queue twice
 2020-04-10 12:10:21 -04:00
Leshana
4c25dc91df Commit move of open_space_controller.dm to subsystems folder to track history through rename. 2020-04-10 12:07:07 -04:00
Leshana
6555799119 Revamp Start Now admin verb to actually wait until init is done before starting. 2020-04-10 11:41:38 -04:00
Leshana
6dc9ecd1af Fix: Only call autogamemode vote once. 2020-04-10 11:41:38 -04:00
Leshana
c4a8aa2b7b Refactor the gameticker into SSticker 
- Instead of independently spawn'd while/sleep loops, it stores its state and lets the MC fire it.
  - Convert relative path indentation procs to absolute path as per modern style standards.
  - Break apart the inner loops into separate procs so you can see what is actually going on.
  - It now shows up in MC tab, along with stats about what phase it is in.
 2020-04-10 11:41:38 -04:00
Leshana
a794fecea0 Move gameticker to subsystem folder before editing to track history thru rename. 2020-04-10 11:37:46 -04:00
Leshana
9a4b3f7c8b Merge pull request #7159 from VOREStation/aro-fixes 
2 fixes and Teshari maws
 2020-04-08 19:30:35 -04:00
Leshana
81dfe61c7b Merge pull request #7145 from VOREStation/aro-randomfixes 
Fix 2 minor issues
 2020-04-08 19:26:14 -04:00
Leshana
08c2d2db6e Remove non-global references to SSgameMaster and SSevent_ticker 
- Best practice to avoid holding onto references to the subsystem instances aside from the global variables. (In case of restart/recover etc).
- The reference to GM was entirely unused by any event or meta-event.  /datum/game_master would work fine using the global refs.
 2020-04-06 17:28:11 -04: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
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
Aronai Sieyes
8b10676119 CHECK_TICK in xenoarch setup for the sake of largermaps 2020-04-05 12:10:03 -04:00
Aronai Sieyes
d880b61cfd CHECK_TICK in xenoarch setup for the sake of largermaps 2020-04-05 11:58:14 -04:00
Atermonera
c467445cba Adds confirmations message to cancel vote (#6945) 2020-04-04 22:29:43 -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
1626df366c Merge pull request #7102 from VOREStation/aro-fakez 
Improves space edge-of-map behavior and add mapping tools
 2020-04-02 10:58:13 -04:00
Aronai Sieyes
f080a4baf3 [PORT] Speed up map load significantly 2020-04-02 10:25:03 -04:00
Aronai Sieyes
09003a6c61 Improve space map edges 2020-04-02 01:08:07 -04:00
Novacat
1cdd572e6a Merge pull request #7060 from VOREStation/upstream-merge-6902 
[MIRROR] Convert alarm_manager into SSalarm subsystem.
 2020-03-31 11:45:08 -04:00
Atermonera
8986eb7720 Merge pull request #6902 from VOREStation/vplk-ssalarm 
Convert alarm_manager into SSalarm subsystem.
 2020-03-30 20:41:10 -04:00
Aronai Sieyes
cdb2336bf7 VS: Convert bellies to processing subsystem 2020-03-30 16:11:30 -04:00
Aronai Sieyes
85805e8ffe Merge pull request #7050 from VOREStation/aro-procdebug 
Add Recover() to processing subsystems
 2020-03-30 13:15:55 -04:00
Aronai Sieyes
1205f01b0d VS: Bellies should probably be a processing subsystem 2020-03-30 12:18:40 -04:00
Aronai Sieyes
b77334cb95 Tweak output and check SSobjs and SSturfs for types 2020-03-30 12:14:53 -04:00
Aronai Sieyes
a19021887f Add Recover() to processing subsystems 2020-03-30 12:02:22 -04:00
Aronai Sieyes
cbc513314a Update inactivity.dm 2020-03-29 18:18:44 -04:00
Atermonera
255809524d Inactivity subsystem kicks ghosts and admins again 2020-03-29 17:50:24 -04:00
Aronai Sieyes
3e0e45468a Merge pull request #7019 from VOREStation/upstream-merge-6888 
[MIRROR] Port Overmap Skybox, Ships, Sectors, and Boats
 2020-03-29 15:33:49 -04:00
Leshana
42494162e3 Fix: Actually apply configured skybox color. 
Also set default icon_state for space turfs so they are seen in the map editor.
 2020-03-27 18:08:17 -04:00
Atermonera
752d560d76 Converted old supply_controller to SSsupply 2020-03-27 17:38:05 -04:00
Leshana
96a3242c6e Remove temporary debug logging from SStimer 2020-03-25 00:18:19 -04:00
Leshana
f2a582569b Ports overmap events from Baystation12 
- Move overmap defines to _defines folder.  Rename old file to turfs.dm since that is what it contains.
- Definition of overmap event objects and the overmap event handler.
- Upgrades to SSevents and SSskybox to tie in the overmap events.
- Enhancement to /datum/event itself to support affecting_z and victim ship.
- Upgrade to the five event types used on the overmap to support new vars.
- Upgrade to dust and meteor spawning code to support targeting z-levels.
 2020-03-19 20:29:43 -04:00
Novacat
15273a356c Merge pull request #6913 from Heroman3003/jobstuff 
Does some adjustment to _vr job things
 2020-03-19 19:00:25 -04:00
Aronai Sieyes
b95ca5568c Faster lookup of self-init on atoms 2020-03-19 15:51:01 -04:00
ShadowLarkens
2e23dcdb49 Speed up mapload significantly 
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
 2020-03-19 00:29:24 -04:00
Aronai Sieyes
9250685a06 VS-specific changes for mapload time 2020-03-19 00:27:47 -04:00