976aec2f71
Sorts out this PR
2019-03-26 21:43:56 -04:00
02ef9c29ed
Typo fix
2019-03-01 15:05:47 -05:00
eaf41744e1
Typo fix
2019-03-01 15:05:18 -05:00
997fe12dc7
Minor Change
...
Phi Ahkeen -> Phi Viesti
2019-03-01 14:16:47 -05:00
e167b25f4c
Add Resh's HOS Coat
...
So, I saw a thing on forums here, https://forum.vore-station.net/viewtopic.php?f=26&t=1519 and thought, 'hey, I can fix that.' So, here we are. :> Also adjusts Phi's last name - in the comment for the listing - as I've seen it in-game, back to Viesti.
2019-03-01 14:00:58 -05:00
6e2172a5ae
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
a4317b1910
[5654] Makes this PR Compile
...
This one made me cry.
2019-02-23 12:30:16 -05:00
b7c90be1b0
Extended the expiration time
2019-02-23 11:49:19 -05:00
0171fa3faa
Cleanup of Tempest saddlebag code
2019-02-23 06:37:57 +10:00
de18c9321f
Fixes Spirit for AI Overhaul
...
- Also fixes an error with Phi's ring
2019-02-20 12:26:58 -05:00
b1c142eff0
Makes mlembulance slightly less quiet
2019-02-20 07:37:43 +10:00
7d3f5b8627
Vakashi's Permit
...
Adds Vakashi's permit as per https://forum.vore-station.net/viewtopic.php?f=27&t=1447
2019-02-08 19:46:39 -05:00
239a222a7f
Improved Tempest ambulance sprites to better represent ambulance.
2019-02-05 06:25:31 +10:00
f88452d2c9
Tempest's saddlebags now double as ambulance siren
2019-02-04 17:58:16 +10:00
f05675e269
Resolves compile errors
2019-02-02 04:33:13 -06:00
fcc1bf5b06
Adds Koyo's Fluff Item Box
...
Adds Koyo's Fluff Item Box, approved at https://forum.vore-station.net/viewtopic.php?f=27&t=1502
2019-02-01 21:39:18 -06:00
c6c7d98a2d
Merge branch 'master' into upstream-merge-5735
2019-01-14 11:20:55 -05:00
9dd973221d
Resolves compile errors with the exception of map errors.
2019-01-12 21:09:29 -05:00
7477c696dc
Updates Fluff Item
2018-12-14 13:21:49 -06:00
10138a49d3
makes the pompom uncontaminatable
2018-12-10 02:49:38 +00:00
4a27ffb35a
Merge pull request #4515 from pontifexminimus2/dragor-HEYLOOKTHISMORONFORGOTHOWTODOSOURCETREEIBLAMEYOUARONAIFORMAKINGMEJUMPTHROUGHTHESEHOOPS
...
Renames guns with proper names for a more generic name and edits their desc.
2018-12-04 20:22:02 -05:00
822a9eff0e
Merge pull request #4500 from lm40/master
...
Adds Kenzie's hypospray
2018-12-01 12:29:53 -05:00
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
a542e23e4e
dragor no
2018-11-25 20:32:40 -05:00
19efdc84dc
Improved Holdout Description
2018-11-25 17:33:04 -05:00
5913203c0f
Due to request of Ace.
2018-11-25 17:22:35 +01:00
4c46defd4f
Renaming Protector too.
2018-11-25 16:50:24 +01:00
784e48b895
Holy shit I hate this.
2018-11-25 16:45:37 +01:00
d11c036733
fixed icon
2018-11-12 20:02:40 -05:00
79f92e4f20
added kenzie's hypospray
2018-11-12 19:33:34 -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
Unknown