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

615 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
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
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
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
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
Aronai Sieyes
61ae4f886c Shapeshifter color selection knows default/current 2020-05-21 11:59:54 -04:00
Repede
3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates 
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
 2020-05-18 20:30:52 -04:00
Aronai Sieyes
48563200ce VS: Tweak some icon blending 2020-05-18 13:42:42 -04:00
Aronai Sieyes
0adea12715 Optimize mob finding in radio ranges 2020-05-18 11:17:39 -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
190e8bdd5a Try to ensure some mobs don't end up processing in SSmobs 2020-05-17 09:40:39 -04:00
Aronai Sieyes
0d14487cdc Add serial comma 2020-05-16 17:06:21 -04:00
izac112
bbb084a354 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 09:06:27 +02:00
Arokha Sieyes
a77da3b5df Clean up merge conflicts 2020-05-14 09:44:52 -04:00
Atermonera
21620a1814 Add UAVs 2020-05-14 00:34:29 -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
izac112
2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Arokha Sieyes
6d47c2f95c Further time fixes 2020-05-08 10:09:40 -04:00
Arokha Sieyes
323f7e651f Fix/rename some timing stuff 2020-05-08 01:51:52 -04:00
Aronai Sieyes
ae303cd122 Merge pull request #7676 from VOREStation/aro-bicon2 
Refactor examining and some of getFlatIcon
 2020-05-06 23:21:41 -04:00
Aronai Sieyes
939105952a "Deg" instead of symbol 2020-05-06 23:11:29 -04:00
Aronai Sieyes
9acf643828 Make DS2NEARESTTICK macro 2020-05-06 20:26:51 -04:00
Aronai Sieyes
bd298810f2 Redo examining in general and tweak getFlatIcon 2020-05-06 18:37:46 -04:00
Aronai Sieyes
d172e2dd04 Cached version of icon_states() proc 2020-05-06 16:06:44 -04: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
0b19c528da Allows do_mob and do_after to be exclusive, to prevent stacking 2020-05-05 19:10:55 -04:00
ShadowLarkens
dc61ee2ffe Vore Datums implemented, awaiting integration&testing 2020-04-30 16:37:41 -07:00
Unknown
49570f0d24 New Lore Oversights 
- Loads banners_vr
- Properly sets time back to 2320
 2020-04-30 09:11:08 -04:00