cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,759 Commits 8 Branches 0 Tags
f6bcad07df1a585a398be3cc039c8e829756926f
Commit Graph

1314 Commits

Author SHA1 Message Date
Nadyr
a494347a7e Merge branch 'master' into upstream-merge-10095 2021-04-11 03:34:32 -04:00
Nadyr
abb0cf342d Merge branch 'master' into upstream-merge-10092 2021-04-10 22:50:33 -04:00
Nadyr
f5dd6e85fa Update resize.dm 2021-04-09 02:24:56 -04:00
Chompstation Bot
6ce0b7ee4e Make unnatural resizing even better and more efficient with the power of DCS™️ 2021-04-08 15:15:21 +00:00
Chompstation Bot
64990312af Update resize pref and some resizing code 2021-04-07 20:08:32 +00:00
Novacat
9f5bd65d67 Merge pull request #10090 from Nyksia/resize-fix 
Resize fix and polish
 2021-04-07 15:52:56 +00:00
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
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
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
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
Chompstation Bot
a5801d04b6 [MIRROR] Adds proc to properly update human icon gender 2021-02-10 19:14:53 +00:00
cadyn
93ae63e736 Update adminsay.dm 2021-02-06 07:23:41 -08:00
cadyn
72a19514f5 conflicts reee 2021-02-04 23:45:01 -08:00
Chompstation Bot
0a01392af4 Uplink and Adminverb Tweaks 2021-02-02 15:20:23 +00: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
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
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02: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
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Heroman3003
34eb48c770 Replace another instance of IRC with Discord in ahelp verbs 2020-08-22 12:13:10 +10:00
Atermonera
45b1b77f42 Merge pull request #7497 from Shadow-Quill/AdminPM 
Cancelling choosing someone to admin PM won't say "no mob"
 2020-08-20 22:21:42 -04:00
izac112
5c02633707 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-13 20:01:22 +02:00
ShadowLarkens
f156857e14 TGUI Appearance Editor (Mirrors & Admin) 2020-08-10 08:08:33 -07:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
SplinterGP
9b4843da61 i think this is all the changes ? 2020-07-27 20:59:20 -03:00
BlackMajor
717a5fa049 aughe 2020-07-23 13:57:39 +12:00
Razgriz
f382a1d365 Add quick authentic nif 2020-07-15 21:04:02 -07:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
Izac Joof Forsgren
d76589b9e9 Revert "Revert "Fixes some events, removes unused scripts related to TGS3, etc"" 2020-07-09 18:00:20 +02:00
Izac Joof Forsgren
3cb9892fbc Revert "Fixes some events, removes unused scripts related to TGS3, etc" 2020-07-09 14:54:48 +02:00
Repede
1845eed3cc Fixes some events, removes unused scripts related to TGS3, etc 2020-07-07 20:04:03 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Aronai Sieyes
49b9896f73 Redo respawning 2020-05-23 17:32:02 -04:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00