Commit Graph

23691 Commits

Author SHA1 Message Date
Ketrai
4fb9362b05 Makes the fishing time increase for indoor fishing only 10% longer 2019-08-14 08:57:45 +02:00
Heroman
bab3ae66dd Reduces power consumption of active lights 2019-08-14 16:50:30 +10:00
Novacat
36b3256045 Merge pull request #5595 from Heroman3003/fishing-pools
Changes fishing loot pools for indoor fishing
2019-08-14 00:32:30 -04:00
Novacat
77a59382d8 Update fishing_vr.dm 2019-08-14 00:18:35 -04:00
chaoko99
151043ad85 Fixes Chaoko99's custom item. 2019-08-13 19:06:29 -07:00
Heroman
6d43c8f45a Changes fishing loot pools for indoor fishing 2019-08-14 11:31:47 +10:00
izac112
0980775d93 Vasharr fluff #2 2019-08-14 02:03:17 +02:00
izac112
e2570c5585 Vasharr fluff 2019-08-14 01:34:06 +02:00
izac112
a3037eb703 Fluff cleanup 'Generalpantsu' 2019-08-14 01:08:04 +02:00
izac112
2734fe7a65 Cleaning up fluff 'Deathty' 2019-08-14 01:05:00 +02:00
Michiyamenotehifunana
1e34c97a9a Turns NIFSoft disks into neuromods 2019-08-13 14:02:36 +08:00
TheFurryFeline
223c23c100 No Blindess
Make it so you're not mechanically blind so you can hear regular emotes. But ICly, you'd still be blind, so.... Go nuts with that. :>
2019-08-12 18:02:34 -04:00
TheFurryFeline
58d1a95454 Sod it
Spent like five hours trying to get it to work in a different file but it might well be better to just.... Do a 1:1 port with //VoreStation edit comments as per code practice here.
2019-08-12 16:51:43 -04:00
Anewbe
74ab7a563f Merge pull request #6390 from Heroman3003/bot-patrols
Makes bot patrolling into a map var
2019-08-12 16:32:28 -04:00
Atermonera
c9e9932182 Merge pull request #6386 from TheFurryFeline/TFF-Orange_Is_The_New_Orange
Freebie Orange Jumpsuit
2019-08-12 14:40:23 -04:00
Atermonera
6bb746995e Merge pull request #6401 from Shophaune/dronehatissues
Maybe fixes drone hat issues
2019-08-12 13:58:27 -04:00
Novacat
dd7a7842ed Merge pull request #5567 from Novacat/nova-survival
Adds Prototype Hypospray
2019-08-12 13:15:35 -04:00
TheFurryFeline
de2438a860 Find Your Seats
Ports ChompStation facesitting, pretty much. :>
2019-08-12 10:14:10 -04:00
Spades
de8be8f2dc Merge pull request #5578 from BlackMajor/Dumb-verb
Adds an admin verb for spawning players as mobs with their vore prefs intact
2019-08-12 09:41:01 -04:00
BlackMajor
419db94458 Adds requested changes yeet 2019-08-11 17:22:20 +12:00
BlackMajor
67885bca42 Oh wait that's important 2019-08-11 02:03:32 +12:00
BlackMajor
1035c6e8dd ew empty lines 2019-08-11 01:45:39 +12:00
BlackMajor
da7949b4b6 I should probably remove those debug messages 2019-08-11 01:38:57 +12:00
BlackMajor
0a2e805735 Adds spawn character as mob verb 2019-08-11 01:37:36 +12:00
Unknown
1cd0ee6daf Purges bad indentation 2019-08-10 04:06:08 -04:00
Unknown
0afd758767 Adds pilot qualification pin to loadout
Currently only allows job roles with pilot access to take it.
2019-08-10 04:01:51 -04:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
Novacat
46f76391ba Merge pull request #5573 from VOREStation/upstream-merge-6380
[MIRROR] Allows Construction of Serenity in Robotics
2019-08-08 19:12:54 -04:00
Novacat
75e53b8fc9 Update mechfab_designs.dm 2019-08-08 16:30:44 -04:00
Novacat
eced9eda28 Update circuits.dm 2019-08-08 16:30:08 -04:00
Novacat
c0f842b2d2 Merge pull request #5572 from VOREStation/upstream-merge-6387
[MIRROR] Makes ahelping on existing ticket give proper feedback
2019-08-08 16:29:17 -04:00
Andrew
9d93bea992 Allows Construction of Serenity in Robotics 2019-08-08 16:28:07 -04:00
Novacat
31924e23de Update materials.dm 2019-08-08 16:09:13 -04:00
Atermonera
1a15bb765d Merge pull request #6387 from Heroman3003/ahelp-feedback
Makes ahelping on existing ticket give proper feedback
2019-08-08 16:09:05 -04:00
Atermonera
0469a309cc Adds NOCONDUCT to Some Items 2019-08-08 16:07:50 -04:00
Verkister
33bbcf5a5c Properly labels the vore tab custom species button
The misleading label causing needless troubleshooting steps had been bothering me for a good while already.
2019-08-08 18:05:23 +03:00
Novacat
8e321b3725 Update hypospray.dm 2019-08-06 22:10:50 -04:00
Unknown
d7406088b5 Test 2019-08-06 21:07:40 -04:00
Unknown
b5824871ed Removes unnecessary check 2019-08-06 21:05:51 -04:00
Unknown
03976d3dd3 Moves var 2019-08-06 21:03:35 -04:00
Unknown
f699825119 Forgot a Var 2019-08-06 20:58:25 -04:00
Unknown
1fb88e40e2 Adds Prototype Hypospray
- Can be researched and manufactured by Science
- Identical to a mk1 hypospray, except does not instantly inject reagents at friendly intents

Not terribly useful right now under the current meta, but probably will be useful down the road if/when syringes become disposable again.
2019-08-06 20:54:14 -04:00
Novacat
aa9dc54303 Merge pull request #5565 from VOREStation/upstream-merge-6378
[MIRROR] Lowers Bot Emag Chance from Ion Storm
2019-08-06 15:43:02 -04:00
Novacat
4f13d0bb42 Update ion_storm.dm 2019-08-06 15:30:47 -04:00
Novacat
d4e53aa693 Merge pull request #5564 from VOREStation/upstream-merge-6362
[MIRROR] Event Tweaks / Fixes
2019-08-06 15:30:30 -04:00
Atermonera
bdd0b2aa82 Merge pull request #6377 from Heroman3003/synth-finity
Fixes synth legs being broken causing feedback loop
2019-08-06 15:01:51 -04:00
Atermonera
e0d157294e Lowers Bot Emag Chance from Ion Storm 2019-08-06 14:57:30 -04:00
Atermonera
7939362cea Merge pull request #6362 from Mechoid/EventTweaks
Event Tweaks / Fixes
2019-08-06 14:54:10 -04:00
Novacat
3e95af1265 Merge pull request #5562 from VOREStation/upstream-merge-6295
[MIRROR] Adds an advanced TTS circuit, and sign-camera.
2019-08-05 19:02:44 -04:00
Spades
70072ca29c Merge pull request #5561 from TheFurryFeline/TFF-Reminder_For_Suit_Sensors!
Suit Sensors Selectable
2019-08-05 18:56:01 -04:00