Commit Graph
420 Commits
Author SHA1 Message Date
Cyantime 12747725d9 basic weapons for the expeditions 2018-02-06 20:02:55 -05:00
Aronai SieyesandGitHub b087ff3207 Merge pull request #2929 from VOREStation/Cameron653-patch-3
Sebastian permit & magazine update & fix
2018-02-04 15:06:31 -05:00
Arokha Sieyes 5b1311c994 Fix NSFW and fluff item removal
Fixes the NSFW sprite buggyness.

Removes Briana's gun spawn. She gave her gun up ICly!
2018-02-03 21:58:41 -05:00
Cameron653andGitHub 0f397452de Updates the permit, too. 2018-02-01 19:32:03 -05:00
Cameron653andGitHub 45b757983a Makes Tasald spawn with the correct magazines 2018-02-01 19:27:01 -05:00
Aronai SieyesandGitHub cdac98afc1 Merge pull request #2897 from VOREStation/aro-bstemple
New Away Mission (and minor other stuff)
2018-01-30 20:04:07 -05:00
Arokha Sieyes 5cda1d36c1 VS: Translocator blocked by certain turfs 2018-01-30 19:23:36 -05:00
KotetsuRedwood d1816a3eca Adds Latex Maid Dresses.
As the title says! Also renames clothes stuff because SS13 needs jumpsuits to end with _s for some inscrutible reason
2018-01-29 19:47:14 +00:00
killer653 6d28ce7963 Adds two egg implants
https://forum.vore-station.net/viewtopic.php?f=27&t=1222
https://forum.vore-station.net/viewtopic.php?f=27&t=1001
2018-01-22 18:38:39 -05:00
CyantimeandGitHub 84c3154b2b Merge branch 'master' into hypo 2018-01-20 01:39:16 -05:00
Leshana 436d48b337 Update VOREStation specific code to use merged in features.
* Update our reagent_containers to use the new "prefill" feature instead of our own PolarisSS13/Polaris/pull/4583
* Fix missing VOREStation Edit comments.
* Prevent singularity from entering dorm areas.
2018-01-19 18:15:47 -05:00
Cyantime 09eb4054a5 Removes hypospray/vr and vial/vr 2018-01-18 19:01:26 -05:00
Arokha Sieyes dc0e602663 Knife path fix for VS trashpiles and a fluff item 2018-01-18 15:48:14 -05:00
Arokha SieyesandGitHub 8dae4a6f04 Merge pull request #2725 from VOREStation/aro-bacon
Refactor Digestion
2018-01-14 00:07:54 -05:00
Isaac Erwin 890663f2e0 Renames leg cuffs to leg wraps, renames the gold ones
Mainly to fix the inconsistent capitalization, partially to make it consistent with the names in the loadout, partially because I think they're too long to be considered a cuff.

I'd also change the pathing so that the cuffs aren't a subtype of black shoes for no apparent reason, but I'd rather not accidentally break anything.

I'm also going to take this opportunity to say that I want an all-black/grey variant of these.
2018-01-11 07:36:37 -05:00
Arokha Sieyes 072a40dea3 Make digest_act even more generic (and contaminate)
Now returns nutrition that should be gained, and accepts an internal_contents list and where you want subobjects placed
2018-01-10 10:02:13 -05:00
Arokha Sieyes 449dcbb0b7 Refactor Digestion 2018-01-10 02:06:13 -05:00
Leshana ca880019e8 Refactor NSFW gun code to be robust against bad data conditions. 2018-01-08 22:43:57 -05:00
Arokha SieyesandGitHub a172221502 Merge pull request #2693 from blazerules/master
Electrostaff sheath fix
2018-01-07 21:35:13 -05:00
blazerules 846bb26f28 Electrostaff sheath fix
Added new held item sprites.
2018-01-07 18:44:50 +02:00
Mewchild a3d9ea5659 Bone Signet Ring 2018-01-06 16:51:06 -06:00
blazerules b8f77619f2 Electrostaff sheath fix
For some reason changing it to box/fluff broke it. Can't... put my finger on why. But it works as a backpack so alls good.
2018-01-06 13:03:31 +02:00
LeshanaandGitHub f50d5153ff Merge pull request #2681 from VOREStation/aro-nsfwhos
Gives the HoS a KHI-102b NSFW
2018-01-05 14:21:59 -05:00
Arokha Sieyes 5c6637cffa Gives the HoS a KHI-102b NSFW
It's just my fluff gun. But sharing is caring.

