cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 20:23:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,876 Commits 8 Branches 0 Tags
fd46ebb51aeba66abfe44b0477ccd2ce751bce0f
Commit Graph

2398 Commits

Author SHA1 Message Date
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112
c14d144d45 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-18 16:05:36 +02:00
Aronai Sieyes
e585a6dc47 Semi-automate discord ID registration 2020-05-17 21:14:18 -04:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
Atermonera
3057230bb2 Fixes #649 (#7114) 2020-05-15 16:33:17 -04:00
izac112
bba0a05f5f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-13 10:21:49 +02:00
Aronai Sieyes
d4cfdcfb3a Switch to using GLOB.admins instead of admins 2020-05-12 11:16:54 -04:00
Aronai Sieyes
96da7be01b Put APCs and SMESes into GLOB lists to ease iteration 2020-05-11 22:05:41 -04:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Aronai Sieyes
b9262c72f1 Make buildmode AI control reset home turfs when move orders given 2020-05-08 18:46:54 -04:00
Razgriz
00ea17e06c Update admin_verbs.dm 2020-05-07 01:17:21 -07: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
a0a3971449 VS: Stop adjusting cooldown directly 2020-04-30 15:44:19 -04:00
Aronai Sieyes
f5cbd8c35e Stop adjusting cooldown directly 2020-04-30 15:43:58 -04:00
Leshana
c789cad22e Change to use to_world and add wrapping spans. 2020-04-25 16:15:03 -04:00
Novacat
2c4a0a5831 Merge pull request #7350 from VOREStation/upstream-merge-6998 
[MIRROR] Adds empty filter classes to send messages to particular vchat filters.
 2020-04-23 23:56:38 -04:00
Novacat
a9d049f8c2 Update topic.dm 2020-04-23 23:17:11 -04:00
Novacat
3e83916244 Update admin_verbs.dm 2020-04-23 23:11:04 -04:00
Novacat
3ba0aec162 Update admin_verb_lists.dm 2020-04-23 23:10:32 -04:00
Novacat
c1a5a07208 Update callproc.dm 2020-04-23 23:02:32 -04:00
Leshana
323f20cfec Adds "Move" command to atom/movable's VV dropdown that lets you jump it to a coordinate. 2020-04-22 11:43:18 -04:00
Atermonera
7bf77736c2 Adds empty filter classes to send messages to particular vchat filters. 2020-04-20 03:28:57 -04:00
Aronai Sieyes
1d22a745e4 Add Gravity Generator, place on tether, update events 2020-04-19 23:37:10 -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
Aronai Sieyes
3f03b72ea2 Adjust icon 2020-04-16 13:50:43 -04:00
Aronai Sieyes
3ea7696c38 Adds autosaving 2020-04-16 12:40:30 -04:00
Aronai Sieyes
c3d406a47c Merge pull request #7274 from VOREStation/aro-parallaxfix 
Fix parallax slide and admin jump skybox
 2020-04-15 17:12:43 -04:00
Aronai Sieyes
5199e07ed9 Fix parallax slide and admin jump skybox 2020-04-15 15:23:23 -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
0d39c5535e Merge pull request #7200 from VOREStation/aro-offmap-rebase2 
ITV Talon offmap spawn jobs
 2020-04-13 09:28:19 -04:00
Leshana
262faa38e4 Replace global all_areas list with world. 
It ends up having similar performance, so might as well not bother with all_areas.
 2020-04-12 18:04:54 -04:00
Runa Dacino
4c612bda81 Switches "Yes" and "no" for Request spice 
https://github.com/VOREStation/VOREStation/issues/7133

states that it's very easy to accidentally press yes using the current layout.
 2020-04-12 14:31:44 +02:00
Erik
eb9c3cd387 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into UpstreamMergeApril2020 2020-04-11 16:53:35 -07:00
Leshana
65546d4e28 Merge pull request #7150 from VOREStation/sscleanup/ticker 
Refactor the gameticker controller into SSticker
 2020-04-11 19:28:37 -04:00
Aronai Sieyes
e2d2964546 Refactor telecomms to send messages to logically adjacent zlevels 2020-04-11 12:03:10 -04:00
Atermonera
8aea6f9788 Merge pull request #6982 from VOREStation/vplk-fix-vv-lists 
Fix VV on lists
 2020-04-11 02:56:48 -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
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
d66f508541 Fixes for vorestation merge of "Rewrites the Rewritten Event System" 
- Remove duplicate pick_random_edge_turf resulting from our simultaneous addition of it (in overmaps PR)
- Disable SSgame_master and SSevent_ticker subystems, we are still using the original events subsystem.
- Disable the game_master implementations as we are not using them.
- Comment out references to SSgame_master since we are not using it (yet?)
 2020-04-06 17:31:26 -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
Leshana
e393b71dff Fixes Runtime in randomverbs.dm,134: list index out of bounds 2020-03-30 16:43:30 -04:00
Aronai Sieyes
26a2a8504d Merge pull request #7020 from VOREStation/upstream-merge-6761 
[MIRROR] VChat: Redone chat output done in Vue.js
 2020-03-29 17:51:20 -04:00
ShadowLarkens
c44553c9d5 Added three utilities for admins & developers 
- There is a new option in the player panel labeled "Send back to
   Lobby", which will send a given player back to the lobby.
 - The player panel also has a shortcut to the "Spawn Character" verb.
 - Finally, there's a new config option that disables the warning
   message about multikeying if two mobs with the same CID are found;
   this option should NOT be enabled if multikeying is prohibited by the
   server rules. It is simply a developer tool, as multikeying is
   sometimes necessary to test new features that require two clients
   interacting.
 2020-03-27 15:41:44 -07:00
Aronai Sieyes
8a33afaff6 VChat: Redone chat output done in Vue.js 2020-03-27 17:08:14 -04:00
Atermonera
15e3ef676b Silly admins can't blindly break movement irreparably (#6897) 
* Silly admins can't blindly break movement

* Updates pixel movement var protections
 2020-03-25 16:39:06 -04:00
Atermonera
cbb40196fc Machinery: Always use update_use_power() 2020-03-23 23:21:10 -04:00
Atermonera
2ec545c42b Merge pull request #6883 from VOREStation/vplk-port-tickrate-change 
Safely change world.fps for SStimer
 2020-03-22 20:18:00 -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
13f181beda Merge pull request #6862 from VOREStation/vplk-zoomy-skybox 
Scale Skybox by client view size
 2020-03-16 10:01:50 -04:00