cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-06-04 13:53:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
59,666 Commits 9 Branches 0 Tags
64ed8a42c1fceff42fa728338917ea8dffe8dd6d
Commit Graph

9052 Commits

Author SHA1 Message Date
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
Braiden a8d4104fea added tesh plush ears, fixed PEili not apearing on head. 2020-09-20 17:23:14 -05: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
Izac Joof Forsgren d389a57133 Merge branch 'master' into kbraid.edit/additions 2020-09-16 13:38:00 +02:00
Braiden 565bb2a522 fixed a line 2020-09-15 19:35:29 -05:00
Braiden 55d8523787 teshari alternate placement slots (plush only) 
was only able to figure out how to do it for the plushie. someone else will need to do the living tesh.
 2020-09-15 19:34:40 -05:00
Izac Joof Forsgren 4e7b4df749 Merge branch 'master' into izac 2020-09-14 14:11:02 +02: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
Braiden e463b40a20 fix 2020-09-11 16:53:17 -05:00
Braiden 8b0a2a285d tesh plushes can be held, they can be worn! 2020-09-11 14:56:56 -05:00
Shadow Quill eb19c52598 Welderbomb! 2020-09-11 14:03:47 -05:00
Braiden b8319062fb Better sprites, more sprites! 
Do not Merge first!
 2020-09-11 04:22:47 -05:00
Braiden ead7d70d97 a letter 2020-09-10 03:27:02 -05:00
Braiden 5e1b471925 A gift for Jeanne and an upgrade for Strix 2020-09-09 19:43:50 -05:00
Darlantan e9abd9894d Comments out virgo staff posters 2020-09-06 03:18:26 -04:00
Razgriz 0c713aa549 Merge pull request #530 from Darlantanis/ConfettiCannon 
Confetti cannon
 2020-09-05 10:58:08 -07: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
Nadyr 35fa371286 Merge pull request #513 from cadyn/liquid-bellyfix 
Many bugfixes!
 2020-09-05 06:17:03 -04:00
Cerebulon 7c57c7c0bd Vendor enhancement fixes (#7577) 
* Vendor enhancement fixes

* skrellsnax trash, tuna name
 2020-08-30 02:49:00 -04:00
Sym 0dec16535d Adding CHOMPedit to edited lines and files, with brief descriptions. 
Can't believe I didn't think of doing this already.
 2020-08-29 02:28:30 -04:00
cadyn 9101e37e6f Big woopsie-dasies fixed 2020-08-28 13:06:58 -07:00
cadyn 860615c70c Upstream oopsie-fixes 2020-08-28 13:00:42 -07:00
Heroman ffdd8de3ce Site Management lookover for _vr stuff 2020-08-29 05:22:52 +10: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 bac13fc41d Merge pull request #8858 from VOREStation/upstream-merge-7551 
[MIRROR] Improves Portal Documentation for New Mappers unfamiliar with DIR
 2020-08-28 13:04:56 -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
Novacat 5c83c09e52 Update portal.dm 2020-08-28 12:50:18 -04:00
Unknown abef279ba7 compatibility fixes 2020-08-28 12:49:11 -04:00
Sym 20bcadbec6 Fixing Xenomorph lifecycle + changes 
Time to get swifty.
 2020-08-28 12:29:06 -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 4acd8a7a87 Merge pull request #7584 from Rykka-Stormheart/shep-dev-borgo-fixes 
Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
 2020-08-27 21:45:33 -04:00
Atermonera 21c1b12ef1 Colony Director -> Site Manager 2020-08-27 20:43:04 -04:00
Atermonera 96116057c0 Improves Portal Documentation for New Mappers unfamiliar with DIR 2020-08-27 19:47:56 -04:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Rykka cf2a964018 Adds Rabbit to Predcrate, someone else can make a smaller crate 
Also fixes rabbit body colors
 2020-08-26 22:23:45 -04:00
Atermonera ac824e6bfc The great Aurora shoe heist 2020-08-25 19:17:10 -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
Rykka c71dba5cae Converts Step_triggers to Portals! 
Implements Portal Functionality to replace the older step_triggers!

Z-level transitions are now 99.9% seamless!

It's self-explanatory, images below in editor:
![](https://i.imgur.com/EBr9mnN.png)
![](https://i.imgur.com/lP0UQxT.png)
![](https://i.imgur.com/c6VX1EC.png)
![](https://i.imgur.com/dfqDz75.png)
![](https://i.imgur.com/pUNVmBG.png)

In-game Version:
To Surface Mining:
![](https://i.imgur.com/aoJIwps.png)
![](https://i.imgur.com/nqVCYV9.png)
To Solars:
![](https://i.imgur.com/FRb6ZKB.png)
To Plains/Wilderness:
![](https://i.imgur.com/Y8kf40k.png)
 2020-08-22 20:36:49 -04:00
izac112 e08fef0e70 fixeeees 2020-08-22 20:07:52 +02:00
izac112 48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
RadiantFlash7 6cee0d5e54 New lobby screen& Exploration redesign 
Rennovates exploration to remove the super long hallway leading to it and changes our lobby screen to Todd howard style.
x16 times the detail!
 2020-08-21 23:54:06 -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
Novacat 1b27dffb9d Merge pull request #8757 from VOREStation/upstream-merge-7445 
[MIRROR] FBP Internal Components
 2020-08-21 13:32:02 -04:00