d2cb1e3011
Merge branch 'patch-8' of https://github.com/Verkister/VOREStation
2018-02-07 10:56:18 +02:00
d0f32b4a53
Adds frontier phaser to cargo
2018-02-06 21:58:08 -05:00
be7d0dd8c2
Adds expedition guns to map
2018-02-06 21:02:01 -05:00
12747725d9
basic weapons for the expeditions
2018-02-06 20:02:55 -05:00
dd7859ac0a
Merge pull request #2978 from VOREStation/context-menu
...
Removes Licking from context menu
2018-02-05 10:13:46 -05:00
be91065e8e
Licking
2018-02-05 06:43:55 -05:00
dae786c52d
Makes trash gains slightly more consistent.
...
-Basically everything else is more or less 1/10 ratio between nutrition and borg cell charge and now this is too.
2018-02-05 10:25:48 +02:00
bb09406ea0
Merge pull request #2934 from Verkister/yummytrash
...
Trashcan perk refactor and slight expansion.
2018-02-04 16:56:47 -05:00
f553219bbd
Squashed commit of the following:
...
commit b3d348258c4c93a1df81652bdf68fd00f4130369
Author: Verkister <superverkelian@hotmail.com >
Date: Sun Feb 4 22:40:08 2018 +0200
Squashed commit of the following:
commit 5faa5f9d063e57400584ab1ae458e626629b6842
Author: Verkister <superverkelian@hotmail.com >
Date: Sun Feb 4 22:31:10 2018 +0200
Update pai.dm
commit fd4bbdc6b99d74d94befb440ffe5e0c23a98a918
Author: Verkister <superverkelian@hotmail.com >
Date: Sun Feb 4 11:28:58 2018 +0200
Makes pAI cards, AI cards, and posis "edible"
-Also makes it so that pAI cannot fold out if inside a gut.
commit 1d13c207240c4bc296b188533e8cf50b1424cc36
Author: Verkister <superverkelian@hotmail.com >
Date: Sun Feb 4 10:40:38 2018 +0200
some more trashcan refactoring
commit 28d02c272dbd218d2d91c91fb1ecec999b9dd05e
Author: Verkister <superverkelian@hotmail.com >
Date: Sat Feb 3 13:32:14 2018 +0200
Trashcan perk refactor
2018-02-04 22:43:02 +02:00
566507ed76
Merge pull request #2965 from Verkister/numbflush
...
Clears the prey of numbenzyme on digestion death.
2018-02-04 15:11:10 -05:00
b087ff3207
Merge pull request #2929 from VOREStation/Cameron653-patch-3
...
Sebastian permit & magazine update & fix
2018-02-04 15:06:31 -05:00
158ae3f33b
Clears the prey of numbenzyme on digestion death.
...
-You can now do painless gurgles without getting pumped full of your prey's painkillers at the end.
2018-02-04 11:03:11 +02:00
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
66bd426cbc
Merge pull request #2913 from Verkister/patch-6
...
Changes voremob default gurglemode to itemweak
2018-02-03 20:56:37 -05:00
0f397452de
Updates the permit, too.
2018-02-01 19:32:03 -05:00
45b757983a
Makes Tasald spawn with the correct magazines
2018-02-01 19:27:01 -05:00
ec20277805
Removed unnecessary 'src's, added missed cooldown
2018-01-31 20:20:43 -05:00
7546d1fbb2
Update belly_vr.dm
2018-01-31 20:13:32 +02:00
e6651d72b6
Makes gurgle struggle failure cycle thru itemweak
...
Struggle upset the gut once to move to itemweak, fail again for full gurgles
2018-01-31 15:03:55 +02:00
35c4a8030e
Exercise equipment changes/refactor
2018-01-31 07:30:40 -05:00
cdac98afc1
Merge pull request #2897 from VOREStation/aro-bstemple
...
New Away Mission (and minor other stuff)
2018-01-30 20:04:07 -05:00
5cda1d36c1
VS: Translocator blocked by certain turfs
2018-01-30 19:23:36 -05:00
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
6e54ea70fb
Merge pull request #2863 from Verkister/naster
...
Nasty contamination vocabulary update.
2018-01-28 18:18:30 -05:00
47285cd5e3
Update contaminate_vr.dm
2018-01-28 21:10:16 +02:00
40358bf061
Nasty contamination vocabulary update.
...
-Now in even more creative flavors for digested crap!
-Also fixes a subtle blinking pixel in sludge overlay effect.
2018-01-28 19:00:34 +02:00
27c3272821
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27
...
# Conflicts:
# code/ZAS/_docs.dm
# code/__defines/mobs.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/game/turfs/simulated/walls.dm
# code/modules/client/preference_setup/loadout/loadout_utility.dm
# code/modules/lore_codex/codex.dm
# code/modules/mob/living/life.dm
# code/modules/mob/living/living_defines.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# maps/southern_cross/southern_cross-7.dmm
# maps/southern_cross/southern_cross_jobs.dm
# vorestation.dme
2018-01-27 23:08:53 -05:00
f726f04136
Fixes digest_act issues with mob holders and dummy pockets
2018-01-26 13:50:51 +02:00
9cab66297c
Merge pull request #2831 from Cameron653/EGG
...
Adds two egg implants
2018-01-25 19:02:58 -05:00
91e76145bb
VS: Glowing Body Trait
2018-01-24 02:01:05 -05:00
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
84c3154b2b
Merge branch 'master' into hypo
2018-01-20 01:39:16 -05:00
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
09eb4054a5
Removes hypospray/vr and vial/vr
2018-01-18 19:01:26 -05:00
da3358a729
Merge pull request #2791 from VOREStation/aro-knifepath
...
Knife path fix for VS trashpiles and a fluff item
2018-01-18 18:20:47 -05:00
dc0e602663
Knife path fix for VS trashpiles and a fluff item
2018-01-18 15:48:14 -05:00
00b69ca913
Clean up persist messages in server log
...
Some of them look like errors or incomplete when they aren't
2018-01-18 15:35:31 -05:00
9456969a8e
Make the persistence of spawn-points at end of be configurable per map.
...
* Added three vars to the map datum to confgure which spawn point should be persisted for players who are dead, evac'd or stayed on station.
2018-01-17 00:31:04 -05:00
ce46a0a14b
Merge pull request #2759 from VOREStation/aro-ghostbusting
...
Prevent certain things from including spooky ghosts
2018-01-16 13:53:26 -05:00
10aabd98da
POLARIS: 3000% human/update_icons() improvement
...
Using overlays in lists and a mutable_appearance
2018-01-15 21:39:47 -05:00
f2b83eb7da
Prevent certain things from including spooky ghosts
...
I mean I like soulvore but c'mon.
2018-01-15 20:38:28 -05:00
60c07e348b
Merge pull request #2742 from VOREStation/aro-hudwork
...
Plaaaaaaanessssssss
2018-01-14 13:08:35 -05:00
8f71a052a4
VS: Planes shenanigans. Begins 'plane' work, for VS specific things.
2018-01-14 00:40:00 -05:00
8dae4a6f04
Merge pull request #2725 from VOREStation/aro-bacon
...
Refactor Digestion
2018-01-14 00:07:54 -05:00
ec7ebd1650
Merge pull request #2714 from Verkister/forbiddentaurs
...
Enables 2 compatibility lacking fluff taur types.
2018-01-13 23:41:34 -05:00
d3485c8e74
makes drake and otie taurs dual colorable
2018-01-12 09:58:50 +02:00
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
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
449dcbb0b7
Refactor Digestion
2018-01-10 02:06:13 -05:00
20bfadd159
Enables 2 compatibility lacking fluff taur types.
...
-The earlier drake and otie out of request.
-No gear compatibility for these yet.
2018-01-09 13:36:14 +02:00
Verkister