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

2521 Commits

Author SHA1 Message Date
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
Novacat
9e0e860f4e Merge pull request #6454 from VOREStation/discoban 
Ban/unban, note/unnote, kick to webhook
 2020-01-21 01:46:53 -05:00
Novacat
aeee2fd56d Update admin_secrets.dm 2020-01-21 01:10:34 -05:00
Atermonera
5bcb9cc934 Fix various syntactic problems 2020-01-21 01:06:04 -05:00
Aronai Sieyes
2b4064e5cf IP reputation check toggle verb 2020-01-16 10:11:44 -05:00
Aronai Sieyes
fec8571d65 Ban/unban, note/unnote, kick to webhook 2020-01-15 21:26:56 -05:00
Kazzc
ce80cc4c3e Changed "usr" << to "to_chat(usr, )" 2020-01-15 03:07:07 -06:00
Kazzc
e3ce286ea4 Committed out the old "request Spice" from Virgo and made a new command for "request spice" 
It should send a ding noise, comes with commands that allows an admin to "jump, give cookie, Look at VV, look at Player panel, DM them"
 2020-01-14 14:40:21 -06:00
TheFurryFeline
fb2b7dc49c Allows Quick-NIFing for most staff 
Changelog Notes:

- Adds Quick NIF ability to those with R_MOD, R_DEBUG, R_EVENT, and R_FUN.
 2020-01-13 22:37:11 -05:00
Razgriz
de24521619 First merge from upstream 2020-01-13 17:23:01 -07:00
TheFurryFeline
d98368beb9 Add Chomp edit comment. 2020-01-04 12:50:34 -05:00
TheFurryFeline
bb74b0ea65 Backport Quick-NIF Perms 
Re-add ability for other staff to be able to quick-NIF others. Would allow testing devs to give themselves a NIF back if they lost it after a shift and so forth.
 2020-01-04 12:46:47 -05:00
Hawk_v3
8a0b78c322 Merge remote-tracking branch 'upstream/master' 2020-01-01 15:16:53 +00:00
Atermonera
0924159554 Merge pull request #6589 from Heroman3003/fruist-multispawn 
Allows admin spawning fruit in multiples
 2019-12-31 19:14:32 -05:00
Unknown
63f2fc0f20 Repurposing FTW 2019-12-25 13:54:31 -05:00
Razgriz
62bc00aac2 Add files via upload 2019-12-25 04:18:18 -07:00
Unknown
235308da6e Merge remote-tracking branch 'VOREStation/master' into nova-basicfixes 2019-12-22 13:40:04 -05:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Unknown
9a7ac20158 Removes extraneous edit 2019-12-21 12:06:42 -05:00
Unknown
2e599f02c0 Actually this is redundant 2019-12-21 11:38:14 -05:00
Unknown
c0c5a6915c Derp 2019-12-21 11:37:28 -05:00
Unknown
283ac706b0 Mowmowmow 2019-12-21 11:30:34 -05:00
Unknown
40ade46d39 MSay/ASay perm changes 2019-12-21 10:44:53 -05:00
Spades
ec6ecb13ae Merge pull request #6303 from Novacat/nova-basicfixes 
Minor bug fixes
 2019-12-19 22:22:09 -05:00
Atermonera
3b7a737c08 Change various global species lists to GLOB versions, adds 2 more event subspecies. 2019-12-16 00:52:29 -05:00
Unknown
2e584ce3d0 Minor bug fixes 
- Ahelps sent by admins are no longer sent to discord
 2019-12-13 19:50:36 -05:00
Unknown
f68a82b81f Replaces lentext with length 2019-12-12 13:13:18 -05:00
Hawk_v3
a5c7909ed7 Merge remote-tracking branch 'upstream/master' 2019-11-17 12:42:55 +00:00