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
Leshana
3e3241eeb2 Make area.gravitychange not require being passed a reference to... itself. (#6838) 2020-03-16 05:32:20 -04:00
Razgriz
1e3af5d7bf Add files via upload 2020-03-15 23:41:56 -07: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
Atermonera
772a95c68e Adds an In-game Feedback System 2020-02-24 16:35:08 -05:00
Repede
7ff67d6909 Fixes typo 2020-02-22 12:44:30 -05:00
Repede
4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm
 2020-02-22 12:38:04 -05:00
Razgriz
9383bf9682 Msay and Esay remove R_SERVER 2020-02-21 22:08:25 -07:00
Atermonera
a54a7912cb Merge pull request #6714 from Heroman3003/verbrename 
Renames Make All Areas (Un)Powered secret
 2020-02-21 02:27:08 -05:00
Arokha Sieyes
1d9e5be122 Replace \image macro with bicon() 2020-02-19 19:55:01 -05:00
Arokha Sieyes
9fadae4392 Fix to_chat typo 
This file is unchecked so it's not being used, but I'd still rather not leave this.

(cherry picked from commit 00b61d9bcb36e08aca10d72dcf0e2d00655a9527)
 2020-02-19 19:36:14 -05:00
Arokha Sieyes
14942ee6c7 VS: Don't talk to strangers 2020-02-17 12:44:17 -05:00
Arokha Sieyes
3cbd51c6d1 Don't talk to strangers 2020-02-17 12:44:10 -05:00
Novacat
106711b0f3 Merge pull request #6508 from VOREStation/Verkister-patch-7 
A ban-flinging QoL update
 2020-02-14 20:53:25 -05:00
Erik
11268a3ff4 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into MyUpstreamMerge 2020-02-13 20:36:32 -08:00
Arokha Sieyes
47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
Verkister
0afc30e8ac Update functions.dm 2020-02-12 15:19:53 +02:00
Kassc Zeravla
1c5b7c7390 Modified "control_freak" to full access. 
Players and Admins now have access to the full list of "client side options". So that means they can use; Command, Macros, Gamepad Mapping, Gamepad setup, Edit Skin & Preference.
 2020-02-07 19:39:31 -06:00
Kassc Zeravla
99266915d5 Enable Macros for Admins and Players 
Enabled macros and costume skins for players and admins and removed some redundant client side options.
 2020-02-03 19:17:44 -06:00
Kassc Zeravla
8f9a1a9ed6 Revert "Revert "Revert "Revert "Merge remote-tracking branch 'Kazzc/MacroFix' into MacroFix"""" 
This reverts commit de03660da4.
 2020-02-03 18:56:32 -06:00
Kassc Zeravla
de03660da4 Revert "Revert "Revert "Merge remote-tracking branch 'Kazzc/MacroFix' into MacroFix""" 
This reverts commit cdef2beb3d.
 2020-02-03 18:50:11 -06:00
Kassc Zeravla
cdef2beb3d Revert "Revert "Merge remote-tracking branch 'Kazzc/MacroFix' into MacroFix"" 
This reverts commit 8a22bd7385.
 2020-02-03 18:49:54 -06:00
Kassc Zeravla
8a22bd7385 Revert "Merge remote-tracking branch 'Kazzc/MacroFix' into MacroFix" 
This reverts commit f36ba2a9c1.
 2020-02-03 18:49:41 -06:00
Kassc Zeravla
f36ba2a9c1 Merge remote-tracking branch 'Kazzc/MacroFix' into MacroFix 2020-02-03 18:35:31 -06:00
Kassc Zeravla
6d53b51ed4 Macro fix for Players and Admins 
changed control_freak on both files, allowing admins to use Macros and removing redundant client side options
 2020-02-03 18:31:38 -06:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update 
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
 2020-01-31 18:23:50 +01:00
Kassc Zeravla
a8f99b9486 Macro fix for Players and Admins 
changed control_freak on both files, allowing admins to use Macros and removing redundant client side options
 2020-01-30 13:02:52 -06:00
Verkister
1392f268ec A ban-flinging QoL update 
Sabotages the exploitable ban-dodging mob-lock "feature" of the ban system. Like dude we're banning a client, not a mob so shut up and let us work.
 2020-01-26 13:06:26 +02:00