cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-06-05 22:33:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,283 Commits 6 Branches 0 Tags
bd2e76e4e8eb4fbc32aa484e4315203d64df2d22
Commit Graph

3538 Commits

Author SHA1 Message Date
Verkister 16a23eadec Merge pull request #9235 from VOREStation/upstream-merge-7726 
[MIRROR] Fix most borosilicate shards disappearing instantly after being made
 2020-10-19 10:37:24 +00:00
LunarFleet bd1503a35d Realized I could touch up the interactions a bit 2020-10-15 23:37:26 -04:00
LunarFleet 163dc56069 Only eggs can sustain me 2020-10-15 20:34:13 -04:00
Razgriz 0a8521f900 Merge pull request #568 from cadyn/vspull 
Direct pull from virgo
 2020-10-06 20:52:54 -07:00
Razgriz ef5f28cb0c Merge pull request #551 from Holdelta/master 
Reverting changes to the RMS
 2020-10-06 15:40:56 -06:00
Cadyn 07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
David Winters b6ac68836a please work PLEASE 2020-09-29 00:28:25 -04:00
ShadowLarkens 3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Razgriz 8cc3e87f1b Update scannable fabricator pathname 2020-09-26 15:13:00 -07:00
Razgriz 54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Novacat 4b83c18fb7 Merge pull request #9071 from VOREStation/upstream-merge-7660 
[MIRROR] Fix duplicate results from analyzing some objects
 2020-09-21 16:54:29 -04:00
Novacat d49640431d Merge pull request #9062 from ShadowLarkens/tgui_finale 
NanoUI Goes To Brazil
 2020-09-21 14:13:16 -04:00
Novacat 6fad165033 Merge pull request #9067 from VOREStation/upstream-merge-7651 
[MIRROR] Tweaks to pickup/equip sounds.
 2020-09-21 13:51:44 -04:00
Meghan-Rossi cbfd4789d7 Fix duplicate results from analyzing some objects (#7660) 2020-09-20 07:18:35 -04:00
Cerebulon 95ff8c2080 Tweaks to pickup/equip sounds. 2020-09-20 06:57:07 -04:00
SubberTheFabulous 378ba4f4c0 Adds two new augments to Traitor uplink 2020-09-20 06:49:58 -04:00
ShadowLarkens 308e32c860 TGUI Agent Card 2020-09-19 22:57:51 -07:00
Holdelta a712a23562 I missed a few commas 2020-09-15 23:14:21 -07:00
Holdelta f0b826a2d7 Reverting changes to RMS. 
Removing upstream changes.
 2020-09-15 23:04:53 -07:00
izac112 5fbb0b16b9 Voreupdate 2020-09-13 15:06:19 +02:00
izac112 4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Shadow Quill eb19c52598 Welderbomb! 2020-09-11 14:03:47 -05:00
Novacat 75186c414e Merge pull request #8987 from VOREStation/upstream-merge-7624 
[MIRROR] Fixes explosion maths.
 2020-09-05 12:25:19 -04:00
Novacat 5be90e22ff Update tanks.dm 2020-09-05 12:14:14 -04:00
Verkister f4e5ab45af Fixes explosion maths. 2020-09-05 11:05:59 -04:00
Heroman3003 e4d0b1a81b Adds board versions of a bunch of lawsets (#7611) 2020-09-05 10:20:42 -04:00
Darlantan 09768ea90c Confetti cannon 
-Adds confetti cannon
-Adds grenade object needed to make the cannon work
-Makes the cannon printable at RnD
 2020-09-05 07:15:49 -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
Novacat dba5a14b5f Merge pull request #8952 from Heroman3003/constructible-vorelaws 
Constructible vorelaws
 2020-09-01 08:02:26 -04:00
Heroman 732448d389 Fixes indent errors 2020-09-01 20:37:56 +10:00
Heroman3003 045be423b3 .dm 2020-09-01 16:27:42 +10:00
Heroman3003 00913ff339 Adds boards for AI vore laws 2020-09-01 16:26:39 +10:00
Cyantime 99009e6266 Jetpack cleanup, don't use fuel when unneeded 2020-08-31 21:13:04 -04:00
Cerebulon 7c57c7c0bd Vendor enhancement fixes (#7577) 
* Vendor enhancement fixes

* skrellsnax trash, tuna name
 2020-08-30 02:49:00 -04: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
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
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Novacat a69e94f948 Merge pull request #8519 from KillianKirilenko/kk-misc2 
Explorer/Pathfinder Belts
 2020-08-25 17:15:14 -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 a6efe9acbb Merge pull request #8756 from VOREStation/upstream-merge-7449 
[MIRROR] Flavour Enhancement: Vending
 2020-08-21 13:32:37 -04:00
Verkister 929ce6c728 Merge branch 'master' into upstream-merge-7386 2020-08-21 14:12:26 +03:00
Atermonera 4a6d87c3a5 Merge pull request #7521 from Meghan-Rossi/metapint 
Adds metamorphic pint glasses to RSF, autolathe, supply packs
 2020-08-21 01:28:23 -04:00
Novacat d63f0b2c3e Merge pull request #8665 from Rykka-Stormheart/shep-dev-mech-combat 
Adds Mech Toy Battles!
 2020-08-21 01:14:42 -04:00
Atermonera 3edff36a58 Merge pull request #7502 from Meghan-Rossi/ducttape 
Fix duct tape on self
 2020-08-20 22:24:43 -04:00
Atermonera 1e9e8c2c60 Flavour Enhancement: Vending 2020-08-20 21:25:31 -04:00
Mechoid 496322f4f1 Reagent Hoses 2020-08-20 21:24:06 -04:00
LunarFleet c33314eadf Kassc's death lego 2020-08-17 10:05:47 -04:00