From the ingame fluff:
"Variety is the spice of life! The 'Nanotech Selectable-Fire Weapon' is an unholy hybrid of an ammo-driven energy weapon that allows the user to mix and match their own fire modes. Up to three combinations of energy beams can be configured at once. Ammo not included."
"This gun is an energy weapon that uses interchangable microbatteries in a magazine. Each battery is a different beam type, and up to three can be loaded in the magazine. Each battery usually provides four discharges of that beam type, and multiple from the same type may be loaded to increase the number of shots for that type."
"The Kitsuhana 'Nanotech Selectable Fire Weapon' allows one to customize their loadout in the field, or before deploying, to achieve various results in a weapon they are already familiar with wielding."

The HoS's includes 2 lethal, 2 stun, 1 net, and 1 ion battery. There are other batteries (like instagib!) but there's no way to get them normally. There's also one that strips people.
2018-01-04 23:57:11 -05:00
blazerules 77080534a6 Electrostaff Custom Item
Please kill me I am bad at noticing small things.
2018-01-03 11:08:25 +02:00
blazerules 43108a5dab Electrostaff Custom Item
Fixed typos
2018-01-03 10:57:31 +02:00
blazerules 07b0b071ce Electrostaff Custom Item
Changes as asked for by Arokha
2018-01-03 10:07:52 +02:00
blazerules 2d434c40d5 Electrostaff Custom Item
This is the code for the stunstaff as was approved here

https://forum.vore-station.net/viewtopic.php?f=27&t=1204
2018-01-03 09:28:43 +02:00
Cameron653andGitHub d6be1e9b53 Merge pull request #2587 from Cameron653/FLUFF_ITEMS
Birb fluff items
2017-12-27 17:12:45 -05:00
Arokha Sieyes 08ea0ccfd5 Fix two fluff IDs
Path changed and this ID split into two in the backend.
2017-12-26 19:44:35 -05:00
Cyantime 29a2219fde Cleans up custom_items_vr.dm 2017-12-20 22:23:42 -05:00
Cyantime d64dc8cf6a Cleans up custom_clothes_vr.dm 2017-12-20 22:23:29 -05:00
killer653 8c29c2f68d Birb fluff items 2017-12-19 16:05:35 -05:00
SpadesandGitHub 2a79f2f044 Merge pull request #2572 from Cameron653/EGGS
Custom Egg Implant
2017-12-16 08:30:43 -05:00
killer653 5736f590c9 Gives a player an egg implant. 2017-12-13 20:22:02 -05:00
killer653 285ad76b5b Custom Imp 2017-12-07 14:24:46 -05:00
Verkister dcdeba60ae adds gn set 2017-11-22 23:53:59 +02:00
Verkister d699b23e9f Adds yet another new loadout accessory.
-Drop straps. Basically dropped suspenders or drop pouches without the pouches.
-Basically I've been really digging the aesthetic thiccness of the drop pouches and just wanted the look available without the access walls and color restrictions.
-Yeah it's colorable too.
2017-11-22 22:56:38 +02:00
Cameron653andGitHub bd8d2bbf00 Gives Tas coat same allowed items as HoS oat 2017-11-20 16:04:59 -05:00
Cameron653andGitHub 00ab8f752b Also fixes Ivy's fluff ID 2017-11-18 00:16:12 -05:00
Cameron653andGitHub 5c4aac8ca7 Adds egg description 2017-11-17 21:01:46 -05:00
SpadesandGitHub d80abeb939 Merge pull request #2475 from VOREStation/luger-nerf
Rebalanced the Energy Luger
2017-11-16 22:35:39 -05: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 121f626d10 Tweaked the description
Makes it more unique.
2017-11-14 02:21:46 -05: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
Cyantime d5f582013f Reagent generator implants now support multiple reagents at once. 2017-11-04 01:04:37 -04:00
killer653 315711b314 Pol sync part 2 2017-10-27 15:30:51 -04:00
Cameron653andGitHub 266e300d27 Merge pull request #2306 from saysage/master
Hotfix for custom clothes
2017-10-16 16:47:50 -04:00
saysageandGitHub 934288aa9e Update custom_clothes_vr.dm 2017-10-16 16:02:35 +03:00