cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 04:40:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,485 Commits 9 Branches 26 Tags
109fc5259cc6933c8b8bedd601c66b47b0a6f625
Commit Graph

25683 Commits

Author SHA1 Message Date
Atermonera
109fc5259c Merge pull request #7565 from Cyantime/patch-1 
Fix ventcrawling while in 0 gravity
 2020-08-27 20:36:48 -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
Novacat
5e22f379db Merge pull request #8845 from Heroman3003/nanofix 
Makes Liquid Protean and Repair Nanites affect synths
 2020-08-27 15:55:29 -04:00
Novacat
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
Novacat
fe8b90b3ee Merge pull request #8835 from ShadowLarkens/tgui_inventory 
TGUI Drag Inventory
 2020-08-27 15:52:07 -04:00
Heroman3003
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
Novacat
85c425a2eb Merge pull request #8841 from VOREStation/upstream-merge-7545 
[MIRROR] Enables passtable for cleanbots
 2020-08-26 09:44:51 -04:00
Novacat
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
Novacat
e26273d905 Merge pull request #8839 from VOREStation/upstream-merge-7544 
[MIRROR] Fixes eye glow appearance flags
 2020-08-26 09:06:28 -04:00
Novacat
928c420444 Merge pull request #8838 from VOREStation/upstream-merge-7538 
[MIRROR] Adds attacklogs for aggressive grabbing
 2020-08-26 09:06:12 -04:00
Verkister
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
Cyantime
27913e5045 Prevent acid glands from melting non-simulated turfs (#7541) 2020-08-26 03:51:09 -04:00
Verkister
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-Quill
da96910c5c Attack! (#7538) 2020-08-26 03:49:42 -04:00
Killian
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
Novacat
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
Atermonera
b2250d9b47 Improvements to mech missiles. 2020-08-25 19:16:57 -04:00
Novacat
b5c884eb03 Merge pull request #8825 from ShadowLarkens/tgui_research_rebased 
TGUI Research
 2020-08-25 17:12:24 -04:00
Novacat
7ae5bf301b Merge pull request #8819 from dwinters99/gutterband 
Changes Gutter to Gutterband, removes whitelist.
 2020-08-25 16:38:06 -04:00
Novacat
0ef6772c9b Merge pull request #8823 from cadyn/cadyn-bugfixes 
Couple bugfixes
 2020-08-25 16:37:30 -04:00
ShadowLarkens
097d4fa283 TGUI Research 2020-08-25 13:30:47 -07:00
Atermonera
3669657656 Fixes Runtime in vchat_client.dm,85: Cannot execute null.is preference enabled (#7557) 2020-08-25 00:32:25 -04:00
Cadyn
f18c075cfd Feedback and forgot the VS edit goodies 2020-08-23 20:41:03 -07:00
David Winters
42f2b58b25 Moved name change to define, removes legacy entries from alienwhitelist 2020-08-23 23:31:31 -04:00
Cadyn
0d0cd61e60 Yummy bugfixes 2020-08-23 20:24:04 -07:00
Novacat
6d9968adba Merge pull request #8822 from Rykka-Stormheart/shep-dev-merc-retaliate 
Fixes Mercs threaten timers, and threaten sounds
 2020-08-23 21:23:10 -04:00
Rykka
0014833e89 Fixes Mercs threaten timers, and threaten sounds 
The default "threaten" timer was 3 seconds, meaning that as soon as world.time advanced beyond that, the merc would shoot you. If there's TIDI/lag or other issues, you'd immediately end up getting shot.

30 seconds is more reasonable, allows you time to back away from the merc without being shot at, and it keeps the mercs from being cheesed easily.

This also fixes the merc aggression sounds. Actual voicelines incoming once I get help from a contributor!
 2020-08-23 18:47:02 -04:00
ShadowLarkens
0ac5a2e020 Vore panel list preference 2020-08-23 13:03:00 -07:00
ShadowLarkens
ac03887a55 Merge remote-tracking branch 'upstream/master' into vore_overlays 2020-08-23 10:39:55 -07:00
Novacat
8301f7832d Merge pull request #8363 from KillianKirilenko/kk-misc 
AR Glasses Tweaks
 2020-08-23 13:14:37 -04:00
ShadowLarkens
6d4adf0764 Allows you to right click to lower job preference 2020-08-23 08:27:55 -04:00
David Winters
770cd596d9 Unwhitelist 2020-08-23 07:20:12 -04:00
Novacat
9774efc116 Merge pull request #8811 from ShadowLarkens/fix_asset_cache_runtime 
"Fix" asset cache json runtime
 2020-08-22 20:39:51 -04:00
ShadowLarkens
0c65f751fa "Fix" asset cache json runtime 2020-08-22 14:13:48 -07:00
Kates
8a138ee94e Add a zero to the translocator. 2020-08-22 22:48:32 +02:00
lbnesquik
472685cd25 Correct price errors introduced in UI update. Also shuffle a few things so there is no random spaces in the vendor. 2020-08-22 20:36:21 +02:00
Novacat
9b802e87f9 Merge pull request #8805 from VOREStation/upstream-merge-7526 
[MIRROR] Fixes mobs being able to ventcrawl while buckled
 2020-08-22 09:23:33 -04:00
Novacat
8df4b70b00 Merge pull request #8804 from VOREStation/upstream-merge-7530 
[MIRROR] Disables Swarmer Drones
 2020-08-22 09:23:20 -04:00
Novacat
3b5fd1a52f Merge pull request #8802 from VOREStation/upstream-merge-7536 
[MIRROR] Fixes a copypaste slip with heat protection
 2020-08-22 09:23:05 -04:00
Novacat
307793ba10 Merge pull request #8801 from VOREStation/upstream-merge-7532 
[MIRROR] Makes unbreakable walls unacidable
 2020-08-22 09:22:50 -04:00
Verkister
138a05c2a8 Fixes mobs being able to ventcrawl while buckled (#7526) 
No more mice teleporting office chairs all over the station.
 2020-08-22 04:24:31 -04:00
Neerti
205aef2e07 Disables Swarmer Drones (#7530) 
I actually forgot to do this before the event system went permanently live so that's on me.
Anyways this turns off swarmer drones from being able to be picked by the GM system, since right now they're, to put it charitably, poorly balanced and implemented (being super-maint drones is very clunky to me but thats not the main thing).
When the GM system spawns one in, it tends to result in a ghost becoming the drone, then that player essentially never being able to lose due to infinite re-tries and the crew has to fight off drones for the rest of the round or until they or the drone gets bored.
There's been quite a few number of rounds that have devolved due to them so for now it's probably best to turn them off for the time being.
 2020-08-22 04:24:20 -04:00
Verkister
f511641363 Fixes a copypaste slip with heat protection (#7536) 
Found while digging around for something else
 2020-08-22 04:12:32 -04:00