cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 21:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,410 Commits 7 Branches 0 Tags
78e9cb2123b8fb1bcd492560fbdcb77e00a82cc0
Commit Graph

5758 Commits

Author SHA1 Message Date
Cadyn
4156dd8085 fixing defib timer and adding surgery for that shit 2021-01-24 21:27:44 -08:00
cadyn
5bbdccefa5 Revert "[MIRROR] Fixes defib timers being 10 times as long compared to intended." 2021-01-24 18:53:16 -08:00
cadyn
d3f6cba62c Merge pull request #1175 from Sharkmare/sahoc-rising 
Readds all Sahoc items
 2021-01-24 08:53:48 -08:00
cadyn
3c541d7ecb Merge pull request #1176 from Darlantanis/VoreSlug 
Vore slug and forest turf fix
 2021-01-24 08:46:49 -08:00
Sharkmare
bdfcc014f7 Adding reset owner feature and modulus operandi ala cadyn 2021-01-24 17:43:25 +01:00
Darlantan
a2f77d1eb1 Fixes Sif forest turfs 2021-01-24 11:02:43 -05:00
Sharkmare
39e0e9ce63 Readds all Sahoc items 
The egg is back.
 2021-01-24 16:43:03 +01:00
cadyn
c5ae5ec866 Merge pull request #1134 from CHOMPStation2/cadyn-patch-5 
Delete defib timer
 2021-01-24 06:52:37 -08:00
cadyn
4f9ed16579 Merge pull request #1165 from CHOMPStationBot/upstream-merge-9598 
[MIRROR] Fixes defib timers being 10 times as long compared to intended.
 2021-01-24 06:52:18 -08:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786 
[MIRROR] Gadgets & Gizmos
 2021-01-24 06:55:05 +00:00
Novacat
57e1be6caa Merge pull request #9598 from Heroman3003/defibfix 
Fixes defib timers being 10 times as long compared to intended.
 2021-01-24 06:34:15 +00:00
cadyn
c05d687ec2 Update defib.dm 2021-01-19 19:15:27 -08: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
cadyn
be3d2edf75 Update defib.dm 2021-01-16 22:40:20 -08:00
Nadyr
c68fc43808 Merge pull request #1120 from CHOMPStationBot/upstream-merge-9572 
[MIRROR] [MIRROR] Sheet Recipe Unexclusivity.
 2021-01-16 19:57:42 -05: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
Novacat
32f728a713 Merge pull request #9572 from VOREStation/upstream-merge-7824 
[MIRROR] Sheet Recipe Unexclusivity.
 2021-01-14 18:05:02 +00: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
Chompstation Bot
601c842d13 Added Drakeborgs for sillicons along with plushies 2021-01-06 19:52:47 +00:00
Nadyr
f441be96b0 Merge pull request #1063 from CHOMPStationBot/upstream-merge-9520 
[MIRROR] Ports Vox Plushie from Paradise
 2021-01-03 21:57:39 -05: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
d96a127b4a Ports Vox Plushie from Paradise 2020-12-26 01:59:20 +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
Nadyr
0cb47f9a19 Merge pull request #980 from CHOMPStationBot/upstream-merge-9422 
[MIRROR] [MIRROR] Plainleather & Tobacco
 2020-12-08 03:14:03 -05:00
Novacat
cd1ad32cb2 Merge pull request #9422 from VOREStation/upstream-merge-7762 
[MIRROR] Plainleather & Tobacco
 2020-12-08 03:38:26 +00: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
Razgriz
6df859e88e Merge pull request #915 from Shadow-Quill/PDTurrets 
Adds Point Defence Turrets
 2020-12-02 15:54:47 -07:00
Novacat
a9f77823d7 Merge pull request #9333 from Tenryumi/nikki-fluff 
Adds Nikki's Fluff Outfit For Nikki, + Rigsuit-Mounted Size Guns For Research
 2020-11-30 23:46:15 +00:00
Shadow Quill
9ba21cd2e0 Updoots 2020-11-30 16:30:19 -06:00
Cadyn
49ae612dc4 Maybe forgot this 2020-11-25 19:44:55 -08:00
cadyn
f1c9b60bf8 Fuck okay maybe intercoms move sometimes 2020-11-24 23:24:36 -08:00
cadyn
d260757e91 yumyum radio go vroom hehe 2020-11-24 22:45:41 -08: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
7626117811 I forgot to delete these oops 2020-11-22 21:43:20 -08:00
cadyn
c55132d06d Finally optimize radios 2020-11-22 21:20:05 -08:00
cadyn
bf396e0a12 Merge pull request #843 from CHOMPStationBot/upstream-merge-9263 
[MIRROR] [MIRROR] Adds AlliCo Grab-A-Gift
 2020-11-15 13:48:10 -08:00
Razgriz
5afa72a83e Merge pull request #844 from CHOMPStation2/metroid 
Current Metroid Progress
 2020-11-15 13:59:33 -07:00