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
61,441 Commits 5 Branches 0 Tags
00bc513e6eb47ecc8d9faaab31a85c6c54d7c4f8
Commit Graph

2321 Commits

Author SHA1 Message Date
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
Razgriz
ec7f175d19 Merge pull request #1095 from cadyn/fixuplinks 
Fix uplinks
 2021-01-08 19:44:21 -07:00
Cadyn
e20eb71125 Fix uplinks 2021-01-08 14:42:35 -08:00
Razgriz
ea80be587b Merge pull request #750 from MisterGrimm/GoodbyeMicromechs 
Commenting out micro mech stuff
 2021-01-08 15:20:57 -07:00
Nadyr
8459ce9c13 Update misc.dm 2021-01-03 21:35:50 -05:00
Chompstation Bot
d96a127b4a Ports Vox Plushie from Paradise 2020-12-26 01:59:20 +00:00
Novacat
a412c08e06 Merge pull request #9491 from VOREStation/upstream-merge-7794 
[MIRROR] Puts smelly pine tree over stinky event listeners
 2020-12-22 15:17:11 +00:00
Chompstation Bot
7b30714172 [MIRROR] Adds & Upgrades a Bunch of Teshari Clothing 2020-12-04 20:07:48 +00:00
Cadyn
96c6d2e9ff Kassc's POI/event requests 2020-10-29 16:05:26 -07:00
Razgriz
d88ccdabf6 Merge pull request #759 from CHOMPStationBot/upstream-merge-9207 
[MIRROR] [MIRROR] Phoron bore utility improvements
 2020-10-28 20:21:26 -07:00
Verkister
57adb0bfca Merge pull request #9207 from VOREStation/upstream-merge-7680 
[MIRROR] Phoron bore utility improvements
 2020-10-27 08:16:22 +00:00
Sym
1173ddf675 Remove micro mech stuff 
Time to take out the trash.
 2020-10-23 20:17:07 -04:00
Nadyr
e1c359c9d3 Merge pull request #716 from CHOMPStationBot/upstream-merge-9230 
[MIRROR] [MIRROR] Adds tesla generator crate to cargo
 2020-10-22 09:34:20 -04:00
Verkister
210505f2e4 Merge pull request #9230 from VOREStation/upstream-merge-7717 
[MIRROR] Adds tesla generator crate to cargo
 2020-10-19 10:38:51 +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
92ff2bcbf4 Recompile nanomaps, and add nanomap improvements 2020-09-25 03:52:49 -07:00
Novacat
d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale 
NanoUI Goes To Brazil
 2020-09-21 14:13:16 -04:00
SubberTheFabulous
378ba4f4c0 Adds two new augments to Traitor uplink 2020-09-20 06:49:58 -04:00
ShadowLarkens
3f191e4204 NanoUI Goes To Brazil 2020-09-20 02:36:46 -07:00
Braiden
c55ea87e94 Merge branch 'kbraid.edit/additions' of https://github.com/KBraid/YWPolarisVore into kbraid.edit/additions 2020-09-19 03:03:11 -05:00
Braiden
71266ace1e added new plushies to drop lists 2020-09-19 03:03:09 -05:00
SplinterGP
7bf3fc31bc Removes nanoUI autolathe code stuff. 2020-09-15 19:06:46 -03:00
izac112
9d8f2623de More thingus 2020-09-14 14:09:52 +02:00
izac112
b4615a306a reverts to old lathe and fixes one of the build errors related to it 2020-09-14 13:37:03 +02:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
ShadowLarkens
dd4f9c9967 TGUI NTOS - Total Conversion 2020-09-05 17:02:58 -07:00
Novacat
d8c7593395 Merge pull request #7725 from Little-119/shiny-clothing 
Add Romantical Whale's "Shiny Clothing"
 2020-09-05 12:37:15 -04:00
ShadowLarkens
c32f05e1f7 TGUI Civilian 
UI's Converted:
 - Aurora Cooking
 - Chaplain Book Selection
 - ColorMate
 - Cryo Storage
 - Holodeck
 - Jukebox
 - Looking Glass
 - Microwave
 - Newscasters
 - Timeclock
 - Vending Machine Improvements
 2020-09-02 13:32:42 -07:00
Mechoid
97831abf14 Distillery Upkeep, Chemistry Tweakening (#7573) 
* Distillery For Chemistry

* Synthplasma, Synthblood but not horrifically strong.

* Rectify, I said, damnit!

* Distillery for Chem. Now with STRONG DMM.

* changeling
 2020-08-31 22:37:18 -04:00
lbnesquik
af8b409555 Add an Inducer crate to cargo. Relatively expensive at 90. 2020-08-30 21:40:09 +02:00
Unknown
10ca73bc6e Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7576 2020-08-28 13:30:54 -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
bd4d0e78d4 Merge pull request #8833 from VOREStation/upstream-merge-7456 
[MIRROR] The great Aurora shoe heist
 2020-08-28 13:04:33 -04:00
Unknown
abef279ba7 compatibility fixes 2020-08-28 12:49:11 -04:00
Novacat
f6e61ea8f1 Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions 
Massive Ambience and Sound Overhaul + Addition
 2020-08-28 00:47:23 -04:00
Atermonera
57bc515c04 Replace "Sleeping Agent" with Nitrous Oxide, Add New Sprites for Gases 2020-08-27 22:28:46 -04:00
Atermonera
21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Atermonera
9e76d0ca68 Merge pull request #7567 from lbnesquik/Kot-PIZZAFIX 
Fix a pizza issue.
 2020-08-27 20:38:16 -04:00
Rykka
d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Little-119
bcb07cfeef Add Romantical Whale's "shiny" clothes 2020-08-27 18:08:36 -04:00
Rykka
56d7235525 Adds Knight Boots to vendor/crate/POI, adds Lennie/George to Tether 2020-08-26 22:19:19 -04:00
Rykka
6ef52be981 Adds Knights of the Round Table, Rabbits, Killer Rabbits 
Scree's Request!

This adds the Knights of the Pizza Table (Monty Python's Knights) armor and costumes. Costumes are orderable via Cargo OR Vendors.

This adds passive Rabbit voremobs, and a killer rabbit. If you pet the rabbit too much, you'll make it grumpy, and it will do a nomf. You can see their grumpiness level in their description/examine.

Knight's Armor has good melee and bullet protection, and little else.
 2020-08-26 21:58:30 -04:00
Atermonera
ac824e6bfc The great Aurora shoe heist 2020-08-25 19:17:10 -04:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
izac112
48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
Novacat
c314578ed3 Merge pull request #8786 from Meghan-Rossi/lathefix 
Fixes duplicate autolathe entries+lets you batch-print carafes+pitchers
 2020-08-21 17:16:44 -04:00
Novacat
16465b5618 Merge pull request #8728 from VOREStation/upstream-merge-7466 
[MIRROR] Adds wearing cones and caution signs
 2020-08-21 13:33:08 -04:00
Novacat
a6efe9acbb Merge pull request #8756 from VOREStation/upstream-merge-7449 
[MIRROR] Flavour Enhancement: Vending
 2020-08-21 13:32:37 -04:00