Commit Graph

18878 Commits

Author SHA1 Message Date
Spades
16b37dfc19 Merge pull request #2506 from VOREStation/Aces-Tweaks
Some various map tweaks, and also carp nerf
2017-11-20 18:57:48 -05:00
Cameron653
bd8d2bbf00 Gives Tas coat same allowed items as HoS oat 2017-11-20 16:04:59 -05:00
Spades
db2722a401 Some various map tweaks, and also carp nerf
- Space carp now only spawn on the bottom level of the asteroid. Changed
the message to reflect this.
- A few minor map tweaks and fixes. Mostly asthetic. Just threw some
dirt around.
- Added Gaslamps to the maps, which will now wander around uncaringly
until antagonized.
2017-11-20 15:35:32 -05:00
Cameron653
1de5a6c132 Update vorepanel_vr.dm 2017-11-19 11:25:34 -05:00
Cameron653
cf472937bf Merge pull request #2498 from Cameron653/DROPNOM_QUICK_FIX
Fixes dropnom permastuns. Prevents dropnom double damage.
2017-11-18 12:50:10 -05:00
Spades
13113791bd Merge pull request #2494 from VOREStation/Cameron653-patch-2
Fluff Fixes
2017-11-18 12:20:24 -05:00
killer653
9ead1295e1 Github didn't push this 2017-11-18 11:10:53 -05:00
Verkister
bb2deea01d Fixes my lossed updoots. 2017-11-18 17:39:00 +02:00
killer653
afa7b21dc9 Fixes permastuns. Prevents doubledamage 2017-11-18 10:37:58 -05:00
Cameron653
00ab8f752b Also fixes Ivy's fluff ID 2017-11-18 00:16:12 -05:00
Cameron653
5c4aac8ca7 Adds egg description 2017-11-17 21:01:46 -05:00
killer653
463b9c4dfb Edited files 2017-11-17 19:28:26 -05:00
killer653
da0bf3743b Polaris sync 2017-11-17 19:27:03 -05:00
Neerti
264372ff1a Sanitizes Circuit Inputs 2017-11-17 18:38:48 -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
elgeonmb
a7f8a8270e changes max shield radius
as requested by Mazian on the forums.
2017-11-16 02:17:06 -08:00
Anewbe
1d9adcb285 Merge pull request #4267 from Neerti/11/14/2017_icon_scaling
Makes Icon Scaling Great
2017-11-16 01:52:05 -06: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
Anewbe
ff9a191135 Merge pull request #4265 from Atermonera/conscious_strip
MouseDrop checks incapacitated() before giving inventory access
2017-11-15 12:36:16 -06: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
Neerti
0315b18185 Makes Icon Scaling Great
Scaling wasn't great before so no Again.
Makes most icons not get blurry when scaled.
Makes all /atom/movable s able to be scaled with the adjust_scale() proc.
Adds ability for species to get scaled automatically.  Currently no species does this, but it is an option in the future.
Adds four traits to adjust your mob scale.  It is purely cosmetic at this time.
2017-11-14 19:32:49 -05: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
23906d8749 Un-duplicates head marking cache generation. (#4257)
* Un-duplicates head marking cache generation.
-Organ icon generation for heads no longer adds the markings list into the cache key twice.
-Related to similar dismemberment crashes as the earlier organ cache issue fixes.

* Update organ_icon.dm
2017-11-14 12:24:00 -06:00
Verkister
c7a3c92b1c Stops 0 force item paps turning borgs into pyrotechnical sparklers. (#4261)
* Stops 0 force item paps turning borgs into pyrotechnical sparklers.
-That's just too much of a silly thing to happen without damage.

* Adds verb for party sparks.

* Update robot.dm
2017-11-14 10:39:29 -06:00
Anewbe
3c151021c8 Merge pull request #4262 from Atermonera/AI_verbs
AI verbs are no longer hidden
2017-11-14 10:38:48 -06: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
Atermonera
ee8f3ffbce MouseDrop checks incapacitated() before giving inventory access 2017-11-13 23:46:11 -08: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
Anewbe
73b707bdcd Merge pull request #4242 from mistyLuminescence/streamlinedsuit
Adjusts streamlined (Vey-Med) med voidsuits
2017-11-14 00:43:57 -06:00
killer653
0f8c083837 SilverTalisman Whitelist Implant 2017-11-13 21:18:33 -05:00
Atermonera
bb985c5d16 AI verbs are no longer hidden 2017-11-13 17:30:03 -08:00
Mechoid
f25a6bad5e Merge pull request #4256 from Anewbe/bignathi
Unathi are bigger and have more max blood
2017-11-13 16:13:40 -08:00
Verkister
c23ac9d849 unrelated runtime fixes 2017-11-14 01:49:14 +02:00