cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-29 02:13:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,283 Commits 8 Branches 26 Tags
9957da080d9c0152d2dbd3893d4e7e6332497dc7
Commit Graph

25175 Commits

Author SHA1 Message Date
Atermonera
9957da080d Merge pull request #7283 from MistakeNot4892/supmat 
Generalizes supply points per material sheet to the material datum.
 2020-06-16 03:29:13 -04:00
SweetBlueSylveon
bf5d9f1fc8 NanoUI tweak (#8268) 
* Machines can't be used by clowns.

The old system was unfair, only the carbons or the silicons amongst us were allowed to use computers or see the internet. Or adjust the thermostat. But no longer. But changing this area here, it lets any mob with "has_hands = TRUE" use the objects they should be allowed to..

* simple_mob Revolution

Allows simple mobs to interact with nanoUI if they have "have_hands = TRUE".

* Revert "Machines can't be used by clowns."

This reverts commit 3cb16f57c0.

* Moves patch.

Moves Patch to default_vr.dm

* Adds missing part to machinery fix.

Fixes my dummy mistake and effectively unreverts the original commit.
 2020-06-16 00:51:02 -04:00
Aronai Sieyes
2798866f20 Merge pull request #8267 from SweetBlueSylveon/Pips-mess-of-clowns 
Pips mess of clowns
 2020-06-16 00:47:16 -04:00
Killian
24ef73ca38 Update loadout_suit_vr.dm 2020-06-15 21:41:07 +01:00
Killian
37a2a052d9 Update loadout_suit_vr.dm 2020-06-15 21:28:54 +01:00
SweetBlueSylveon
2105198db8 Cuts down on code. 
Cuts down on code by removing a large chunk of redundant lines wrieeten for every mob.
 2020-06-15 12:03:01 -07:00
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
d90be129c8 Wow a lot to process here. 
This adds the entire framework needed for the clowns to work.
Clowns work with three variants:
Normal, friendly, every tuesday clowns.
Big, hostile, space clowns.
And AdminBus Clowns.
The Honk Elemental is here and it spawns eggs that act like lost drone pods. If you're a ghost getting sucked in, you'll be able to choose from any of the normal clowns. This is for a special event that'll happen off station.
There are some unused sprites for clown mobs I haven't gotten coded up. These are all in the "TG clowns" dmi. They will be finished at a later date when I can get them to do their special tricks.
TODO: Edit gutter map, make extra clowns, make clown map.
 2020-06-13 01:58:14 -07:00
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
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