cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
71,276 Commits 8 Branches 0 Tags
92d87ee3c614123cb15c3543c371f75810df8be1
Commit Graph

2534 Commits

Author SHA1 Message Date
Nadyr
e25155514c Merge branch 'master' into upstream-merge-10028 2021-04-03 01:20:13 -04:00
Nadyr
4307a692e8 Merge pull request #1696 from CHOMPStationBot/upstream-merge-10032 
[MIRROR] Adminbus Area Modifications
 2021-03-30 04:00:25 -04:00
Nadyr
e22a6d6eab Update randomverbs.dm 2021-03-30 03:34:45 -04:00
Nadyr
2d6c3c92e6 Merge branch 'master' into upstream-merge-9632 2021-03-30 02:41:50 -04:00
Chompstation Bot
337acaa851 Adminbus Area Modifications 2021-03-29 17:22:38 +00:00
Chompstation Bot
698faf0042 Makes the event HUD work 2021-03-27 16:19:08 +00:00
Nadyr
c6ceabf308 Merge pull request #1565 from CHOMPStationBot/upstream-merge-9900 
[MIRROR] [MIRROR] Fixes context-menu examine expanding incorrect target
 2021-03-11 00:53:51 -05:00
Razgriz
a7c4693f3f Merge pull request #1544 from CHOMPStationBot/upstream-merge-9854 
[MIRROR] Makes drag-drop bodyjacking not break aghost bonds
 2021-03-10 22:08:15 -07:00
Novacat
6af8ca393b Merge pull request #9900 from VOREStation/upstream-merge-7958 
[MIRROR] Fixes context-menu examine expanding incorrect target
 2021-03-10 19:46:45 +00:00
Novacat
7de2e4ed3a Merge pull request #9854 from Verkister/patch-38 
Makes drag-drop bodyjacking not break aghost bonds
 2021-03-09 22:33:11 +00:00
Chompstation Bot
5a70c39b08 [MIRROR] Lobby Improvements 2021-03-09 22:32:57 +00:00
Cadyn
3995353b03 Bot cleanup and config 
Cleaning my code up and adding stuff to config
 2021-02-24 16:05:49 -08:00
Cadyn
155195e892 fix 2021-02-24 14:12:29 -08:00
Cadyn
aec93d5c99 make ahelp channel work properly 2021-02-24 14:05:15 -08:00
Cadyn
51ce2042af Faxes and ahelps admin channel changes 2021-02-24 13:36:31 -08:00
cadyn
82dac66662 Merge pull request #1383 from CHOMPStationBot/upstream-merge-9761 
[MIRROR] [MIRROR] Porting Fixes
 2021-02-23 03:43:07 -08:00
Razgriz
61192181d0 Update randomverbs.dm 2021-02-23 03:25:13 -07:00
Razgriz
0f0674defa Update admin_verb_lists.dm 2021-02-23 03:21:06 -07:00
Razgriz
64d3d3b934 Revert "Add quick authentic nif" 2021-02-23 03:14:46 -07:00
Chompstation Bot
f55f171cdf [MIRROR] Porting Fixes 2021-02-21 16:02:54 +00:00
Razgriz
a1b49e2fc5 Merge pull request #1357 from CHOMPStationBot/upstream-merge-9738 
[MIRROR] Two fixes for messages I noticed in logs
 2021-02-18 04:32:14 -07:00
Razgriz
6ded190412 Merge pull request #1283 from CHOMPStationBot/upstream-merge-9539 
[MIRROR] [MIRROR] Adds proc to properly update human icon gender
 2021-02-17 15:02:54 -07:00
Novacat
9e5a5c4c46 Merge pull request #9738 from VOREStation/twologfix 
Two fixes for messages I noticed in logs
 2021-02-17 15:40:52 +00:00
Chompstation Bot
37031c2c9b Shuttle control panel (rebundled) 2021-02-14 08:29:32 -05:00
Chompstation Bot
a5801d04b6 [MIRROR] Adds proc to properly update human icon gender 2021-02-10 19:14:53 +00:00
Verkister
ac8a77dd06 Merge pull request #9612 from VOREStation/upstream-merge-7839 
[MIRROR] Fixed global_announce autospeaker
 2021-02-10 10:11:30 +00:00
cadyn
93ae63e736 Update adminsay.dm 2021-02-06 07:23:41 -08:00
cadyn
a48919abd7 more weird stuff that we don't need 2021-02-04 23:45:27 -08:00
cadyn
72a19514f5 conflicts reee 2021-02-04 23:45:01 -08:00
cadyn
0c8572347a bad virgo, stop doing weird stuff 2021-02-04 23:43:23 -08:00
Chompstation Bot
0a01392af4 Uplink and Adminverb Tweaks 2021-02-02 15:20:23 +00:00
Cadyn
be51ec1b85 Porting attack logs to use SQL 2021-01-27 16:59:27 -08:00
Cadyn
00bc513e6e Implementing TGSQL security 2021-01-27 10:51:12 -08:00
Cadyn
76ed115e37 Porting TG's SQL 2021-01-25 23:37:49 -08:00
Cadyn
95ac7036b6 fixy wixy 
was working on my local machine but since we have a different name for the db on the server a little oopsie made the verb unable to get any logs
 2021-01-25 18:34:46 -08:00
Cadyn
95f9b99873 The logenning 2021-01-25 15:25:36 -08:00
Novacat
652a7d75d1 Merge pull request #9349 from Novacat/nova-basicfixes 
More ship and turret fixes
 2020-11-23 22:19:11 +00:00
cadyn
2486a483c8 give mods quick nif privvys 2020-11-09 10:47:57 -08:00
Cadyn
dd7f3555d0 Admin teleport verb addition 2020-10-28 02:28:19 -07:00
Cadyn
7804eeada1 Chompedit tags 2020-10-08 12:30:52 -07:00
Cadyn
d9795baaf7 Give Quick NIF to the boys 2020-10-08 12:26:38 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
ShadowLarkens
cf9b39b4a9 Set up GitHub action for nanomap generation 2020-09-25 03:25:07 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Repede
037f76babd adds missing comment and removes capitals for consistency 2020-09-06 16:31:32 -04:00
Repede
f4ab9e9022 re-adds setckey command 2020-09-06 16:29:19 -04:00
Atermonera
f612958f0c Merge pull request #7603 from Greenjoe12345/customloadout 
adds the ability to give loadout items a custom name/description
 2020-09-04 22:31:18 -04:00
lbnesquik
196580141b Improve quick nif 
You can now choose which nif you want to give them
 2020-08-30 20:53:23 +02:00
ShadowLarkens
eac9e46615 TGUI Law Manager 2020-08-28 11:36:47 -07:00