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
57,268 Commits 6 Branches 0 Tags
50834e4a7becfc93c04866813611267089883f32
Commit Graph

1235 Commits

Author SHA1 Message Date
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Atermonera
9336c4690d Merge pull request #7392 from lbnesquik/Kot-Restart-Sentnece 
Add a 'Restarting world!' notice.
 2020-08-02 00:15:43 -04:00
SplinterGP
9b4843da61 i think this is all the changes ? 2020-07-27 20:59:20 -03:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Cerebulon
8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
ShadowLarkens
2992efb823 TGUI v4.0 2020-07-17 22:09:26 -07:00
ShadowLarkens
a20eef5bfb TGUI Camera Console - Part 1; Plain console done 
# Conflicts:
#	code/_onclick/hud/skybox.dm
#	code/controllers/subsystems/skybox.dm
#	code/game/machinery/computer/camera.dm
#	tgui/packages/tgui/public/tgui.bundle.js
 2020-07-16 16:17:36 -07:00
ShadowLarkens
1cded01770 TGUI v3.0 
This ports TGUI, and makes the old nano crew monitor and the disposal
bins use it as first examples.
 2020-07-16 14:59:45 -07:00
izac112
0f05106e95 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-15 12:27:54 +02:00
Leshana
36ef48c931 Quick fix to stop mobs in nullspace runtiming the mobs and ai subsystems. 2020-07-14 11:40:34 -04: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
22880f526d Voreupdate 2020-07-02 15:39:00 +02:00
izac112
4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02:00
Atermonera
9957da080d Merge pull request #7283 from MistakeNot4892/supmat 
Generalizes supply points per material sheet to the material datum.
 2020-06-16 03:29:13 -04:00
Arokha Sieyes
862aef7e41 Log all supply purchases for stats generation 2020-06-16 00:19:57 -04:00
Atermonera
7834c074f1 Merge pull request #7276 from lbnesquik/Kot-Supply-updatye 
Make it so you can FINALLY export other things but platinum and phoron.
 2020-06-14 21:31:20 -04:00
izac112
d1ce4db947 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-28 23:53:36 +02:00
izac112
db8074a64b Update ticker.dm 2020-05-27 20:38:08 +02:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Leshana
ac8922bdf5 Check vchat loaded flag before attempting to call putmessage 2020-05-25 16:02:58 -04:00
Aronai Sieyes
86373ecc96 Merge pull request #8050 from VOREStation/Arokha/furtherghost 
Redo respawning
 2020-05-25 11:37:51 -04:00
Aronai Sieyes
ad925b5a48 Update ticker.dm 2020-05-24 19:23:06 -04:00
Atermonera
2514f55320 Ports manifest duplication fix from Virgo 2020-05-24 17:25:38 -04:00
Leshana
8a21fc2e6c Add code to enable communication with VGS 
VGS provides a subset of TGS functionality, mostly just the discord bot.  It extends TGS datums and adds a little bit.
Right now its done in parallel to TGS's code to minimize impact of not having the rest of DMAPI v5 impemented.
 2020-05-24 02:11:16 -04:00
Aronai Sieyes
49b9896f73 Redo respawning 2020-05-23 17:32:02 -04:00
Aronai Sieyes
1b2b6398ba Merge upstream PR 2020-05-22 09:33:17 -04:00
Atermonera
8804f6de95 Fixes runtime in ticker.dm, 411: Cannot read null.mobtype 2020-05-21 23:29:20 -04:00
izac112
84f4108267 Finishes the sound additions 
Thanks very soft
 2020-05-21 23:15:28 +02:00
izac112
e16bd93416 Custom welcome messages thanks to VerySoft 2020-05-21 22:17:32 +02:00
Aronai Sieyes
62c3bdd2e7 Merge upstream PR 2020-05-21 15:43:40 -04:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Atermonera
0c200c9483 Allows you to toggle off Byond/Discord/URLs in OOC 2020-05-21 14:20:05 -04:00
izac112
7fc7803e53 Update autotransfer.dm 2020-05-20 23:45:55 +02:00
Aronai Sieyes
9ead81ca31 Merge pull request #7988 from VOREStation/Arokha/protfixes 
Make protean deaths a bit more robust
 2020-05-20 16:09:29 -04:00
Aronai Sieyes
1a3f9cc3ee General fixes 2020-05-20 13:54:49 -04:00
Aronai Sieyes
ce31fbdef3 Move openspace object updating to event listeners 2020-05-19 14:21:25 -04:00
Aronai Sieyes
faa12380f3 Log time dilation for metrics 2020-05-19 00:01:26 -04:00
izac112
c14d144d45 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-18 16:05:36 +02:00
Aronai Sieyes
8eb77a04ec Redo mobs subsystem to be more like SSai with regards to skipping 2020-05-17 10:00:45 -04:00
Aronai Sieyes
0f1d00d13b Make the global announcer really global 2020-05-17 10:00:45 -04:00
Aronai Sieyes
0bad4363b8 Sleep AI processing when nobody on their Zlevel 2020-05-17 10:00:45 -04:00
Aronai Sieyes
b21d384a2e Further molest revdata 2020-05-16 18:36:06 -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
3486770bc7 Merge pull request #7806 from VOREStation/aro-staffwhobot 
Adminnery!
 2020-05-12 11:46:44 -04:00
Aronai Sieyes
715066ba80 Merge pull request #7785 from Heroman3003/borg_pto 
Allows Cyborgs and AI to earn PTO and departmental playtime
 2020-05-12 11:36:01 -04:00
Aronai Sieyes
d4cfdcfb3a Switch to using GLOB.admins instead of admins 2020-05-12 11:16:54 -04:00
Heroman
25a7bde56f Removes redundant check for AI 2020-05-12 18:35:51 +10:00
Heroman3003
3ef2c3c145 Applies suggested changes 
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
 2020-05-12 18:25:38 +10:00