cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,264 Commits 8 Branches 0 Tags
eb1d5a997c966c3d4596f0d91d6c9b51cca4333c
Commit Graph

25166 Commits

Author SHA1 Message Date
Aronai Sieyes
652a0c5b1c Merge pull request #8284 from Novacat/nova-basicfixes 
Reduces Default (and mob) digestion rate
 2020-06-15 11:37:09 -04:00
Aronai Sieyes
1de402fce9 Merge pull request #8255 from KillianKirilenko/kk-traffic2 
Killian's Improved Traffic System, Take Two
 2020-06-15 11:36:35 -04:00
Aronai Sieyes
08c32e9bd1 Merge pull request #8257 from lm40/master 
Adds medical graviton eyepatch
 2020-06-15 11:33:30 -04:00
Aronai Sieyes
9c588ab41c Merge pull request #8282 from KasparoVy/sharpest-edgiest-rogue 
Adds Creation of Whetstones from Durasteel & Plastitanium
 2020-06-15 11:30:03 -04:00
Aronai Sieyes
2bed004132 Merge pull request #8283 from knoxon1/zenasuit 
Adds Zena's Shroud Suit Fluff Item
 2020-06-15 11:29:54 -04:00
Unknown
1b8409beda Reduces Default (and mob) digestion rate 
from 2/2 to 0.5/0.5

Due to a discussion in exploration, and the preferences stated by a headmin.
 2020-06-15 01:20:51 -04:00
knoxon1
2f15905e6e aaa 2020-06-14 22:55:02 -05:00
KasparoVy
215792e703 Adds Creation of Whetstones from Durasteel & Plastitanium 
Can currently be done with plasteel and titanium.
 2020-06-14 23:13:42 -04:00
Atermonera
bcd18e4997 Merge pull request #7278 from VOREStation/vplk-unused-image-assets 
Remove Unused Image Assets
 2020-06-14 21:32:34 -04:00
Novacat
4e889046e9 Merge pull request #8274 from Novacat/nova-basicfixes 
Vox Phoron and Adminbus Backpacks
 2020-06-14 15:48:40 -04:00
Novacat
6c899ae143 Merge pull request #8276 from VOREStation/Verkister-patch-2 
Earlyports prommie passive gain fix
 2020-06-14 15:47:47 -04:00
Novacat
71358c42c8 Merge pull request #8269 from VOREStation/upstream-merge-7290 
[MIRROR] mining drill and recharger find their shiny new cells
 2020-06-14 15:37:20 -04:00
Unknown
ff0716f501 Last minute fixes 2020-06-14 15:34:47 -04:00
Novacat
6563c832f5 Merge pull request #8270 from VOREStation/Verkister-patch-1 
Re-re-fixes werebeast offset for the third time
 2020-06-14 15:26:43 -04:00
Novacat
dbefffc9c8 Merge pull request #8259 from SweetBlueSylveon/bulldog-fix 
Bulldog Fix
 2020-06-14 15:26:12 -04:00
Novacat
45c4ce7b6e Merge pull request #8258 from Heroman3003/Heroman3003-adg-meme-1 
Adds Recursive Dark Gygax
 2020-06-14 15:25:51 -04:00
Novacat
eb3852f7a9 Merge pull request #8272 from VOREStation/Arokha/moresafe 
Add more safety around the hours query
 2020-06-14 15:24:17 -04:00
Verkister
b2717bd397 Update prometheans.dm 2020-06-14 22:23:46 +03:00
Verkister
3b2d80af29 Update prometheans.dm 2020-06-14 22:19:07 +03:00
Verkister
bdf45ab8ec Earlyports prommie passive gain fix 
Fixes prommies passively gaining nutrition on every tick to reach the maxcap within minutes by just standing around regardless if they're even standing on dirt or even standing on a turf at all.
 2020-06-14 22:15:04 +03:00
Cyantime
d35fbc44ff Removes non-functional vorestation edit 2020-06-14 15:01:37 -04:00
Cyantime
bf8cbc0d60 Gives slimes back their extended shapeshifting 2020-06-14 14:59:22 -04:00
Arokha Sieyes
f1854f89b9 Add more safety around the hours query 2020-06-13 23:07:12 -04:00
Verkister
ce612ae0a0 Re-re-fixes werebeast offset for the third time 
hnn
 2020-06-13 23:24:08 +03:00
Atermonera
69c3c8c98f mining drill and recharger find their shiny new cells 2020-06-13 06:57:09 -04:00
SweetBlueSylveon
70ae37f28c Bulldog Fix 
Previous recipe of the bulldog conflicted with white russian recipe. New one should not.
 2020-06-10 19:09:34 -07:00
Heroman3003
67691f6694 Adds Recursive Dark Gygax 
adminbus only meme only
 2020-06-11 09:41:37 +10:00
