cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-02 20:30:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,748 Commits 8 Branches 26 Tags
ed525cef2ca92d666d57ecdfd662113dd7fe85ec
Commit Graph

1146 Commits

Author SHA1 Message Date
Unknown
b237af9eab Rebalances VR Jumpsuits 
Virgo-specific jumpsuits (KHI and Star Trek) available in loadout are not supposed to have protection bonuses over the non-virgo ones.
 2018-10-08 17:41:07 -04:00
Spades
ccc1fa30ec Merge pull request #4313 from Novacat/nova-pathfinder 
Expedition Balance Tweaks
 2018-10-07 18:00:00 -04:00
Spades
8a657ce011 Merge pull request #4177 from Verkister/slowitemgurgles 
Makes item digestion gradual and belly damage based.
 2018-10-07 17:58:02 -04:00
Spades
8c2e0928fa Merge pull request #4130 from KasparoVy/fix-tesh-hide-again 
Fix Teshari Hiding Again
 2018-10-06 08:25:35 -04:00
Unknown
5d7a974679 Reverts Phaser Nerf 2018-10-05 16:56:16 -04:00
Unknown
af4afc3e32 Fixes bug with holdout phasers 2018-10-05 02:04:30 -04:00
Unknown
e20f05e188 Expedition Balance Tweaks 
- Removes hostile mobs from V4 Beach
- Adds Giant Snakes and Giant spiders in generic V4 Cave spawners
- Reduced respawn rates to cut down on incidences of 'deathclaw swarms'
- Giant Snakes and Deathclaws have reduced overall spawn rates, Giant Spiders and Frogs will generally be more common.
- Replaced Ion hivebots with Ion Spiders
- Reduced expedition phaser to 5 shots
 2018-10-04 21:55:27 -04:00
Spades
3f1a5de182 Merge pull request #4240 from Mewchild/MC-Medals 
Medal Whitelists from abduction event
 2018-10-01 19:22:20 -04:00
Verkister
5a49904f57 Merge branch 'master' into slowitemgurgles 2018-10-01 16:32:53 +03:00
Spades
d68b641d6b Merge pull request #4287 from Verkister/smallvoreqol 
Small qol tweaks for contamination and sleeperguts.
 2018-10-01 09:29:08 -04:00
Spades
718a96db61 Merge branch 'master' into MC-Medals 2018-10-01 09:23:19 -04:00
Spades
c6acdd5fe9 Merge pull request #4234 from Novacat/nova-heterochromia 
Tactical Kittens
 2018-10-01 08:49:19 -04:00
Verkister
519dff6fb9 Disabled contamination on itemweak hold mode. 
-Still applies on food tho.
 2018-10-01 09:11:28 +03:00
