cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 05:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,642 Commits 7 Branches 0 Tags
4ce40dad53730f9176b51c0bb92b3e0bc06e14dc
Commit Graph

969 Commits

Author SHA1 Message Date
Nadyr
4ce40dad53 Merge pull request #1625 from CHOMPStationBot/upstream-merge-9955 
[MIRROR] [MIRROR] Added think-tanks.
 2021-03-26 03:50:02 -04:00
Chompstation Bot
b7b8682e7c [MIRROR] Added think-tanks. 2021-03-18 14:57:26 +00:00
Novacat
b6c28ecfb0 Merge pull request #9964 from VOREStation/upstream-merge-7981 
[MIRROR] Minor cleanup.
 2021-03-18 14:40:34 +00:00
Chompstation Bot
d79e318320 [MIRROR] Allergens v2 2021-03-10 19:07:12 +00:00
Chompstation Bot
b85e9fc4d9 [MIRROR] Industrial Expansion 2021-03-09 21:53:03 +00:00
Novacat
efd4408d5b Merge pull request #9873 from VOREStation/upstream-merge-7940 
[MIRROR] Diet/Allergy Rework & Refactor Pt2
 2021-03-07 22:01:53 +00:00
Nadyr
396f0ea1e9 Merge branch 'master' into upstream-merge-9751 2021-03-06 00:05:57 -05:00
Chompstation Bot
1aa9efb728 [MIRROR] Added verbs/handling for removing and attaching your own robotic bodyparts. 2021-02-28 23:08:29 +00:00
Chompstation Bot
d642cbee1c [MIRROR] Diet/Allergy System Rework 2021-02-28 00:36:58 +00:00
Cadyn
ae7b89500a Fixing stuff 2021-02-22 18:17:37 -08:00
Cadyn
1357b6e58a Update DMAPI 2021-02-22 17:44:28 -08:00
Chompstation Bot
653d2b9179 Communicator UI Improvements + Camera Console Moving Camera Fixes (rebundled) 2021-02-14 08:51:59 -05:00
Chompstation Bot
69e712d103 The clime offices 2021-02-08 00:36:14 +00:00
Cadyn
76ed115e37 Porting TG's SQL 2021-01-25 23:37:49 -08:00
Verkister
9abdd9bd48 Merge pull request #9590 from Verkister/affectitems 
Adds a new vorepanel mode addon.
 2021-01-25 22:46:22 +00:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
Chompstation Bot
d1f2ad4a18 Vore transform overhaul 2021-01-20 01:00:01 -05:00
Razgriz
72af6e6f23 Merge pull request #1117 from CHOMPStationBot/upstream-merge-9564 
[MIRROR] [MIRROR] Blob Genesis
 2021-01-16 18:05:40 -07:00
BlackMajor
8673bcad39 Adjustments following feedback 2021-01-14 03:36:05 +13:00
Chompstation Bot
6ddd2efb7b [MIRROR] Blob Genesis 2021-01-13 00:22:31 +00:00
Chompstation Bot
f80607ae84 polaris#7778 earlyport - A Thing About Digging Sand and Mineral Processor Speed 2020-12-07 17:03:03 +00:00
Chompstation Bot
018d176c51 [MIRROR] Fresh Meat, Leatherworking 2020-11-08 17:04:32 +00:00
Nadyr
30717d0f05 Merge pull request #749 from cadyn/linguist 
Cadyn's traits changes part 1
 2020-10-26 00:01:38 -04:00
Cadyn
bd2e76e4e8 Cadyn's traits changes part 1 2020-10-22 20:02:21 -07:00
Nadyr
c9e6d0c136 Merge pull request #727 from CHOMPStationBot/upstream-merge-9125 
[MIRROR] Adds Spacer Language
 2020-10-22 10:26:51 -04: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
6d02d61e54 Adds Spacer Language 2020-10-19 10:40:15 +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
Novacat
e8f7b01ea4 Merge branch 'master' into kk-adminships 2020-09-27 17:02:08 -04: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
SplinterGP
7bf3fc31bc Removes nanoUI autolathe code stuff. 2020-09-15 19:06:46 -03:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Killian
eb8ecaddb2 hull/glass replacement, further polish, other misc tweaks 
also adds plastitanium hull components for later use
 2020-09-08 06:34:44 +01:00
Razgriz
85b55d8be4 Metroid evolution code 
Adds code to spawn a new metroid and an ATTEMPT at transferring the mind (ckey), but the transfer is not working yet.
 2020-09-01 00:07:08 -07:00
Rykka
379f674b8d Adds Door Volume Channel 
Adds Door Channel Volume preference for doors, that applies to open/close/bolts sounds.
 2020-08-28 17:14:58 -04:00
Novacat
180e265744 Merge pull request #8855 from VOREStation/upstream-merge-7548 
[MIRROR] Xenoarchaeology Upkeep
 2020-08-28 13:01:47 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Atermonera
939a5046b2 Merge pull request #7548 from Mechoid/XenoarchUpkeep 
Xenoarchaeology Upkeep
 2020-08-27 19:45:12 -04:00
Novacat
b5c884eb03 Merge pull request #8825 from ShadowLarkens/tgui_research_rebased 
TGUI Research
 2020-08-25 17:12:24 -04:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
David Winters
42f2b58b25 Moved name change to define, removes legacy entries from alienwhitelist 2020-08-23 23:31:31 -04:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Novacat
1b27dffb9d Merge pull request #8757 from VOREStation/upstream-merge-7445 
[MIRROR] FBP Internal Components
 2020-08-21 13:32:02 -04:00
Verkister
5c50080377 Merge pull request #8754 from VOREStation/upstream-merge-7386 
[MIRROR] Reagent Hoses
 2020-08-21 14:25:55 +03:00
ShadowLarkens
7aaa40b62c Beginnings of a global volume control system 2020-08-21 04:42:47 -04:00
Mechoid
170b9a7513 FBP Internal Components 2020-08-20 21:40:15 -04:00
Mechoid
496322f4f1 Reagent Hoses 2020-08-20 21:24:06 -04:00