Kelshark
33d109b2dd
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# config/custom_items.txt
2017-11-25 11:35:10 -05:00
Spades
a412c18614
Merge pull request #2469 from Verkister/gimmicktraits
...
Adds 2 gimmick traits and borgo feeding.
2017-11-16 22:36:46 -05:00
Spades
bc51b77ed6
Merge pull request #2487 from Ketrai/patch-8
...
Makes it solargrub larva produce solargrub meat.
2017-11-16 22:36:22 -05:00
Spades
d80abeb939
Merge pull request #2475 from VOREStation/luger-nerf
...
Rebalanced the Energy Luger
2017-11-16 22:35:39 -05:00
Spades
0dbc5f92f9
Merge pull request #2490 from VOREStation/aro-deadgrab
...
Stops runtime when ghosts examine people
2017-11-16 22:35:01 -05:00
Arokha Sieyes
8e55f94e97
Merge pull request #2484 from Verkister/gogliberation
...
Unrestricts my fluff goggles for general loadout use.
2017-11-16 15:31:48 -05:00
Arokha Sieyes
bd5e5cf08b
Merge pull request #2483 from VOREStation/Auream-Imperium-fix
...
Update organizations_vr.dm
2017-11-16 15:30:33 -05:00
Arokha Sieyes
52e6096be6
Stops runtime when ghosts examine people
...
Defines this proc so that it will work on every mob, then overrides it on living to work like normal. I'd use INFINITE but I have no idea what would happen if it tried to do math on it.
2017-11-16 15:24:18 -05:00
Ketrai
52d004c0fd
Makes it solargrub larva produce solargrub meat.
...
They just drop red meat right now, silly.
2017-11-16 20:35:01 +01:00
Verkister
7c7794f74f
Unrestricts my fluff goggles for general loadout use.
...
-Opie's orange goggles and Cameron's aesthetic science goggles.
-The orange goggles can also be worn on ear slot in order to have their up state above the hair layer.
2017-11-16 09:31:27 +02:00
Spades
64da022bd6
Merge pull request #2473 from Cameron653/SILVERTALISMAN_CUSTOM_IMPLANT
...
Silvertalisman custom implant
2017-11-15 19:46:10 -05:00
Spades
c501e16e05
Update organizations_vr.dm
...
Auream Imperium not Imperium Auream.
2017-11-15 19:45:25 -05:00
Spades
55837653b2
Merge pull request #2470 from Verkister/wrecc
...
Dogborg wreck and rest icons now work properly!
2017-11-15 11:01:21 -05:00
Verkister
56257b302a
Merge branch 'gimmicktraits' of https://github.com/Verkister/VOREStation into gimmicktraits
2017-11-15 17:52:47 +02:00
Verkister
a5ff9415fa
Merge branch 'master' of https://github.com/VOREStation/VOREStation into gimmicktraits
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/blank_vr.dm
2017-11-15 17:52:15 +02:00
Spades
904899fcde
Merge pull request #2477 from Verkister/plowthatnerd
...
Adds an inconveniently evil new negative trait.
2017-11-15 10:48:55 -05:00
Verkister
fb7ebab196
Update living.dm
2017-11-15 16:39:33 +02:00
Verkister
b4c707e591
Update living.dm
2017-11-15 07:56:01 +02:00
Verkister
f02f3b2846
Adds an inconveniently evil new negative trait.
...
-"Lightweight", cost -4, every non-helpful bump received has a 50% chance to knock you down.
2017-11-14 20:48:40 +02:00
Verkister
8c1fb156be
Adds a cosmetic "armor vest" taur saddlebag subtype.
...
-Works with 4-legged taurs as the other taurbags.
-Has normal backpack stats whereas the other saddlebags have duffle stats.
2017-11-14 16:18:47 +02:00
Verkister
fa48060644
darn capitalism
2017-11-14 09:43:52 +02:00
Verkister
a5e3ddd948
items cannot forcemove?
2017-11-14 09:42:38 +02:00
Verkister
ec413c1288
Update trash_vr.dm
2017-11-14 09:33:23 +02:00
Verkister
540901e359
Update neutral.dm
2017-11-14 09:23:08 +02:00
Spades
121f626d10
Tweaked the description
...
Makes it more unique.
2017-11-14 02:21:46 -05:00
Verkister
03121273a6
Update positive.dm
2017-11-14 09:21:32 +02:00
Spades
19511ae184
Rebalanced the Energy Luger
...
@Yoshax noticed that the Energy Luger can do a retarded amount of damage
over its Energy Gun counterpart. The Energy Luger has 140% more shots on
all settings than the standard Energy Gun. The Energy Luger has the
potential to do 2.4x more damage. This is absurd, and not its intended
design. This was an oversight that occured during a recent rework of
Polaris energy guns and how batteries work.
I have three possible solutions. This is one of them.
A) Rebalance it to match the energy gun, including the ability to reload
it (requires a new sprite which I do not have).
B) Lock the battery, making it impossible to reload without a charge
station, but allow it to keep twice the capacity. (I'll fix the numbers
so it's exactly 2x the Egun capacity, not 2.4x)
C) Lock the battery, but remove the firing delay. **This is what I did
in this PR.**
Discuss the three solutions and decide what is best. Option A is not an
option without a sprite, though, so if anyone wants option A, make a
sprite.
2017-11-14 02:11:49 -05:00
killer653
0f8c083837
SilverTalisman Whitelist Implant
2017-11-13 21:18:33 -05:00
Verkister
c23ac9d849
unrelated runtime fixes
2017-11-14 01:49:14 +02:00
Verkister
b5b41ab187
move ya feet
2017-11-14 01:17:06 +02:00
Verkister
2daec6bdc2
Update neutral.dm
2017-11-14 00:58:04 +02:00
Cameron653
9af1fa5065
Merge pull request #2472 from VOREStation/Cameron653-patch-2
...
Stop causing bots to kill everyone, jesus christ
2017-11-13 17:47:59 -05:00
Cameron653
de0ce9285d
Stop causing bots to kill everyone, jesus christ
2017-11-13 17:38:19 -05:00
Cameron653
a37632e929
Prevents vatborns from spawning
2017-11-13 17:24:55 -05:00
Verkister
b0a72d2983
Rest
2017-11-13 23:32:38 +02:00
Verkister
3b5f663f08
snib
2017-11-13 22:21:47 +02:00
Verkister
7ead6799df
Got them dogborg wreck icons working.
...
-Yeah I did.
2017-11-13 22:13:35 +02:00
Verkister
c1f16e080e
Adds 2 neutral gimmick traits and borgo feeding.
...
-Trait 1, "Hard Feet" makes your feet glass shard resistant.
-Trait 2, "Trash Can" lets you dispose of snack wrappings on the go without littering or having to quest out in search of a disposal bin.
-Also adds trash feeding for janiborgo in a sibling snippet for the forementioned trait.
-Also added the old citadel era "robo kibble" to give the custom trash code file a first custom "trash" as well. Only in the code for now, not mechfab printable yet.
-I'm gonna toss Polaris an update that makes borgs not become sparkles on 0 force item paps brb.
2017-11-13 20:01:58 +02:00
Cyantime
ce21d46c7d
Can't open blast doors with your face
2017-11-12 16:40:41 -05:00
Spades
c37c291c10
Merge pull request #2455 from VOREStation/Cameron653-patch-1
...
Loadout edits
2017-11-12 11:55:17 -05:00
Spades
0761203b90
Merge pull request #2444 from Cameron653/master
...
Makes it so nevreans can fly w/ default tail.
2017-11-12 11:52:03 -05:00
Spades
4de5f0b989
Merge pull request #2450 from Verkister/fuzzytoggle
...
Adds toggleable character pref for sharp/fuzzy scaling. (Tested.)
2017-11-12 11:49:29 -05:00
Spades
5cea42a2b8
Merge pull request #2440 from Verkister/orgurg
...
Makes HV at least somewhat feasible with organ nutrition.
2017-11-12 11:49:10 -05:00
killer653
3e2cf7c9b7
Makes stairs function as before
...
Video: https://i.imgur.com/EvqCQux.gifv
2017-11-12 01:15:33 -05:00
killer653
b1ce51c2b3
Adds in Drop Noms
...
Information to include in PR
Panel: https://i.imgur.com/Ru0Mb2w.png
Pred falling onto prey: https://i.imgur.com/Y28TaJn.gifv
Prey falling onto pred: https://i.imgur.com/DzZlQbr.gifv
Person falling onto person w/ unaligned prefs:
https://i.imgur.com/DzZlQbr.gifv
Pred falling onto prey does anywhere from 0 to 30 damage to the pred
Prey falling into pred does 0 damage to both.
Unaligned causes the faller to suffer damage & a stun, person being
fallen on gets stunned
Dropping onto someone w/ dropnom: https://i.imgur.com/PywIfAI.png
Dropping onto someone w/ dropnom: https://i.imgur.com/H7o5g9f.png
2017-11-12 00:32:54 -05:00
Cameron Lennox
4f289c84c6
Agh
2017-11-11 19:24:59 -05:00
Cameron Lennox
c9ee48b78f
WIP
2017-11-11 19:24:35 -05:00
Verkister
b6d4686ba0
Update bellymodes_vr.dm
2017-11-11 17:07:28 +02:00
Verkister
09591d9395
It works now.
2017-11-11 16:00:37 +02:00
Cameron653
8714c006ff
Update loadout_accessories.dm
2017-11-10 18:33:44 -05:00
