cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
73,749 Commits 5 Branches 0 Tags
f22503b5a281a38665d6900b208d50ff9c534a60
Commit Graph

843 Commits

Author SHA1 Message Date
Cadyn
a9fce95444 Fix ghost radio 2020-11-27 16:17:51 -08:00
cadyn
d260757e91 yumyum radio go vroom hehe 2020-11-24 22:45:41 -08:00
Chompstation Bot
db1c95c6a7 Move away from Travis CI to GitHub Actions 2020-11-24 19:00:16 +00:00
cadyn
8f8caeb621 one more lil sneaky chompedit tag 2020-11-22 21:28:41 -08:00
cadyn
c55132d06d Finally optimize radios 2020-11-22 21:20:05 -08:00
Razgriz
d2114cba9b Metroid Event and tweaks 
-Baby metroids now have a chance of spawning as part of a new major severity event.

-All slime references within metroid code has been removed.

-Some general stats of metroids have been tweaked.
 2020-11-22 01:00:16 -07:00
Nadyr
340e1347ba Merge pull request #739 from CHOMPStationBot/upstream-merge-9246 
[MIRROR] 13x Performance for Export chatlog, update rust_g to 0.4.6-vorestation
 2020-10-22 10:23:03 -04:00
Chompstation Bot
19517fcede 13x Performance for Export chatlog, update rust_g to 0.4.6-vorestation 2020-10-20 03:19:38 +00:00
Chompstation Bot
77c15811a2 Datum Component System (/tg/ port) 2020-10-19 10:36:26 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
ShadowLarkens
8c338ed9da NanoUI PDAs made Modular (lazy commit) 2020-09-16 21:31:49 -07:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Atermonera
4eb14e5a0d Merge pull request #7522 from Meghan-Rossi/cleanbotaitweak 
Improve cleanbot ai slightly
 2020-08-21 01:28:12 -04:00
ShadowLarkens
cefe1a0b3c TGUI Brig Timer, Prisoner Management Console, and Security Records 2020-08-18 07:57:13 -07:00
ShadowLarkens
5bbd5334b6 TGUI GPS & Mining Vendor & Ore Processing Console 2020-08-16 22:27:09 -07: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
dc6c47841d TGUI Backend Tweaks & Fixes 2020-08-07 00:29:50 -07:00
izac112
50834e4a7b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-02 23:52:01 +02:00
Novacat
04d19c7cbe Merge pull request #8536 from VOREStation/upstream-merge-7344 
[MIRROR] Aurora Cooking Port
 2020-07-31 01:34:42 -04:00
Rykka
e8ebaee3dd Fix incoming mirror PR 2020-07-31 01:14:09 -04:00
Atermonera
0f20fbd268 Makes using BYOND Filters easier. 2020-07-30 15:34:07 -04:00
Atermonera
31f04a4975 Aurora Cooking Port 2020-07-30 15:13:46 -04:00
Repede
5bc7f0bd72 'Reverts' a bunch of changes that we've made through the years and see if any of those could have been the cause for out of memory errors to start appearing, unchecks a bunch of unused things like mining rewards and coin-shop as well as some admin systems that are not checked on upstream. 
Also readds vore monkeys
 2020-07-26 12:48:22 -04:00
izac112
93083fc58b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-26 04:53:18 +02:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
ShadowLarkens
2579579fd1 TGUI'ified Medical Everything 
This converts basically every UI used in the Medical department to use
TGUI instead. Fancy!

ParadiseSS13/Paradise#13738
 2020-07-25 00:44:51 -07:00
Unknown
5d7afad7c3 Conflict Resolution 2020-07-24 09:07:41 -04:00
Rykka
21f64e40fd Merge branch 'master' into shep-dev-aurora-cooking 2020-07-22 23:25:41 -04:00
ShadowLarkens
126cc6b5da Update asset_cache to modern /tg/, and make TGUI compatible with it. CDN support, etc. 2020-07-19 20:46:12 -07:00
Rykka
454cfda0b6 Commit One 2020-07-19 16: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
Rykka
940aaec9c8 WIP Aurora Cooking Port 
This ports Aurora Cooking, sometimes called Nanako Cooking, from CitRP, who got it from Aurora originally. 

https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/608

Pulled from here with updates to to_chat()

Ovens and fryers now work like the microwave, but also have special trays/baskets that can be inserted and removed with things on them. There's also a crapton of new recipes. Note that you can still use the oven to just bake things, or produce variable food items, to my knowledge. This was specifically kept in when it was originally implemented, IIRC.

- Cooking now uses several machines to make recipes. Microwave, oven, deep fryer.
- Recipes have been redone to reflect this.
- Adds a reagent called Space Spice (used in Synnono's food recipes mostly, prevents recipe conflicts)
- New foods! Lots of them.
- You can cook using held mobs. Also, mouse/ratburgers.
I can dump the recipes if you'd like.

https://user-images.githubusercontent.com/40557659/52112070-10165a80-25cb-11e9-9a72-2c919f0033dd.png (From their PR, may not be accurate).

This is WIP, and will not compile just yet.
 2020-07-14 17:04:52 -04:00
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
izac112
22880f526d Voreupdate 2020-07-02 15:39:00 +02:00
Atermonera
736fdab6e3 Merge pull request #7273 from Cyantime/obs 
Observing improvements
 2020-06-24 11:36:18 -04:00
Atermonera
90a2053e57 Wrist-bound PDAs! 2020-06-21 16:42:05 -04:00
Darlantan
a0555ef2d4 Re-adds articles, fixes year yet again 2020-06-16 04:03:21 -04:00
Razgriz
1eae9b9bd1 Revert "Merge pull request #375 from Darlantanis/StarfireReportUpdate062" 
This reverts commit cd62907c51.
 2020-06-14 23:04:23 -04:00
Darlantan
b440e687b9 Fixes station year 2020-06-14 03:27:41 -04:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
Aronai Sieyes
719151a74a Port Bay's lockers, crates, largecrates, wall lockers 2020-05-31 12:26:00 -04:00
izac112
0d1fe7d706 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-30 16:01:43 +02:00
Aronai Sieyes
6809133d75 Port Eris' extensive floor blending system 2020-05-29 14:00:43 -04:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
izac112
2f8e296e0e Switches back from solcom to solgov and TCG to USDF 2020-05-24 14:10:51 +02:00
Aronai Sieyes
49b9896f73 Redo respawning 2020-05-23 17:32:02 -04:00