cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,441 Commits 6 Branches 0 Tags
00bc513e6eb47ecc8d9faaab31a85c6c54d7c4f8
Commit Graph

1289 Commits

Author SHA1 Message Date
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
Razgriz
6c591400e1 Update adminhelp_vr.dm 2020-05-21 04:16:05 -07:00
Razgriz
3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Atermonera
c3e5e6c1f1 Edit Appearance and Change Appearance update icon sex 2020-05-19 21:54:38 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
Atermonera
3057230bb2 Fixes #649 (#7114) 2020-05-15 16:33:17 -04:00
izac112
bba0a05f5f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-13 10:21:49 +02:00
Aronai Sieyes
d4cfdcfb3a Switch to using GLOB.admins instead of admins 2020-05-12 11:16:54 -04:00
Aronai Sieyes
96da7be01b Put APCs and SMESes into GLOB lists to ease iteration 2020-05-11 22:05:41 -04:00
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Aronai Sieyes
b9262c72f1 Make buildmode AI control reset home turfs when move orders given 2020-05-08 18:46:54 -04:00
Razgriz
81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
izac112
e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
 2020-05-06 21:53:03 +02:00
Aronai Sieyes
a0a3971449 VS: Stop adjusting cooldown directly 2020-04-30 15:44:19 -04:00
Aronai Sieyes
f5cbd8c35e Stop adjusting cooldown directly 2020-04-30 15:43:58 -04:00
Novacat
2c4a0a5831 Merge pull request #7350 from VOREStation/upstream-merge-6998 
[MIRROR] Adds empty filter classes to send messages to particular vchat filters.
 2020-04-23 23:56:38 -04:00
Leshana
323f20cfec Adds "Move" command to atom/movable's VV dropdown that lets you jump it to a coordinate. 2020-04-22 11:43:18 -04:00
Atermonera
7bf77736c2 Adds empty filter classes to send messages to particular vchat filters. 2020-04-20 03:28:57 -04:00
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