cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,289 Commits 10 Branches 0 Tags
c25bd646df1b6f52ea3ecab5f7718cb0403cea01
Commit Graph

2304 Commits

Author SHA1 Message Date
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
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
Leshana
3e3241eeb2 Make area.gravitychange not require being passed a reference to... itself. (#6838) 2020-03-16 05:32:20 -04:00
Leshana
73c4809d26 Add proc set_viewsize() to allow hooking actions when client.view is changed. 
- Proc is on mob to simplify the standard use case; maybe someday actually save it there too if desired.
 2020-03-15 17:59:17 -04:00
Novacat
194c9f7a63 Merge pull request #6841 from VOREStation/upstream-merge-6818 
[MIRROR] Fully Implements R_EVENT for Event Managers
 2020-03-15 17:01:36 -04:00
Aronai Sieyes
836a47fb2d Missed a merge conflict marker 2020-03-15 15:24:05 -04:00
Aronai Sieyes
9bbfd211a3 Vorestation edit fixes 2020-03-15 15:17:27 -04:00
Atermonera
cb8548f5af Fully Implements R_EVENT for Event Managers 2020-03-12 15:01:50 -04:00
Arokha Sieyes
b6bf14727f Add 'sparks' option when spawning characters 2020-03-12 14:11:21 -04:00
Atermonera
e57c1a0e19 Merge pull request #6812 from PolarisSS13/more_buttons 
Gives +MOD the traitor panel and colorable OOC.
 2020-03-10 21:19:13 -04:00
Unknown
cee18b54a6 More mrowls 2020-03-09 15:21:55 -04:00
Unknown
d23683c2f0 MROWL 2020-03-09 02:37:25 -04:00
Novacat
2eae0fdecb Merge branch 'master' into upstream-merge-6762 2020-03-09 01:45:23 -04:00
Leshana
c837078105 Replaced "area" shuttles with "landmark" shuttles. 
Largely ported from the work done at Baystation in https://github.com/Baystation12/Baystation12/pull/17460 and later commits.

 - Shuttles no longer require a separate area for each location they jump to.
   Instead destinations are indicated by landmark objects, which are not necessarily exclusive to that shuttle.
   This means that more than one shuttle could use the same docking port (not at the same time of course).
 - Enhanced shuttle control computers to use nanoui if they didn't.
 - Organizes shuttle datum code a bit better so there is less re-inventing the wheel in subtypes.
 - Allows the possibility of shuttles (or destinations) that start on late-loaded maps.
 - Deprecate the "extra" shuttle areas that are no longer needed and update shuttle areas in unit tests

This all required a bit of infrastructure improvements.

 - ChangeArea proc, for changing the area of a turf.
 - Fixed lighting overlays actually being able to be destroyed.
 - Added a few utility macros and procs.
 - Added "turf translation" procs which are like move_contents_to but more flexible.
 2020-03-05 10:29:08 -05:00
Neerti
0d9345adde Half-Refactors Jobs 2020-03-03 16:28:33 -05:00
Hawk_v3
f2b8f92b63 Merge remote-tracking branch 'upstream/master' into releaseupdate 2020-03-02 17:55:11 +00:00
Novacat
95e1c84036 Merge pull request #6719 from VOREStation/aro-narrate 
Allow narrate/globalnarrate shenanigans
 2020-03-01 16:14:01 -05:00
Aronai Sieyes
b33c359df5 Allow narrate/globalnarrate shenanigans 
Allows HTML if your entire thing is HTML
 2020-03-01 14:35:31 -05:00
Aronai Sieyes
6af54bfec2 NanoUI Subsystem Fixes 
Don't do this, the asset subsystem does this for you
 2020-03-01 14:14:52 -05:00
Repede
c45d7c2196 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme
 2020-03-01 12:35:52 -05:00
Novacat
b44f8e0911 Merge pull request #6592 from VOREStation/vchat-rebase 
VChat: Redone chat output in Vue.js
 2020-03-01 10:51:29 -05:00
Novacat
a5ce35be95 Merge pull request #6699 from VOREStation/upstream-merge-6756 
[MIRROR] Fixes various lightning strike bugs
 2020-02-28 01:17:11 -05:00
Atermonera
1d4d3afd45 Merge pull request #6756 from Neerti/lightning_fixes 
Fixes various lightning strike bugs
 2020-02-27 23:58:36 -05:00
Atermonera
4039e26875 Merge pull request #6755 from Neerti/feedback_for_devs 
Devs can now View Feedback
 2020-02-27 23:56:20 -05:00
Atermonera
fbe42c39ef Merge pull request #6733 from VOREStation/pol-aitweaks 
Readd some AI features and improve AI buildmode
 2020-02-26 20:16:06 -05:00
Novacat
4298fd39eb Merge pull request #6619 from VOREStation/fix-seeds-runtime 
Fix Sundry Runtime Errors
 2020-02-25 10:42:09 -05:00
Leshana
25fed81d9f Fixed Runtime in simple_animal_vr.dm,41: Cannot read null.digest_mode 
- Caused by using "Toggle Animal's Digestion" verb on non-vore-capable mobs.
- Even better, changed it to not even add those verbs on mobs without vore
- Also remove the path from VV addverb since it is a proc now.
 2020-02-24 17:57:56 -05:00