Kenzie
ce7a44b753 Adds medical graviton eyepatch 2020-06-10 18:20:34 -04:00
Killian
bd50595244 improved traffic, take two 2020-06-10 22:26:23 +01:00
Cyantime
a7024c468f Increases Aurora Caelus rarity 2020-06-10 15:13:47 -04:00
Aronai Sieyes
fdfbdd9995 Merge pull request #8233 from Novacat/nova-ert 
Broken RIG in Abandoned Crate Fix
 2020-06-07 17:17:39 -04:00
Unknown
dd7cf8e56e Fixes Broken RIG in Crates 2020-06-07 16:42:16 -04:00
Killian
01a19de81b 🅰️ 2020-06-07 21:32:19 +01:00
Killian
02e5020cfe talon suits & jetpacks 2020-06-07 21:22:55 +01:00
Aronai Sieyes
96c9108637 Merge pull request #8220 from VOREStation/upstream-merge-7266 
[MIRROR] Vintage Voidsuits Expansion
 2020-06-07 15:05:28 -04:00
Aronai Sieyes
14bfe9f4d7 Merge pull request #8206 from Cyantime/patch-2 
Reduces gravgen alarm volume
 2020-06-07 15:00:01 -04:00
Aronai Sieyes
42681969f4 Merge pull request #8224 from VOREStation/vlpk-nanoui-template-bundle 
Combine all nanoui templates into a single resource bundle.
 2020-06-07 14:57:53 -04:00
Aronai Sieyes
e27f831bc5 Merge pull request #8219 from VOREStation/upstream-merge-7264 
[MIRROR] Adds marble floor tiles and crafting recipe
 2020-06-07 14:36:35 -04:00
Aronai Sieyes
79f3510526 Merge pull request #8213 from Natje0/Natje0-tentaclefix 
Fixes Thick tentacles
 2020-06-07 14:20:55 -04:00
Aronai Sieyes
ba46ee7e39 Merge pull request #8208 from Rykka-Stormheart/shep-dev-aurora-caelus 
Add Aurora Caelus Event
 2020-06-07 14:09:44 -04:00
Aronai Sieyes
7ed21b14d8 Merge pull request #8205 from VOREStation/upstream-merge-7237 
[MIRROR] Fixes runtimes related to mmi_holder and defib_timer
 2020-06-07 14:05:19 -04:00
Aronai Sieyes
002b0ce5db Merge pull request #7801 from Holdelta/hol-rms 
New Engineering Tool - RMS: Rapid Material Synthesizer
 2020-06-07 14:01:57 -04:00
Cyantime
d2dad900ad Removes unneeded check 2020-06-06 15:56:47 -04:00
Leshana
d6603a7302 Combine all nanoui templates into a single resource bundle. 
This reduces the number of assets needing to be sent on join by 150ish.
- Nanoui scripts modified to load templates in parallel instead of one at a time.
- Nanoui scripts modified to be willing to load from the resource bundle if available, falling back to ajax-loading the individual templates if absent.
 2020-06-06 14:59:54 -04:00
Killian
2acd444f33 Vintage Voidsuits Expansion 2020-06-06 14:40:47 -04:00
BillyBangles
75901775a0 Adds marble floor tiles and crafting recipe (#7264) 
* Adds marble floor tiles and crafting recipe

* swaps screwdriver removal for crowbar

* changelog fix
i'm a silly goose and forgot to edit out the screwdriver bit
 2020-06-06 14:36:25 -04:00
Natje0
982850cb71 Tentacles 2020-06-06 12:42:03 +02:00
Rykka
ad7ad8dbf5 Add Aurora Caelus Event! 
Adds the Aurora Caelus, a rare event that occurs on the station space z-levels~!

During this event a .ogg will play to all clients, and you will see the outside appear almost like a storm (this is a placeholder, I need assistance from spriters to make something like an aurora or help edit the ion-storm placeholder I'm using) no longer placeholder! - consider it a fun little break and a rare/silly event.

The event announces as soon as it fires, and assuming time dilation isn't horrible, starts 10 seconds after (5 "ticks" of the event subsystem being fired by the MC).

Current event weight (frequency) can be tweaked according to admin liking, and it's currently a MUNDANE level event. This can be changed to MODERATE or otherwise as determined by admins, or given a higher weight - during testing, stuff like PDA spam or news or etc very often went over it and it took giving it a lot of weight for it to fire - but it is supposed to be a "rare" cosmic thing, not something that happens every shift.

This also resets the commit history for one clean commit.
 2020-06-05 22:52:28 -04:00
Aronai Sieyes
6fbbe840fe Fix defib timer on MMIs 2020-06-05 15:55:08 -04:00
Aronai Sieyes
499b9b51f4 Merge pull request #8204 from VOREStation/upstream-merge-7241 
[MIRROR] Adds proc to replace default cells with high cap on machinery
 2020-06-05 15:53:51 -04:00