cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-16 04:13:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,413 Commits 9 Branches 0 Tags
fe84e9679704e6f0a0315eaf61baee8d871f6631
Commit Graph

9246 Commits

Author SHA1 Message Date
cadyn
fe84e96797 Revert "Delete defib timer" 2021-01-24 22:48:39 -08:00
cadyn
2fe77a59ac Revert "fixing defib timer and adding surgery for that shit" 2021-01-24 22:46:10 -08:00
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
58e59eaa6b Merge pull request #1149 from Sharkmare/master 
Adds Sharkpile prototype + 939
 2021-01-22 11:11:38 -08:00
Sharkmare
3e703733cb putting th eunique check in the correct spot woops 2021-01-21 08:28:03 +01:00
Sharkmare
8f95cb6125 Adding the one of a kind feature gamma has 
However, this is contained tot his one pile, not across all piles
Also optional
 2021-01-21 08:24:34 +01:00
Sharkmare
5857cfdbdd Adds Sharpile prototype 
This adds a variant of trashpiles i spaghettied up.

These piles have the ability to override the default spawn tables (changeable in mapping) and also can be given a % chance to just yeet themselves out of existance. Each % value can be adjusted in mapping othing is hardcoded. This also makes making unique sub types of trashpules simpler

Not his pile does not spawn sharks (yet)
 2021-01-21 08:01:59 +01:00
cadyn
c05d687ec2 Update defib.dm 2021-01-19 19:15:27 -08:00
cadyn
71ed014f81 Merge pull request #1140 from LuciusWorna/master 
Resolves #1081 Teleporter Hub Rebalance
 2021-01-19 19:14:42 -08:00
Razgriz
e67b668f6e Update detective wardrobe 
-Replaces black gloves with forensics gloves.
-Restores the gunbox
 2021-01-19 15:11:55 -07:00
Razgriz
f47ca5cc34 Merge pull request #1133 from BlackMajor/micro-optimization 
Small optimisation
 2021-01-19 15:06:02 -07: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
Holdelta
827dc6ca29 Update trash_pile_vr.dm 2021-01-17 02:25:06 -08: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
BlackMajor
1b07693602 forgot to uncomment lmao 2021-01-17 18:17:20 +13:00
BlackMajor
96d2868d2d tiny optimisation 2021-01-17 17:59:03 +13: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
Nadyr
f9f0b60bc5 Update misc.dm 2021-01-07 22:29:39 -05:00
Nadyr
ca1eedb24e Update misc.dm 2021-01-07 22:24:37 -05: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
Nadyr
cdc8abcbb9 Update misc.dm 2021-01-03 21:38:36 -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
Nadyr
70c96548f3 Merge pull request #1051 from CHOMPStationBot/upstream-merge-9495 
[MIRROR] ITG IDs and a small Dauntless refit
 2020-12-25 16:49:07 -05:00
Chompstation Bot
fd7310af15 ITG IDs and a small Dauntless refit 2020-12-23 14:19:56 +00:00
Chompstation Bot
c8e698aac2 Wreck & Debris Field Updates 2020-12-22 15:32:40 +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