cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-16 12:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,720 Commits 9 Branches 0 Tags
8111e7bd10d75fa4d200078bf9fa4ac72dbda54a
Commit Graph

3582 Commits

Author SHA1 Message Date
Nadyr
39292dfe36 Merge pull request #1291 from CHOMPStationBot/upstream-merge-9676 
[MIRROR] Adds in 1 new eggs end 3 joke eggs.
 2021-02-14 07:33:01 -05:00
Novacat
3f3e7c536f Merge pull request #9691 from VOREStation/upstream-merge-7865 
[MIRROR] Allows custom-selection of posters
 2021-02-12 21:27:50 +00:00
Verkister
113bf6356a Merge pull request #9676 from H0lySquirr3l/master 
Adds in 1 new eggs end 3 joke eggs.
 2021-02-11 10:59:20 +00:00
Chompstation Bot
d3c7cc6040 New advanced Egg Release mechanics. 2021-02-01 19:35:41 +00:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
Lucius
f6c3f5120d Resolves #1081 Teleporter Hub Rebalance 
Adds bluespace crystals to the required materials to build a teleporter hub, bringing it in line with the rest of telesci.
 2021-01-19 02:01:23 -05:00
Test Turtle
eeae872e0b Adding item: Clustaur Grenade 
Due to the importance of hydrating for a staffed crew, this item has been developed for optimal delivery of water.

Currently admin spawn only.
 2021-01-17 00:24:50 -08:00
Razgriz
ba393c28d8 Merge pull request #1098 from Sharkmare/master 
Adding WHIP placeholder icon. Closes #1091
 2021-01-16 16:50:17 -07:00
cadyn
23181d86db egg laying shenanigans go from local into object. 
reeeeee
 2021-01-15 14:59:52 -08:00
Sharkmare
69d2fa3387 Fixing typo 2021-01-09 01:35:46 +01:00
Sharkmare
0e22771046 Fixing WHIP 
Adds placeholder whip sprite for the whip, since virgo doesnt have it, we dont have it and by god im not looking for if it even existed or when.
 2021-01-09 01:27:52 +01:00
Novacat
7e16cd134a Merge pull request #9527 from VOREStation/upstream-merge-7780 
[MIRROR] Adds a Whip.
 2020-12-28 17:12:39 +00:00
Chompstation Bot
fd7310af15 ITG IDs and a small Dauntless refit 2020-12-23 14:19:56 +00:00
Nadyr
750c1f140c Merge pull request #1010 from CHOMPStationBot/upstream-merge-9455 
[MIRROR] [MIRROR] RPED QoL Tweak(s)/Unimplemented RPED Variant
 2020-12-19 18:29:07 -05:00
Shadowfire
d15968eff6 Last Christmas! 
Final adjustments to the presents!
New fat taur sprite with three colors and a vulp skullmask that totally doesnt look like Churo from Different (TM)! Sprites made by our good friend Blitzkrieg
Merry Christmas all!
 2020-12-18 17:38:55 +01:00
Shadowfire
7efe6f2cad Auto stash before rebase of "CHOMPStation2/master" 2020-12-18 17:02:15 +01:00
Kassc
9fb6636f71 Merge pull request #1029 from Shadowfire117/ExtraMas 
Christmas time is once a year..
 2020-12-17 19:04:30 -05:00
Shadowfire
6b70b133ba Christmas time is once a year.. 
Made changes to allow casino manual to fit into the casino wallet for easy reading.
Made Santa's sack! Only he can take presents from it!
Made the new presents have a nice wide selection of gifts, but chaos presents are disabled so far!
Fixed 'the cake' somewhat and made a grenade to spawn its components.
made Santa's coat.
made an overdrive version of the confetti gun.
 2020-12-17 17:20:24 +01:00
Kassc
2718d0bbbe Merge pull request #1016 from Shadowfire117/ChristmasCasino 
So this is Christmas...
 2020-12-17 04:17:30 -05:00
