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
54,558 Commits 6 Branches 0 Tags
566263e2f8f06813ab32d5e2c635c43fe55dbe01
Commit Graph

1133 Commits

Author SHA1 Message Date
Novacat
566263e2f8 Merge pull request #8876 from VOREStation/upstream-merge-7586 
[MIRROR] Travis only loads legal engines
 2020-08-28 13:44:18 -04: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
377cb6a5ce Merge branch 'master' into upstream-merge-7586 2020-08-28 13:17:17 -04:00
Novacat
e528a59857 Update configuration.dm 2020-08-28 13:10:57 -04:00
Novacat
2391911403 Update configuration.dm 2020-08-28 13:09:52 -04:00
Novacat
5446f5a74b Update configuration.dm 2020-08-28 13:07:05 -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
Atermonera
b43102392e Travis only loads legal engines 2020-08-27 22:17:58 -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
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
ShadowLarkens
f8881b2ca7 Fix Medical Records Virology 2020-08-07 04:55:04 -07:00
ShadowLarkens
dc6c47841d TGUI Backend Tweaks & Fixes 2020-08-07 00:29:50 -07: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
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
Leshana
36ef48c931 Quick fix to stop mobs in nullspace runtiming the mobs and ai subsystems. 2020-07-14 11:40:34 -04: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
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
Aronai Sieyes
62c3bdd2e7 Merge upstream PR 2020-05-21 15:43:40 -04:00
Atermonera
0c200c9483 Allows you to toggle off Byond/Discord/URLs in OOC 2020-05-21 14:20:05 -04: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
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
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
Aronai Sieyes
96da7be01b Put APCs and SMESes into GLOB lists to ease iteration 2020-05-11 22:05:41 -04:00