Unknown
dbb362820f Changes to use spawner grenade 2018-09-27 18:40:12 -04:00
Arokha Sieyes
b099ac6e4c Merge branch 'master' of https://github.com/VOREStation/Polaris into sync-09272018 
# Conflicts:
#	code/__defines/holomap.dm
#	code/__defines/mobs.dm
#	code/_helpers/icons.dm
#	code/_helpers/unsorted.dm
#	code/_onclick/hud/hud.dm
#	code/_onclick/item_attack.dm
#	code/controllers/Processes/supply.dm
#	code/controllers/subsystems/planets.dm
#	code/datums/supplypacks/munitions.dm
#	code/datums/supplypacks/science.dm
#	code/datums/supplypacks/security.dm
#	code/datums/supplypacks/supply.dm
#	code/game/area/Space Station 13 areas.dm
#	code/game/atoms_movable.dm
#	code/game/machinery/autolathe.dm
#	code/game/machinery/doors/door.dm
#	code/game/machinery/jukebox.dm
#	code/game/machinery/recharger.dm
#	code/game/machinery/vending.dm
#	code/game/mecha/equipment/tools/medical_tools.dm
#	code/game/mecha/equipment/weapons/weapons.dm
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/game/objects/items/devices/megaphone.dm
#	code/game/objects/items/poi_items.dm
#	code/game/objects/items/weapons/implants/implantlanguage.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/items/weapons/tools/weldingtool.dm
#	code/game/objects/structures/flora/trees.dm
#	code/game/objects/structures/plasticflaps.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/simulated/wall_attacks.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/assembly/infrared.dm
#	code/modules/client/client procs.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/client/preferences.dm
#	code/modules/clothing/suits/miscellaneous.dm
#	code/modules/holomap/holomap_datum.dm
#	code/modules/holomap/station_holomap.dm
#	code/modules/integrated_electronics/core/printer.dm
#	code/modules/mining/machine_processing.dm
#	code/modules/mob/living/carbon/human/human_defense.dm
#	code/modules/mob/living/carbon/human/species/virtual_reality/avatar.dm
#	code/modules/mob/living/death.dm
#	code/modules/mob/living/silicon/ai/ai.dm
#	code/modules/mob/living/silicon/pai/pai.dm
#	code/modules/mob/living/silicon/robot/robot.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/mob_movement.dm
#	code/modules/organs/organ_external.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/subtypes/standard.dm
#	code/modules/planet/weather.dm
#	code/modules/power/cable.dm
#	code/modules/power/fusion/core/core_control.dm
#	code/modules/power/fusion/fuel_assembly/fuel_control.dm
#	code/modules/power/fusion/gyrotron/gyrotron_control.dm
#	code/modules/projectiles/gun.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
#	config/names/first_name_skrell.txt
#	config/names/last_name_skrell.txt
#	icons/mob/head.dmi
#	icons/mob/robots.dmi
#	icons/mob/species/tajaran/helmet.dmi
#	icons/obj/ammo.dmi
#	icons/obj/gun.dmi
#	icons/obj/mining.dmi
#	icons/obj/projectiles.dmi
#	icons/obj/rig_modules.dmi
#	icons/obj/surgery.dmi
#	icons/turf/walls.dmi
#	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-8.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1A.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1B.dmm
#	maps/submaps/surface_submaps/mountains/backup/IceCave1C.dmm
#	maps/submaps/surface_submaps/mountains/crashedcontainmentshuttle.dmm
#	maps/submaps/surface_submaps/mountains/deadspy.dmm
#	maps/submaps/surface_submaps/mountains/mountains_areas.dm
#	maps/submaps/surface_submaps/plains/Thiefc.dmm
#	maps/~map_system/maps.dm
#	vorestation.dme
 2018-09-27 18:01:09 -04:00
Mewchild
f61e26d197 Fixes error. Shuts Travis up. 2018-09-12 19:09:51 -05:00
Mewchild
135470adc5 Medal Whitelists from abduction event 2018-09-12 18:00:21 -05:00
Verkister
74ec886aae Tweaks to fix GC issues 2018-09-10 12:44:50 +03:00
Verkister
ccf2641385 makes did_an_item only do the skip if an item was done 2018-09-10 11:35:52 +03:00
Spades
35f3e81ca3 Merge pull request #3940 from Verkister/buttmount 
Reworks taur riding system.
 2018-09-01 17:25:23 -04:00
Spades
eee6cc7337 Merge pull request #4107 from Eearslya/patch-1 
Fix minor typo in vore attempt warning
 2018-08-20 08:01:09 -04:00
