Commit Graph

59 Commits

Author SHA1 Message Date
Repede
5bc7f0bd72 'Reverts' a bunch of changes that we've made through the years and see if any of those could have been the cause for out of memory errors to start appearing, unchecks a bunch of unused things like mining rewards and coin-shop as well as some admin systems that are not checked on upstream.
Also readds vore monkeys
2020-07-26 12:48:22 -04:00
izac112
601a155b30 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-25 15:22:42 +02:00
Unknown
5d7afad7c3 Conflict Resolution 2020-07-24 09:07:41 -04:00
Repede
7f1a6d6cc7 Fuck this shit
Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/controllers/subsystems/inactivity.dm
#	code/game/area/Away Mission areas.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/jobs/job/captain.dm
#	code/game/jobs/job/civilian.dm
#	code/game/jobs/job/security.dm
#	code/game/jobs/jobs.dm
#	code/game/machinery/air_alarm.dm
#	code/game/machinery/suit_storage_unit.dm
#	code/game/machinery/suit_storage_unit_vr.dm
#	code/game/mecha/combat/gorilla.dm
#	code/game/turfs/simulated/dungeon/wall.dm
#	code/game/turfs/simulated/wall_types.dm
#	code/modules/client/preference_setup/loadout/loadout_utility_vr.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
#	code/modules/clothing/spacesuits/void/void_vr.dm
#	code/modules/clothing/under/accessories/holster.dm
#	code/modules/mob/language/station_vr.dm
#	code/modules/mob/living/carbon/human/emote_vr.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	code/modules/power/apc.dm
#	code/modules/power/lighting.dm
#	code/modules/resleeving/machines.dm
#	config/jobwhitelist.txt
#	icons/mob/species/seromi/head.dmi
#	icons/mob/species/seromi/suit.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	maps/tether/submaps/_tether_submaps.dm
#	maps/tether/tether_areas2.dm
#	maps/tether/tether_defines.dm
#	maps/tether/tether_shuttles.dm
#	nano/templates/apc.tmpl
#	vorestation.dme
2020-04-04 14:37:55 -04:00
Unknown
c960a9ec30 Finishes this PR 2020-03-17 14:00:02 -04:00
Repede
5178fe3419 Geneshadekins will stop phasing on death. 2020-02-15 14:00:25 -05:00
izac112
933385020f Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update
# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved
2020-01-31 18:23:50 +01:00
Heroman
ede140ec9c Fixes grub event end announcement not functioning 2020-01-14 05:58:38 +10:00
Hawk_v3
8a0b78c322 Merge remote-tracking branch 'upstream/master' 2020-01-01 15:16:53 +00:00
Unknown
750c6f0ea7 Remove medicine bottle from TE Whitelist 2019-12-31 18:09:13 -05:00
Hawk_v3
6b935d64ec Merge remote-tracking branch 'upstream/master' 2019-12-21 21:57:49 +00:00
Meghan-Rossi
604fd1b74f Resolve conflicts, fix compile errors 2019-12-19 17:49:21 +00:00
Luke Vale
d8d92ed78b Adds in the //YW edits to the VR files 2019-11-25 22:10:56 -06:00
Luke Vale
a3aa3f252e Adds in GeneShadekins. A form of shadekin without their powers. 2019-11-25 22:02:12 -06:00
Heroman3003
62889c39d9 Removes deprecated code 2019-11-15 08:38:53 +10:00
Heroman3003
a3fb3e3950 Merge branch 'master' of https://github.com/VOREStation/VOREStation into making-of-shadekin 2019-10-29 09:33:48 +10:00
Poojawa
f718201974 Adds Sound Code and toggles 2019-10-13 02:05:16 -05:00
TheFurryFeline
f1ba4aca5e Nom the Communicators!
Making a call with your friend? Want to give them a good view of what you can do to them? Here ya go~! Also includes commwatches by default since they're a child of the device/communicator. :3 Ports https://github.com/CHOMPstation/CHOMPstation/pull/798 because I rather like it. Would be interesting when used for scenes or tempting partners into a future scene.
2019-09-19 03:58:43 -04:00
TheFurryFeline
2877917f3a Suit Sensors Selectable
Allows selection of suit sensor settings in VORE tab on Character Setup. Work credited to https://github.com/PolarisSS13/Polaris/pull/4354 Adjustments made as needed to account for outdated code as well as making use of preferences_vr at last.
2019-08-05 17:49:49 -04:00
TheFurryFeline
ca01048bab Edible Collars
Allows those with Trash Can trait to nom on someone's collar. Also adds in a custom flavour message.
2019-07-10 13:43:29 -04:00
Heroman
b17718ea6c Implements selection of whitelisted species 2019-04-28 17:45:44 +10:00
Heroman3003
1290db61f8 Initial commit 2019-04-26 11:19:53 +10:00
Heroman3003
82ed5a8fe1 Made gurgle bones digestible and trash-edible 2019-04-02 08:42:07 +10:00
Heroman3003
c1d356fe8b Added a remains option to digesty vore 2019-04-01 12:28:02 +10:00
Heroman
86f0cb2919 Added ability to toggle and configure contamination and item digestion 2019-03-19 14:46:07 +10:00
Sebbe9123
f982ffa53c changes eggtypes to not mess with mob eggtypes. 2019-02-25 11:59:24 +01:00
Verkister
4c5cc9881a Adds blacklist for item ingestion (borg and trashcanfolk)
-Certain items previously blacklisted for digestion can still be eaten. (pAI, posibrain, AIcard, handtele beacon)
-Implemented for borg sleepers and trash eaters to prevent ABOOSE
2018-12-21 12:19:23 +02:00
Verkister
f0cd597b49 Some trash eater tweaks and additions.
-Adds a bunch of new low exploitability stuff to the garbo snack menu for suggested scene/fun shenanigans. (small non-storage gear (hat/mask/glasses/gloves/shoes), PDA, headset, organs, more toys, bones, broken emags, busted circuitry, lighters, bottles, lifecrystal cases)
-The PDAs give a warning and a delay time if owned, and come with an additional confirmation popup if they also contain an ID.

