JOAN-RIG\Joan Risu
b8708a6a0e
removed a line from the gun saber
2018-03-02 23:53:15 -08:00
JOAN-RIG\Joan Risu
1420df0db1
Moves crescent rose to its own file, added a new gun for the nerd, and updated the Dominator to be alert level compliant.
2018-03-02 23:43:40 -08:00
Repede
c13f73848c
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# code/modules/vore/eating/bellymodes_vr.dm
# vorestation.dme
2018-02-28 22:06:46 -05:00
Arokha Sieyes
f04c58f202
VS: Rewrites basically all of how bellies work
...
And cleans up a ton of stuff.
2018-02-27 13:29:45 -05:00
Kelshark
9bb51e45e4
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/machinery/vending.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# code/modules/vore/eating/bellymodes_vr.dm
# config/custom_items.txt
# icons/obj/mining.dmi
2018-02-24 22:51:59 -05:00
Leshana
fef30da831
Upgrades NSFW to use initialize() and SSoverlays
...
- Both as a first demonstration and as a practical bugfix, we upgrade the NSFW to use SSoverlay. Instead of building a mutable_apperance and assigning it, we cut_overlays(), make our images, and call add_overlay() to queue it for compiling.
- We also must convert from using New() to initialize() becuase for annoying BYOND reasons, some static variables in SSoverlays are not always instantiated before mapload. So its important not to call overlays functions from New() (We shouldn't be doing that ANYWAY for performance reasons, but now its even more true)
2018-02-24 18:33:53 -05:00
Arokha Sieyes
d68629fc80
VS: MA override removal changes
2018-02-24 11:44:57 -05:00
killer653
641348c744
BeyondMyLife's custom fluff items
2018-02-23 15:10:35 -05:00
Aztectornado
105f986db1
Adds Siren jumpsuit
2018-02-22 06:00:41 -06:00
Kelshark
aea1eee615
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/game/area/Away Mission areas.dm
# code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
# config/custom_items.txt
2018-02-21 22:19:24 -05:00
Leshana
f34a0f104e
Revert adding unnecessary proc and fixing paths for vietsi custom item.
2018-02-18 00:47:10 -05:00
Mewchild
6af91caf6b
Ringfix v2
2018-02-17 23:02:41 -06:00
Leshana
5edfc7516b
Adjust VOREStation guns for PolarisSS13/Polaris/#4185
2018-02-17 16:56:30 -05:00
Aronai Sieyes
702997ffba
Merge pull request #3036 from VOREStation/aro-3010
...
Fixes NSFW mode selection
2018-02-15 18:00:26 -06:00
Kelshark
ced5c0c30a
Fluff items fix
2018-02-15 18:27:44 -05:00
Arokha Sieyes
2dffd17c39
Fix #3010
2018-02-15 02:46:11 -06:00
Mewchild
cb01bd8db5
Ringfix
2018-02-15 00:46:57 -06:00
Mewchild
bdb99ce7dc
Updates Fluff ring so gloves can be worn over it, and so it functions as a stamp (similar to normal signet ring)
2018-02-13 17:13:25 -06:00
Silver
8c3c0430f6
Correct Origin Tech Values
2018-02-10 22:29:46 -06:00
Silver
ab40c9d38c
Added Preferred Change to Deactivation Text
2018-02-10 18:26:51 -06:00
Silver
ef4d87a352
AwooCosplayCrate
...
Adds Wolfgirl Cosplay Crate to Supplypacks under Recreation.
Adds Wolfgirl Replica Sword and Autumn Shield.
Adds the above and three existing items to aforementioned crate.
2018-02-08 12:57:18 -06:00
Cyantime
d0f32b4a53
Adds frontier phaser to cargo
2018-02-06 21:58:08 -05:00
Cyantime
be7d0dd8c2
Adds expedition guns to map
2018-02-06 21:02:01 -05:00
Cyantime
12747725d9
basic weapons for the expeditions
2018-02-06 20:02:55 -05:00
Aronai Sieyes
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
Kelshark
c048a8ea8b
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
# code/modules/vore/weight/fitness_machines_vr.dm
# config/custom_items.txt
2018-02-02 19:25:51 -05:00
Kelshark
c4198a74f2
Custom fluff Strix / Kita
2018-02-02 08:51:51 -05:00
Cameron653
0f397452de
Updates the permit, too.
2018-02-01 19:32:03 -05:00
Cameron653
45b757983a
Makes Tasald spawn with the correct magazines
2018-02-01 19:27:01 -05:00
Aronai Sieyes
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
Repede
f7bf4afae3
Merge pull request #76 from Belsima/patch-1
...
Update custom_items_yw.dm
2018-01-29 22:36:03 -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
Kelshark
85f9061592
Merge branch 'master' of https://github.com/VOREStation/VOREStation
...
# Conflicts:
# code/controllers/autotransfer.dm
# code/datums/supplypacks/contraband.dm
# code/datums/supplypacks/munitions.dm
# code/game/objects/items/weapons/teleportation.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/silicon/robot/robot_modules/station.dm
# code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
# code/modules/reagents/reagent_containers/food/snacks.dm
# config/custom_items.txt
# config/jobwhitelist.txt
# icons/mob/vore/taurs_vr.dmi
# vorestation.dme
2018-01-24 19:52:12 -05: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
Cyantime
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 Sieyes
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 Sieyes
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
Leshana
f50d5153ff
Merge pull request #2681 from VOREStation/aro-nsfwhos
...
Gives the HoS a KHI-102b NSFW
2018-01-05 14:21:59 -05:00
