cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-30 02:44:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,206 Commits 8 Branches 26 Tags
efdf8eaaf76cda6a8279f8f8faefa669989e3663
Commit Graph

25139 Commits

Author SHA1 Message Date
SweetBlueSylveon
efdf8eaaf7 Honk 
Henk Honk Henk henk
More clowns,.
Finished up framework for average clown mobs.
Three main variants:
Normal Mob, Hostile Mob (big), and admin mob (c_shift/bus).
 2020-06-11 23:04:52 -07:00
SweetBlueSylveon
d3e5e2beb1 HONK 
Adds clowns. Lots and lots of clowns
 2020-06-11 21:30:39 -07: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
Aronai Sieyes
a5a56fe6db Merge pull request #8200 from VOREStation/upstream-merge-7261 
[MIRROR] Another Lesser Rotation
 2020-06-05 15:52:40 -04:00
Aronai Sieyes
ce496d94fa Merge pull request #8198 from VOREStation/upstream-merge-7249 
[MIRROR] Species Vars Extension
 2020-06-05 15:52:24 -04:00
Cyantime
0bff8bfa51 Reduces gravgen alarrm volume 2020-06-05 15:29:11 -04:00
Atermonera
28e952806c Adds proc to replace default cells with high cap on machinery (#7241) 
* Adds proc to replace default cells with high cap on machinery

* *grumbling*
 2020-06-04 22:38:39 -04:00
Atermonera
e13927d412 Merge pull request #7261 from Cerebulon/rotationpart2 
Another Lesser Rotation
 2020-06-04 22:25:21 -04:00
Arokha Sieyes
ad119f676d Species Vars Extension 2020-06-04 21:02:56 -04:00
lm40
b23594340d fixes typo 2020-06-03 19:38:58 -04:00
H0lySquirr3l
c61477dfce Add files via upload 2020-06-03 15:13:50 -05:00
Aronai Sieyes
b724d71d7d Merge pull request #8177 from Heroman3003/merm 
Adds mermaid tails taur option
 2020-06-03 10:27:58 -04:00
Aronai Sieyes
fd7401afea Merge pull request #8176 from VOREStation/upstream-merge-7136 
[MIRROR] Add AI Picture-in-Picture Mode!
 2020-06-03 10:27:30 -04:00
Atermonera
affd284004 Add AI Picture-in-Picture Mode! 2020-06-03 10:09:30 -04:00
Aronai Sieyes
21a640ebd3 Adds get_cell to drill heads so you can use an inducer on them 2020-06-02 20:56:55 -04:00
Unknown
67675370ca Makes Mercs Smart 
Also reverts the health nerf on the ADG
 2020-06-02 15:47:43 -04:00
Kenzie
a82de6eddd fixes small package examination 2020-06-01 20:42:37 -04:00
Heroman
5fd9552e8a Adds mermaid tails taur option 2020-06-02 06:42:38 +10:00
SweetBlueSylveon
6a2788f204 Update Chemistry-Recipes_vr.dm 2020-05-31 16:20:46 -07:00
SweetBlueSylveon
21198ba8df Update Chemistry-Recipes_vr.dm 2020-05-31 16:18:09 -07:00
SweetBlueSylveon
c766de0a92 Drink update Patch 
Fixes 4 recipes
Fixes missing metaglass icon bug.
 2020-05-31 16:14:36 -07:00
Aronai Sieyes
7d69c69f14 VS: Port Bay's lockers and stuff 2020-05-31 12:26:00 -04:00
Aronai Sieyes
719151a74a Port Bay's lockers, crates, largecrates, wall lockers 2020-05-31 12:26:00 -04:00
Aronai Sieyes
35eee1fe2a Merge pull request #8149 from VOREStation/upstream-merge-7164 
[MIRROR] Ported /tg/ style screen alerts, replacing the hunger icon with them
 2020-05-31 12:15:48 -04:00
Atermonera
619e8b1b94 Ported /tg/ style screen alerts, replacing the hunger icon with them 2020-05-31 11:52:17 -04:00
Aronai Sieyes
76d20e4c7e Merge pull request #8154 from VOREStation/upstream-merge-7243 
[MIRROR] Blob Infinite Loop Fix
 2020-05-31 10:59:20 -04:00
Aronai Sieyes
80d6fdee86 Merge pull request #8158 from VOREStation/Arokha/autolokfix 
Fix copypaste error
 2020-05-31 10:53:17 -04:00
Aronai Sieyes
e341769720 Merge pull request #8163 from KillianKirilenko/kk-suits 
AutoLok Tweaks
 2020-05-31 10:52:45 -04:00
Killian
710cee0208 Update void_vr.dm 2020-05-31 11:04:13 +01:00
SweetBlueSylveon
9640367e88 Fixes two drinks. 
Correctly maps "Dumb Shroom Juice" and "Unsweetened Tea" to /ethanol.
 2020-05-31 01:59:34 -07:00