Verkister
3c7bf97205 Some tweaks and such. 2018-08-18 15:23:55 +03:00
Verkister
da36d2f268 Makes item digestion gradual and belly damage based. 
-No more instantly disappearing everything.
-The initial "health" of the items is based on their w_class. (but the w_class is not the health, so you can't just go gurgling things lighter)
-Default damage (2+2) will take 3 cycles to chew through a normal sized (w_class 3) item. Basically one cycle per w_class.
-Lower damages will chew through shit slower, and higher damages will do it faster. Max damage (6+6) will get through a normal sized item with one cycle.
-They will all require two hits however, same way as how mobs take the deadly blow before final meltdown.
-Also the nutrition gains scale according to the damages now.
 2018-08-18 14:09:08 +03:00
Spades
6919cca96d Merge pull request #4070 from Knightfall5/master 
Ashley's fluff item
 2018-08-15 18:36:28 -04:00
Spades
84a3d824de Merge pull request #3885 from Cameron653/ALRAUNE_STUFF 
Alraune abilities and minor code changes
 2018-08-13 07:50:23 -04:00
Spades
ed06781743 Merge pull request #3759 from Verkister/belletweakins 
Dogborg equipment/belly tweaks and fixes. (Ready)
 2018-08-13 07:49:55 -04:00
KasparoVy
073750516f VORE Edit to Fix Hiding with Taur Buckling 
Was broken when taur riding was enabled and required some tweaks.
Took the chance to add a few extra features & fluff up hiding a bit.
If you're grabbed, grab someone, buckle yourself or are buckled by someone else you now become un-hidden. You cannot hide yourself while grabbed or buckled.
There are a few fluff messages for these circumstances but otherwise hiding behaves exactly as it used to.
 2018-08-04 21:13:05 -04:00
Eearslya Sleiarion
572f7e1623 Fix minor typo in vore attempt warning 2018-07-30 00:30:33 -07:00
Cameron653
5fc76df183 Merge branch 'master' into ALRAUNE_STUFF 2018-07-23 20:08:30 -04:00
Knightfall5
aa5a02c51b Update custom_items_vr.dm 2018-07-23 02:16:30 -04:00
Aronai Sieyes
878b195dbb Merge pull request #4030 from VOREStation/upstream-merge-5402 
[MIRROR] Language and Larynx Additions
 2018-07-21 14:43:47 -04:00
Arokha Sieyes
46f7b22838 Fix virgo implant stuff 2018-07-21 14:21:17 -04:00
Spades
98352eb5bb Merge pull request #4048 from deathride58/dispvoreprefs 
Hides mechanical vore preferences for mimics
 2018-07-17 05:26:44 -04:00
deathride58
1069e561bc Adds a var that determines if voreprefs can be shown on examine 2018-07-16 22:28:27 -04:00
Verkister
d60242d2cb Fixes itemweak gurgles ignoring food reagents. 
-Fixes food/drinks/organs/etc. being utterly worthless when gurgled with itemfriendly mode.
 2018-07-09 13:30:32 +03:00
Unknown
b80b736e16 Fixes Imperial Laser too 2018-07-03 10:26:57 -04:00
Verkister
82dd96a141 Adds a bunch of new sprite accessories. 
-Mainly ports from old Citadel assets.
-Markings: Otter face, Otter nose, Deer face, Cloven hooves, Shepherd snout, Shepherd back.
-Head accessories: Small bear ears, Deer ears, Small antlers, Deer ears with small antlers, Caprine horns, Drake frills.
-Also fixed a Polaris blooper from our tajaran sprite file. (The legs were facing in different directions in side views.)
 2018-06-29 15:32:30 +03:00
Verkister
b0359468de Relocates the part that enables taur riding. 
-Moved to get_tail_image() taur check, the same spot that applies the offset and such.
-Enables the riding and applies the verb if the taur type is mountable and hasn't been set up for riding before.
 2018-06-29 13:07:58 +03:00
Verkister
2c84ef50b8 Reworks taur riding system. 
- Made the buckling a verb for the mountable person to use instead of free drag action by anyone.
- This however makes it require the mount's consent and input to let people hop right on.
- The verb has all the sanity checks and such without overriding other actions on the drawback of being available to the mount only.
- Made the riding datum and verb to be applied on on spawn to taurs only instead of everyone.
- Made the riding allow a 20% size difference leeway between rider and mount.
- And made riders bigger or heavier than the mount to cause slowdown while at it.
- Changed side oriented views to layer rider above the mount.
 2018-06-27 18:29:28 +03:00
Mewchild
3164a98831 Shut up travis. Commenting Error 2018-06-26 02:43:43 -05:00
Mewchild
26753c4330 Seb still has a permit. Misread. 2018-06-26 00:45:03 -05:00
Mewchild
f4ce27804c Comments out a bunch of expired permits and associated weapons 2018-06-25 23:52:25 -05:00
Cameron653
7028511d64 Prevents sanitization of custom icon base. Removes a custom fluff item since Alraune are now in. 2018-06-17 20:00:10 -04:00
Leshana
c377a4a6c0 Use rust-g to optimize saving of vore persistent settings if available. 2018-06-17 19:11:17 -04:00
Cameron653
8219ababc5 Makes fruit growing code on the Alraune organ based instead of implant based. Organizes the list to make it in alphabetical order. 2018-06-17 15:04:58 -04:00
Cameron653
da4773ebdb Makes Alraune variable on only /human. Changes a few 0's to FALSE and a few 1's to TRUE. 2018-06-16 01:32:55 -04:00
Cameron653
864c4ca106 Gives Alraune the ability to select body shape. Gives Alraune the ability to select a fruit/vegetable to grow via an implant. Some code cleanup relating to custom body shape selection. Makes species name their defines instead of "name" Fixes a typo in custom_items where the reagent generator being selected was roiz instead of pumila. 2018-06-15 16:41:59 -04:00
Aronai Sieyes
f3ab493437 Merge pull request #3863 from Verkister/transflavor 
Makes belly transfers update contamination.
 2018-06-15 09:02:56 -04:00
Aronai Sieyes
088b4d27af Merge pull request #3859 from Mewchild/MC-Fluff 
Vietsi Fluff Items
 2018-06-15 09:00:26 -04:00
Aronai Sieyes
9522612c98 Merge pull request #3834 from granodd/sprites 
More Ear Sprites
 2018-06-15 08:57:41 -04:00