cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-18 01:27:07 +01:00
Code Issues Packages Projects Releases Wiki Activity
54,526 Commits 9 Branches 26 Tags
b66cfb340cb46c1922d57fef52212df0415c7fe3
Commit Graph
38881 Commits
Author SHA1 Message Date
NovacatandGitHub b66cfb340c Merge pull request #8870 from VOREStation/upstream-merge-7574 
[MIRROR] Adds Engine Randomization on Mapload! (From VOREStation!)
 2020-08-28 12:56:12 -04:00
NovacatandGitHub f6e61ea8f1 Merge pull request #8658 from Rykka-Stormheart/shep-dev-ambience-additions 
Massive Ambience and Sound Overhaul + Addition
 2020-08-28 00:47:23 -04:00
NovacatandGitHub 46ae945283 Merge pull request #8871 from VOREStation/upstream-merge-7575 
[MIRROR] Make it so beer bottles are filled. No longer get scammed!
 2020-08-28 00:21:41 -04:00
NovacatandGitHub 219dde8edb Merge pull request #8865 from VOREStation/upstream-merge-7567 
[MIRROR] Fix a pizza issue.
 2020-08-28 00:20:08 -04:00
NovacatandGitHub cca44bdb1f Merge pull request #8864 from VOREStation/upstream-merge-7568 
[MIRROR] Add a warning line to the supply computer about access.
 2020-08-28 00:19:43 -04:00
NovacatandGitHub 4e2038b9c0 Merge pull request #8863 from VOREStation/upstream-merge-7565 
[MIRROR] Fix ventcrawling while in 0 gravity
 2020-08-28 00:19:02 -04:00
NovacatandGitHub b01633b67e Merge pull request #8860 from VOREStation/upstream-merge-7558 
[MIRROR] Returns the jackolantern overlay
 2020-08-28 00:18:18 -04:00
NovacatandGitHub e370fda424 Merge pull request #8859 from VOREStation/upstream-merge-7554 
[MIRROR] Fixes turf slowdown not applying on non-water/snow turfs
 2020-08-28 00:17:58 -04:00
NovacatandGitHub 2dabf37c56 Merge pull request #8857 from VOREStation/upstream-merge-7553 
[MIRROR] [Untested] Emotes won't be foiled by pesky capitals
 2020-08-28 00:17:36 -04:00
NovacatandGitHub f412e7555f Merge pull request #8856 from VOREStation/upstream-merge-7550 
[MIRROR] Fix combinination_cook() creating items with no reagents
 2020-08-28 00:17:18 -04:00
NovacatandGitHub 5841a011a9 Merge pull request #8854 from VOREStation/upstream-merge-7480 
[MIRROR] Ports Aurora Diona markings
 2020-08-28 00:16:56 -04:00
AtermoneraandVirgoBot 4acd8a7a87 Merge pull request #7584 from Rykka-Stormheart/shep-dev-borgo-fixes 
Reverts #7560, Adds Proper check to syringes.dm and flora.dm for borgs
 2020-08-27 21:45:33 -04:00
Rykka 6f3ca562ed Fixes incoming PR, removes now-duplicated code 
Removes mapping_vr.dm, engine.dm, and engine_areas.dm, given that these are now enabled in the core engine.dm
 2020-08-27 21:42:42 -04:00
AtermoneraandVirgoBot f426b13bde Merge pull request #7575 from lbnesquik/Kot-Beer-IS-FOR-MEN 
Make it so beer bottles are filled. No longer get scammed!
 2020-08-27 21:31:30 -04:00
AtermoneraandVirgoBot c69d4ab48a Adds Engine Randomization on Mapload! (From VOREStation!) 2020-08-27 21:28:09 -04:00
AtermoneraandVirgoBot 9e76d0ca68 Merge pull request #7567 from lbnesquik/Kot-PIZZAFIX 
Fix a pizza issue.
 2020-08-27 20:38:16 -04:00
AtermoneraandVirgoBot 0d128297d7 Merge pull request #7568 from lbnesquik/Kot-Cargo-comp-tweak 
Add a warning line to the supply computer about access.
 2020-08-27 20:38:04 -04:00
AtermoneraandVirgoBot 109fc5259c Merge pull request #7565 from Cyantime/patch-1 
Fix ventcrawling while in 0 gravity
 2020-08-27 20:36:48 -04:00
AtermoneraandVirgoBot f0bfa69416 Merge pull request #7558 from Cyantime/lanternlight 
Returns the jackolantern overlay
 2020-08-27 19:58:53 -04:00
AtermoneraandVirgoBot de5d1f6120 Merge pull request #7554 from Heroman3003/turfslow 
Fixes turf slowdown not applying on non-water/snow turfs
 2020-08-27 19:57:37 -04:00
AtermoneraandVirgoBot 5ea4c84700 Merge pull request #7553 from Shadow-Quill/patch-1 
[Untested] Emotes won't be foiled by pesky capitals
 2020-08-27 19:47:44 -04:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
AtermoneraandVirgoBot dcd6ae56ca Merge pull request #7550 from Khloross/cookingfix 
Fix combinination_cook() creating items with no reagents
 2020-08-27 19:46:28 -04:00