Shadowfire
b2dfb35c54 So this is Christmas... 
Made fake presents for decoration purposes
Made fake snowfall effect for mood
Made advanced presents that have randomized size and shape, will have a bigger selection of possible gifts in update along with a rare chaos version that will have it's own smaller but much powerful items!
Made new id sprites and access cards for casino medical/security/engineering
Took the old girl out back and put her down, sorry Casino Ferry, you served us all well!

And a big big rework and remapping of casino and disabled it from round start to ease up on processing, sorry kids. No snooping the goods from now on!
 2020-12-15 01:43:30 +01:00
Novacat
6127c5d2e9 Merge pull request #9455 from VOREStation/upstream-merge-7784 
[MIRROR] RPED QoL Tweak(s)/Unimplemented RPED Variant
 2020-12-14 03:05:22 +00:00
Nadyr
ac10917edb Merge pull request #975 from CHOMPStationBot/upstream-merge-9421 
[MIRROR] polaris#7778 earlyport - A Thing About Digging Sand and Mineral Processor Speed
 2020-12-13 21:07:30 -05:00
Novacat
6bd329bd30 Merge pull request #9427 from VOREStation/upstream-merge-7777 
[MIRROR] Modular honks
 2020-12-08 03:36:15 +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
Shadow Quill
9ba21cd2e0 Updoots 2020-11-30 16:30:19 -06:00
Razgriz
f0ace37d4f Spear and Gun sizes 
-Made all gun and spear sizes larger so that they will no longer fit into backpacks.
--Energy spears and energy swords will fit while deactivated, but not while active (unchanged)

-Tweaked the Floragun have no recoil for micros.
 2020-11-23 19:29:48 -07:00
Cadyn
4d2f915f33 Merge master and build TGUI 2020-11-15 02:17:53 -08:00
Chompstation Bot
faa287d91b [MIRROR] Adds AlliCo Grab-A-Gift 2020-11-14 07:32:50 +00:00
Razgriz
0e07c9a739 Merge pull request #824 from r4d6/cigar 
Add cigar cases to the loadout
 2020-11-11 19:30:25 -07:00
Cadyn
613033221d trying to appease travis some more 2020-11-11 16:52:47 -08:00
Cadyn
e0c685e59a travis is a bitch 2020-11-11 16:01:57 -08:00
Cadyn
9f54f4fb3d stupid runtime reee 2020-11-11 15:34:13 -08:00
Cadyn
cfc8f579a2 Added spicy tools 2020-11-11 15:07:16 -08:00
r4d6
d628ce8ff4 Move the cigar cases to a new _ch file 2020-11-10 00:04:17 -05:00
r4d6
d0cbf7f856 Add cigar cases to the loadout. 2020-11-09 19:23:00 -05:00
Razgriz
a269d28a8b Merge pull request #805 from CHOMPStationBot/upstream-merge-9276 
[MIRROR] [MIRROR] No more unnearsightedness!
 2020-11-05 03:19:31 -07:00
Verkister
a8aedccb38 Merge pull request #9276 from VOREStation/upstream-merge-7753 
[MIRROR] No more unnearsightedness!
 2020-11-05 10:06:02 +00:00
Razgriz
2f18c69fb2 Merge pull request #797 from LunarFleet/Lun-Egg 
Egg Laying Implant Updates - Makes cascading toggleable
 2020-11-03 02:26:59 -07:00
LunarFleet
aaa61d6377 Makes cascading toggleable 2020-11-02 23:46:52 -05:00
Cadyn
947fe850ff Yummy bugfixes 2020-10-27 19:58:49 -07:00
Razgriz
548c123e77 Merge pull request #760 from CHOMPStationBot/upstream-merge-9225 
[MIRROR] [MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 02:15:15 -07:00
Verkister
9848c0e719 Merge pull request #9225 from VOREStation/upstream-merge-7708 
[MIRROR] Makes wall-mounted machines layer above windows
 2020-10-27 08:16:29 +00:00
Razgriz
d1d2e5905c Merge pull request #744 from cadyn/husksurgery 
Adding dehusk and tox/oxyloss surgery
 2020-10-23 19:57:51 -07:00
Cadyn
732025c8ce Adding dehusk and tox/oxyloss surgery 2020-10-21 23:32:27 -07:00
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