-Also fixed a bug that would cause "partially-digested" PDAs to forget the existence their IDs and thus make them unrecoverable until the PDA is deleted. (introduced by the gradual gurgles update)
2018-11-11 13:47:05 +02:00
Kates
820a4fbb29 Update global_lists_vr.dm 2018-10-06 12:55:52 +02:00
Kates
7995b54e29 Update global_lists_vr.dm 2018-10-06 12:54:10 +02:00
Kates
9b91fff7fc Update global_lists_vr.dm 2018-10-06 10:35:15 +02:00
lbnesquik
986dc248b0 Adds nevrean eggs. 2018-10-06 10:06:28 +02:00
Arokha Sieyes
31c7725066 Fix prototype trait showing up 2018-05-26 11:52:53 -04:00
Verkister
6821d3fcae small fixes etc.
-Renamed the legacy flavor list from "all" to "generic"
-Added a few new/mode specific flavors.
-Rearranged the flavor lists into alphabetical order.
-Fixed a typo.
-Applied some suggested tweaks.
-Fixed oversight of the prey drop contamination not being updated for this.
-Fixed belly transfers not removing transfered items from source belly items_preserved list while at it.
2018-05-04 14:48:51 +03:00
Verkister
7b0bdccade Adds selectable sets of contamination flavors for bellies.
-Divides item contamination flavors into categories to match better with the "belly" types.
-The selection menu shows up when itemweak mode is selected.
-The selection should save for each belly along with other prefs.
-The flavors have been cropped into following categories:
->All, contains the whole list as before apart from possible specific ones. Is the designated default option.
->Acrid, contains flavors implying regular nasty digestion.
->Dirty, contains flavors related to visual contamination.
->Musky, contains suggestively sloppy flavors without excess filth.
->Smelly, contains more airborne flavors without visual slop or crud.
->Wet, contains flavors of more neutral-ish soakage.
2018-05-01 13:34:42 +03:00
Arokha Sieyes
2cba96cf4c Switch to defines for custom species stuff 2018-04-19 19:34:10 -04:00
Arokha Sieyes
1a349f77dd Cleans up custom species icon base code
Fixes #3478
2018-04-19 17:46:51 -04:00
Verkister
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
Arokha Sieyes
449dcbb0b7 Refactor Digestion 2018-01-10 02:06:13 -05:00
killer653
315711b314 Pol sync part 2 2017-10-27 15:30:51 -04:00
Verkister
3b5da0f1fa Adds toggleable hunger growls to vore panel.
-Disabled by default.
-One tile range as with the other bellynoises.
-10% chance to manifest when "extremely hungry", same but a little louder when "starving".
2017-10-11 22:07:24 +03:00
killer653
a2f346df0f Makes wings their own seperate entity on char setup 2017-08-10 07:12:22 -04:00
killer653
34f2921ea6 Makes a fluff item indigestable.
It's made with the fibers of some indigestable animal.
Or something. I dunno.
It could be magic for all I know.
2017-07-30 15:30:41 -04:00
Arokha Sieyes
4d8b465cd9 Basically initial working traits 2017-05-29 05:08:25 -04:00
Cameron653
ad0a76db01 Fixes indent 2017-04-21 14:00:00 -04:00
killer653
7379e0143e More TF fixes and cleanup 2017-04-19 17:05:42 -04:00
Arokha Sieyes
9e90a293ec VANTAG Hud stuff 2017-04-03 19:35:09 -04:00
Arokha Sieyes
a6ed469aca Finishing touches
Make mind records get removed when you cryo.
Added resleeving manual.
Commit virgo-7 because mapmerge constantly says it has changes. BeyondCompare says there aren't any. Probably some formatting change but it'll probably do it for everyone until I do it.
Move where backup implants are (put them in resleeving room)
Only Posibrains are indigestible. MMIs are. Squishy brainmeat!
Unrelated icon change to station announcements by admins.
2017-02-19 20:46:55 -05:00
Arokha Sieyes
d915ba6249 Sounds add for #205
A few more choices for those that prefer these. Basically the backpack-cloth-rustle noise, and a choice for no sound. Useful for those that have "taur back" or whatever bellies.
2017-02-08 13:17:35 -05:00
Arokha Sieyes
723e835801 Removed comments 2016-10-20 16:41:15 -04:00