AtermoneraandVirgoBot 63f7dd9417 Merge pull request #7480 from listerla/dionamarkings 
Ports Aurora Diona markings
 2020-08-27 19:26:18 -04:00
Rykka 82a8a9487b Hotfix for Ambience Freq Overwriting Ambience Chance on Save 
I accidentally had ambience_freq being written to ambience_chance, oops.
 2020-08-27 18:16:57 -04:00
NovacatandGitHub 5e22f379db Merge pull request #8845 from Heroman3003/nanofix 
Makes Liquid Protean and Repair Nanites affect synths
 2020-08-27 15:55:29 -04:00
NovacatandGitHub 43360b19ce Merge pull request #8844 from Rykka-Stormheart/shep-dev-scree-rabbits 
Adds Knights of the Round Table, Rabbits, Killer Rabbits
 2020-08-27 15:52:54 -04:00
NovacatandGitHub fe8b90b3ee Merge pull request #8835 from ShadowLarkens/tgui_inventory 
TGUI Drag Inventory
 2020-08-27 15:52:07 -04:00
Heroman3003andGitHub dbf373c6a7 Makes Liquid Protean and Repair Nanites affect synths 2020-08-27 14:46:18 +10:00
Rykka 48118b3eca Changes desc to . and changes grumpiness to 0 2020-08-26 23:42:01 -04:00
Rykka 3b713c678d Gives Killer Rabbit 2000 Health 2020-08-26 22:32:45 -04:00
Rykka cf2a964018 Adds Rabbit to Predcrate, someone else can make a smaller crate 
Also fixes rabbit body colors
 2020-08-26 22:23:45 -04:00
Rykka 56d7235525 Adds Knight Boots to vendor/crate/POI, adds Lennie/George to Tether 2020-08-26 22:19:19 -04:00
Rykka 6ef52be981 Adds Knights of the Round Table, Rabbits, Killer Rabbits 
Scree's Request!

This adds the Knights of the Pizza Table (Monty Python's Knights) armor and costumes. Costumes are orderable via Cargo OR Vendors.

This adds passive Rabbit voremobs, and a killer rabbit. If you pet the rabbit too much, you'll make it grumpy, and it will do a nomf. You can see their grumpiness level in their description/examine.

Knight's Armor has good melee and bullet protection, and little else.
 2020-08-26 21:58:30 -04:00
NovacatandGitHub 85c425a2eb Merge pull request #8841 from VOREStation/upstream-merge-7545 
[MIRROR] Enables passtable for cleanbots
 2020-08-26 09:44:51 -04:00
NovacatandGitHub 29b1890de5 Merge pull request #8840 from VOREStation/upstream-merge-7541 
[MIRROR] Prevent acid glands from melting non-simulated turfs
 2020-08-26 09:06:55 -04:00
NovacatandGitHub e26273d905 Merge pull request #8839 from VOREStation/upstream-merge-7544 
[MIRROR] Fixes eye glow appearance flags
 2020-08-26 09:06:28 -04:00
NovacatandGitHub 928c420444 Merge pull request #8838 from VOREStation/upstream-merge-7538 
[MIRROR] Adds attacklogs for aggressive grabbing
 2020-08-26 09:06:12 -04:00
VerkisterandVirgoBot d9dbb7d1d7 Enables passtable for cleanbots (#7545) 
One of the most common reasons behind cleanbots getting stuck in stupid places is because they went after some mess underneath table/rack/railing/whatever without ever getting to reach it.
 2020-08-26 03:52:25 -04:00
CyantimeandVirgoBot 27913e5045 Prevent acid glands from melting non-simulated turfs (#7541) 2020-08-26 03:51:09 -04:00
VerkisterandVirgoBot b65b82345b Fixes eye glow appearance flags (#7544) 
Fixes eye glow layer not inheriting mob appearance flags.
 2020-08-26 03:50:58 -04:00
Shadow-QuillandVirgoBot da96910c5c Attack! (#7538) 2020-08-26 03:49:42 -04:00
KillianandVirgoBot afaa0e650c ChewMAX Bar Fix (#7540) 
* Update robotics.dm

* Update scanner.dm

* Update snacks.dm
 2020-08-26 03:49:29 -04:00
ShadowLarkens 0c2c82fe5f TGUI Drag Inventory 2020-08-25 21:56:51 -07:00
NovacatandGitHub 444677252c Merge pull request #8832 from VOREStation/upstream-merge-7474 
[MIRROR] Improvements to mech missiles.
 2020-08-25 21:05:36 -04:00
ShadowLarkens 264793b36a Fading titlescreen from /tg/ 2020-08-25 16:50:23 -07:00
AtermoneraandVirgoBot b2250d9b47 Improvements to mech missiles. 2020-08-25 19:16:57 -04:00
NovacatandGitHub a69e94f948 Merge pull request #8519 from KillianKirilenko/kk-misc2 
Explorer/Pathfinder Belts
 2020-08-25 17:15:14 -04:00
NovacatandGitHub b5c884eb03 Merge pull request #8825 from ShadowLarkens/tgui_research_rebased 
TGUI Research
 2020-08-25 17:12:24 -04:00
NovacatandGitHub 7ae5bf301b Merge pull request #8819 from dwinters99/gutterband 
Changes Gutter to Gutterband, removes whitelist.
 2020-08-25 16:38:06 -04:00