Commit Graph

1414 Commits

Author SHA1 Message Date
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
Spades
0f2a17b3bc Fixes error, also slightly alphabetizes a file
custom_boxes_vr.dm
2018-11-09 20:16:30 -05:00
Spades
129a289052 Updates permits, adds Ace's pistol
- Fixed some permit stuff.
- Removed expired permits and associated items.
- Added Ace's pistol plus a spare mag.
- Locked items to brig access, covering warden, HoS, and Captain, but
not roles like HoP. I think.
2018-11-09 20:06:01 -05:00
Unknown
97c5771625 8 Shots Phaser, 4 shots holdout
- Also halves power usage for stun options on both the martin and the holdout
2018-11-05 19:12:45 -05:00
Arokha Sieyes
d50e2d9deb Edit mapped in HoS armor
It was edited on the map to have pretty incredible armor values, better than SWAT armor, even. Things like this shouldn't be edited in the dmm files. Hard to have oversight on things like that.
Moved the armor values to the code and out of the map, and adjusted them to be more reasonable after discussing with other admins.
2018-11-04 22:51:32 -05:00
Unknown
b974aa763a Renames normal to lethal on phasers 2018-11-02 15:59:13 -04:00
Unknown
6d928db859 Sprite swap for low power/stun
Red = High Power, Blue = Low Power, Yellow = Stun
2018-11-02 12:54:51 -04:00
Unknown
f67de7bc84 Weapons Balance and Sprites
- AEG now has 10 lethal shots
- Phase weapons bonus damage to animals removed
- Phase weapons now do real damage
- Charge cost bug fixed with phaser
- Overhauled sprite for holdout phaser
- Added Phaser Carbine, right now just a reskinned phaser
- One phaser carbine added to the Pathfinder's locker
2018-11-02 12:31:22 -04:00
Keekenox
1c25ffe12a Switched off unit test 11 because the build had to go out now and there was no time to fix it properly.
Wingy bois
2018-10-27 16:07:06 -04:00
Spades
dbec51db41 Merge pull request #4433 from Verkister/infixfix
Fixes examine for mobs that relied on atom proc specific features.
2018-10-20 08:58:05 -04:00
Spades
c9a5499a70 Merge pull request #4426 from Heroman3003/awoo-refactor
Replaces awoo with wolfgirl
2018-10-20 08:56:14 -04:00
Verkister
81fa928d4c Fixes examine for mobs that relied on atom proc features.
-Mainly affected borgs and pAIs. Maybe others idk.
2018-10-20 14:47:39 +03:00
Heroman3003
1ea42e4558 Refactors Awoos into Wolfgirls 2018-10-20 12:35:32 +10:00
Aronai Sieyes
8c764d487d Merge pull request #4340 from Novacat/nova-pathfinder
Exploration Fixes for 09-27-2018 Sync
2018-10-16 12:27:52 -04:00
Aronai Sieyes
1ece0b15a8 Merge pull request #4299 from ArgobargSoup/master
Bug abdomens
2018-10-11 21:42:54 -04:00
Screemonster
f98433b238 Makes slime cores indigestible 2018-10-10 12:51:58 +01:00
Unknown
50f0102186 Exploration Fixes for 09-27-2018 Sync
- Removes redundant station_vr file
- Reverts exploration suit cyclers to polaris cyclers
- Adds a pilot suit cycler to exploration
- Applies a functioning fix for holdout phasers
- Slightly buffs up the holdout phaser to be 50% of expedition phaser, to keep size-effectiveness scaling
- Removes head access from expedition shuttle control console
- Removes Pilot Blue/Old Exploration from polaris cyclers (they are still WIP on polaris end)
2018-10-09 13:23:14 -04:00
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
ArgobargSoup
5769cf73af Add buggo abdomens to tail list 2018-10-01 20:03:31 -07: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