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
59,634 Commits 8 Branches 0 Tags
54e632ebf26f7be74c572adf36f97fd4e9df0c00
Commit Graph

378 Commits

Author SHA1 Message Date
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
Cadyn
12e5b8ee22 Chompedit tags 2020-09-06 21:12:07 -07:00
Cadyn
625b292616 Add debugging for stuff going wrong here. 
Should give more insight into DB fuckery
 2020-09-06 20:57:01 -07:00
cadyn
6e0c91a0bc Add Chompstation Edit Comments 2020-08-28 13:10:17 -07:00
Heroman
ffdd8de3ce Site Management lookover for _vr stuff 2020-08-29 05:22:52 +10:00
Novacat
28c19ee066 Merge pull request #8868 from VOREStation/upstream-merge-7571 
[MIRROR] Colony Director -> Site Manager
 2020-08-28 13:17:58 -04:00
Novacat
b66cfb340c Merge pull request #8870 from VOREStation/upstream-merge-7574 
[MIRROR] Adds Engine Randomization on Mapload! (From VOREStation!)
 2020-08-28 12:56:12 -04:00
Rykka
6f3ca562ed Fixes incoming PR, removes now-duplicated code 
Removes mapping_vr.dm, engine.dm, and engine_areas.dm, given that these are now enabled in the core engine.dm
 2020-08-27 21:42:42 -04:00
Atermonera
c69d4ab48a Adds Engine Randomization on Mapload! (From VOREStation!) 2020-08-27 21:28:09 -04:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
ShadowLarkens
264793b36a Fading titlescreen from /tg/ 2020-08-25 16:50:23 -07:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
Cadyn
5e02857320 Many bugfixes! 2020-08-23 19:54:11 -07:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Rykka
ad6870c78d Persistence Patch 
- Fixes Paper and font tags stacking across rounds, as shown in: ![](https://cdn.discordapp.com/attachments/187013248309002240/741937939382141000/164fdd3a37fb22f18dfa9b5c431ffc04.png)

- Fixes Graffiti being persistent for over 50 rounds (10+ days)
- Sets Trash to be persistent for 4 rounds instead of 5
- Fixes Persistence being always-on because of if("persistence_enabled") config.persistence_enabled = 1. As explained: 
> it's on by default, which means config.txt will be read and if it's not there it stays at 1. If it is there,it gets set to 1. There is no way to disable it

- Adds config options to enable/disable **Persistence for Maploaded objects**, as well as a verb to toggle such.
- Adds Persistence to config.

Currently IGNORE_MAPLOAD for Persistance is **Disabled.**
Maploaded objects/dirt/etc will be saved by persistence, preserving current behavior.
 2020-08-16 09:48:46 -04:00
izac112
81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Razgriz
f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull 
August2020UpstreamPull
 2020-08-09 02:58:18 -07:00
ShadowLarkens
f8881b2ca7 Fix Medical Records Virology 2020-08-07 04:55:04 -07:00
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
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
Razgriz
659217c565 Remove safetofile for NIFs 
Long shot, but in hopes of fixing a crashing bug involving NIF info saving to character file
 2020-07-15 19:45:08 -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
Razgriz
feba76fa68 Update ticker.dm 2020-07-13 16:22:19 -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
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
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
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