cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-02-05 22:18:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
61,561 Commits 10 Branches 0 Tags
5c7d335e2b674d7d9bd501bfdadecd99b7daaefe
Commit Graph

9264 Commits

Author SHA1 Message Date
cadyn
373329e941 Merge pull request #1220 from CHOMPStationBot/upstream-merge-9623 
[MIRROR] Adds flushable toilets.
 2021-02-04 23:48:40 -08:00
cadyn
3bc058624e Merge branch 'master' into Precursorpewpew 2021-02-04 20:49:25 -08:00
Sym
2d641fed65 Adds Precursor Projectile for alien guns 
Replaces default cyan beam with new precursor beam, complete with new icon. Credit to Kassc for sprucing up the sprite.
 2021-02-04 23:15:51 -05:00
Chompstation Bot
d3c7cc6040 New advanced Egg Release mechanics. 2021-02-01 19:35:41 +00:00
Verkister
9269ff74a0 Merge pull request #9623 from Verkister/thronetime 
Adds flushable toilets.
 2021-02-01 09:45:34 +00:00
Razgriz
710c6b5021 Merge pull request #1197 from CHOMPStationBot/upstream-merge-9615 
[MIRROR] Converts Morph Spawn and Maint Pred events to use ghostpods
 2021-01-30 00:20:38 -07:00
cadyn
c86326e7a5 Fix stuff and give name 2021-01-29 21:46:00 -08:00
cadyn
02a5bbd8fc Merge pull request #1210 from cadyn/eventstuffuwu 
Adding telecrystal stuff for event
 2021-01-29 16:01:14 -08:00
cadyn
bcfdb424c2 Adding telecrystal stuff for event 2021-01-29 15:13:52 -08:00
Shadow Quill
636278b1ac Adds EFTPOS scanners to security/warden lockers, and a few items as well 2021-01-28 20:22:21 -06:00
Razgriz
b7d964f87a Merge pull request #1177 from CHOMPStationBot/upstream-merge-9604 
[MIRROR] [MIRROR] Mech Appearance Update
 2021-01-27 18:58:35 -07:00
Razgriz
99d137254d Merge pull request #1196 from CHOMPStationBot/upstream-merge-9614 
[MIRROR] Fixes hound belly expansion upgrade having wrong name in prosfab, tweaks tech reqs, makes name less wordy
 2021-01-27 18:43:55 -07:00
Razgriz
f97d065119 Update tile_types.dm 2021-01-27 18:13:46 -07:00
Razgriz
8f0f6f804b Update fifty_spawner_tiles.dm 2021-01-27 18:13:25 -07:00
Chompstation Bot
0967736254 [MIRROR] Fixes sif forest grass, adds overgrowth tiles 2021-01-27 19:35:43 +00:00
Chompstation Bot
be8d010ff9 Converts Morph Spawn and Maint Pred events to use ghostpods 2021-01-27 02:25:00 +00:00
Novacat
2f8602243d Merge pull request #9614 from Heroman3003/belly-cap-fix-rename 
Fixes hound belly expansion upgrade having wrong name in prosfab, tweaks tech reqs, makes name less wordy
 2021-01-27 02:24:52 +00:00
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
Novacat
a4c4d371db Merge pull request #9604 from VOREStation/upstream-merge-7818 
[MIRROR] Mech Appearance Update
 2021-01-25 00:51:12 +00: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