0468b18e7a
Merge pull request #4484 from VOREStation/permits-updates
...
Updates permits, adds Ace's pistol
2018-11-26 09:03:38 -05:00
c8b50f7a67
Merge pull request #4475 from Novacat/nova-weapons
...
Weapons Tweaks and Sprites
2018-11-26 09:02:55 -05:00
19efdc84dc
Improved Holdout Description
2018-11-25 17:33:04 -05:00
0f2a17b3bc
Fixes error, also slightly alphabetizes a file
...
custom_boxes_vr.dm
2018-11-09 20:16:30 -05:00
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
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
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
b974aa763a
Renames normal to lethal on phasers
2018-11-02 15:59:13 -04:00
6d928db859
Sprite swap for low power/stun
...
Red = High Power, Blue = Low Power, Yellow = Stun
2018-11-02 12:54:51 -04:00
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
c9a5499a70
Merge pull request #4426 from Heroman3003/awoo-refactor
...
Replaces awoo with wolfgirl
2018-10-20 08:56:14 -04:00
1ea42e4558
Refactors Awoos into Wolfgirls
2018-10-20 12:35:32 +10:00
8c764d487d
Merge pull request #4340 from Novacat/nova-pathfinder
...
Exploration Fixes for 09-27-2018 Sync
2018-10-16 12:27:52 -04:00
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
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
5d7a974679
Reverts Phaser Nerf
2018-10-05 16:56:16 -04:00
af4afc3e32
Fixes bug with holdout phasers
2018-10-05 02:04:30 -04:00
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
718a96db61
Merge branch 'master' into MC-Medals
2018-10-01 09:23:19 -04:00
c6acdd5fe9
Merge pull request #4234 from Novacat/nova-heterochromia
...
Tactical Kittens
2018-10-01 08:49:19 -04:00
dbb362820f
Changes to use spawner grenade
2018-09-27 18:40:12 -04:00
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
f61e26d197
Fixes error. Shuts Travis up.
2018-09-12 19:09:51 -05:00
135470adc5
Medal Whitelists from abduction event
2018-09-12 18:00:21 -05:00
6919cca96d
Merge pull request #4070 from Knightfall5/master
...
Ashley's fluff item
2018-08-15 18:36:28 -04:00
5fc76df183
Merge branch 'master' into ALRAUNE_STUFF
2018-07-23 20:08:30 -04:00
aa5a02c51b
Update custom_items_vr.dm
2018-07-23 02:16:30 -04:00
46f7b22838
Fix virgo implant stuff
2018-07-21 14:21:17 -04:00
b80b736e16
Fixes Imperial Laser too
2018-07-03 10:26:57 -04:00
3164a98831
Shut up travis. Commenting Error
2018-06-26 02:43:43 -05:00
26753c4330
Seb still has a permit. Misread.
2018-06-26 00:45:03 -05:00
f4ce27804c
Comments out a bunch of expired permits and associated weapons
2018-06-25 23:52:25 -05:00
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
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
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
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
088b4d27af
Merge pull request #3859 from Mewchild/MC-Fluff
...
Vietsi Fluff Items
2018-06-15 09:00:26 -04:00
7960499bd2
Vietsi Fluff Items
2018-06-11 12:00:27 -05:00
44500587f9
Merge pull request #3846 from Nepoox/master
...
Adds Annie's pullover (Fluff Item)
2018-06-11 06:10:38 -04:00
884a4ec99c
Merge pull request #3820 from Novacat/nova-pathfinder
...
Pathfinder Fixes
2018-06-11 06:04:42 -04:00
8ff967eeec
Changed name and description
2018-06-09 23:19:57 +02:00
e1cbfac2bf
Fluff Item
2018-06-09 02:50:41 +02:00
f81760da5b
Pathfinder Fixes
...
- Adds missing icons for other species in the Explorer suit cycler
- Fixes slot issue with drop straps and metal necklaces
- Pathfinder's Office can now only be accessed by the Pathfinder
2018-06-02 10:54:17 -04:00
8111652e25
Update custom_items_vr.dm
2018-06-02 03:03:27 -07:00
994a81b6b6
Adds pumping sprite
2018-05-23 14:20:09 -04:00
2c1ad0076f
Requested Fixes
2018-05-22 12:49:41 -04:00
ca131caa10
New Explorer Gear
...
- Adds a new defensive exploration weapon intended for use by rear-line explorers, such as SARs and Pilots
- Ported Machete Sheath from Baystation, intended to be used with the machetes here
NOTE: I intended them to not be usable alongside holsters, but I am not sure how to go about this
- Explorer lockers will now come with a survival knife, machete, and machete sheath
2018-05-22 11:27:48 -04:00
86e413bf00
Merge pull request #3634 from VOREStation/aro-taur_suits_must_die
...
Removes taur suits
2018-05-08 19:09:29 -04:00
dc299bdd3b
Add files via upload
2018-05-07 20:24:32 -04:00
c4cbe31199
Removes taur suits
2018-05-04 22:16:17 -04:00
Spades