Commit Graph

15351 Commits

Author SHA1 Message Date
Unknown
2833407b01 Custom PDAs for all roles
Also fixes the issue of explorers getting cargo cartridges 4noraisin.
2018-10-26 18:04:16 -04:00
Unknown
4ffe580832 More Expedition Tweaks
The goal of this PR is mainly to move our exploration away from the Polaris roots and refine the various expedition roles for Virgo, and a lot of cosmetic tweaks.

- Renames Search and Rescue to Field Medic
- Cosmetic changes for ID Card graphics for expedition crew and Field Medic PDA
- Moves the holdout phasers from the expedition weapons locker to the job equipment lockers of the roles intended to use them (Pilots/FMs)
- Removes Psychologist, Morgue, and Explorer access from Field Medics
- Removes Pilot access from Explorers
- Adds Pilot access to Field Medics
- Restricts the expedition shuttle to Pilot access only
- Adds a medic version of the explorer suit for Field Medics, identical stats, but has a medic arm-band attached.
Note: Might be replaced with a reskinned explorer suit down the road.
- Adds liquidfood rations for SARs and Pilots
- Adds winter boots for Pilots
2018-10-23 02:48:46 -04:00
Aronai Sieyes
86cf5cfca7 Merge pull request #4431 from VOREStation/upstream-merge-5675
[MIRROR] Ports Vote to SMC
2018-10-20 17:58:12 -04:00
Arokha Sieyes
30a8a3ce31 VS edit merges 2018-10-20 17:37:08 -04:00
Spades
b28213c906 Merge pull request #4356 from Novacat/nova-ert
ERT Equipment Redo
2018-10-20 17:34:41 -04:00
Spades
c9a5499a70 Merge pull request #4426 from Heroman3003/awoo-refactor
Replaces awoo with wolfgirl
2018-10-20 08:56:14 -04:00
Neerti
3a9c13b937 Ports Vote to SMC 2018-10-20 01:53:13 -04:00
Heroman3003
1ea42e4558 Refactors Awoos into Wolfgirls 2018-10-20 12:35:32 +10:00
Aronai Sieyes
92209a64f7 Merge pull request #4408 from VOREStation/upstream-merge-5679
[MIRROR] Makes RCDs Clean Again
2018-10-16 14:50:40 -04:00
Aronai Sieyes
07377724e2 VS Changes to unsimulated.dm 2018-10-16 14:42:54 -04:00
Neerti
62ac0986ca Makes RCDs Clean Again 2018-10-16 14:17:44 -04:00
Anewbe
9007553a6c Merge pull request #5678 from Neerti/anchored_fix
Fixes two anchored-related bugs, taped papers and the medbay phone.
2018-10-16 14:05:10 -04: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
c7d9ea6844 Merge pull request #4387 from deathride58/dontforgettosanitizeuserinput
Fixes apostrophes in names causing javascript errors in the character directory
2018-10-16 12:27:05 -04:00
Aronai Sieyes
ce0450e218 Merge pull request #4399 from VOREStation/upstream-merge-5666
[MIRROR] Magazines improvements
2018-10-16 12:19:06 -04:00
Aronai Sieyes
78bd63d568 Merge pull request #4392 from VOREStation/upstream-merge-5626
[MIRROR] Move almost everything food related into the kitchen module.
2018-10-16 12:18:05 -04:00
Kates
26089f3a72 Magazines improvements 2018-10-15 15:52:56 -04:00
Anewbe
935fb1ed06 Merge pull request #5669 from VOREStation/pol-binocs
Stop usage of multiple vision modifiers
2018-10-15 15:51:43 -04:00
Anewbe
12e34de332 Move almost everything food related into the kitchen module. 2018-10-15 15:47:14 -04:00
deathride58
cf9613ebdd fixes apostrophes making it impossible to view someone's info in the character directory 2018-10-13 23:38:19 -04:00
Arokha Sieyes
e6bf904252 VS edit 2018-10-13 19:20:13 -04:00
Anewbe
51a493427d Graves (#5622)
* Adds support for closets storing closets, and graves

* More Grave Things
2018-10-13 17:58:48 -04:00
Atermonera
eb1bbac042 Merge pull request #5656 from lbnesquik/Kates-AshTray-Fix
Fix plastic ashtrays only holding one butt. Now they hold 4 butts.
2018-10-13 17:17:27 -04:00
Aronai Sieyes
f9159296f9 Merge pull request #4358 from VOREStation/aro-traitstats
Log trait and species usage for metrics
2018-10-12 01:45:54 -04:00
Arokha Sieyes
ea0d6fc5a1 Log trait and species usage for metrics
Just some stuff for use in building statistics about characters
2018-10-11 20:49:33 -04:00
Unknown
3f4039d027 ERT Equipment Redo
- Removes Light Machine Guns, Grenade Launchers, Matebas, and all 7mm battle and sniper rifles
- Adds 5mm Assault Rifles, .45 revolvers
- Reduces the number of powerful weapon types (energy sniper, combat shotgun)
- Replaces the submachinegun with a weaker one, reduces the number, adds extra magazines
- Adds a lot of things to the medical and engineering ERT sections
- Replaces weapon power cells with self-charging weapon power cells
- Adds a few recharging high capacity power cells (Reskin of slime power cell), and a bunch of hyper capacity power cells
- Adds some miscellaneous devices (Translocator, shelter capsule, binoculars) to the hardsuit section
- Replaces the hardsuit section's grenade launchers with two sprint modules and a micro pharmacy
- Adds LMGs to Zulu's armory
2018-10-10 19:02:48 -04:00
Aronai Sieyes
ed525cef2c Merge pull request #4355 from VOREStation/upstream-merge-5650
[MIRROR] Fix incorrect HUD/screen/hologram
2018-10-10 17:40:57 -04:00
Aronai Sieyes
52a993541a Merge pull request #4348 from VOREStation/upstream-merge-5641
[MIRROR] Fixes several typos with oxygen_pump.dm.
2018-10-10 17:40:09 -04:00
Anewbe
dc781b806d Merge pull request #5650 from lbnesquik/Kates-Why-Do-I-Have-To-Fix-This
Fix incorrect HUD/screen/hologram
2018-10-10 16:54:53 -04:00
Anewbe
e362c66f51 Merge pull request #5641 from avabee/patch-3
Fixes several typos with oxygen_pump.dm.
2018-10-09 16:36:23 -04:00
Atermonera
3943ef3dba Merge pull request #5640 from lbnesquik/Kates-Laptop-Fix
Fixes laptop blocking grown adults.
2018-10-09 13:52:53 -04: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
Spades
ea056f6b88 Merge pull request #4316 from VOREStation/upstream-merge-5628
[MIRROR] Minor issues fix.
2018-10-08 20:29:08 -04:00
Arokha Sieyes
92eff67417 Alter gateway access on 2 jobs
Add gateway access to pathfinder, exploring is their job
Removed from HoP (who can readd it to themselves in emergencies if they need it, otherwise during 'normal times' there's no reason they'd need it)

Justifcations for leaving it with other jobs:
HoS - gateway area is classified as a high-security area, and is an area on the station that has an attack surface from unknown things, so it makes sense they have access to defend it. HoS abusing the access for 'not defense of station' reasons, such as 'I'm going to lead my own expedition, fuck explorers', is ahelpable.
CD - literally has all station access, doesn't even have a specific list
RD - generally has a superset of all pathfinder access, and the physical gateway structure is their machine, pretty sure
2018-10-08 15:33:48 -04:00
Spades
f379ea2df4 Update weldingtool.dm 2018-10-07 17:55:35 -04:00
Spades
b1b565c352 Update weldingtool.dm 2018-10-07 17:55:01 -04:00
Spades
91a67b6b37 Update weldingtool.dm 2018-10-07 17:54:35 -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
Atermonera
fafd85957f Minor issues fix. 2018-10-06 01:17:19 -04:00
Anewbe
9498d6f7db Merge pull request #5619 from SpadesNeil/toy-sounds
Text for handheld plushies when poked
2018-10-02 14:20:47 -04:00
Spades
4a00acc6d4 Merge pull request #4291 from VOREStation/upstream-merge-5613
[MIRROR] Custom RIG Framework
2018-10-01 09:30:24 -04:00
Spades
b8f240f199 Merge pull request #4282 from VOREStation/sync-09272018
Polaris Sync 09-27-2018
2018-10-01 08:43:03 -04:00
Mechoid
78b173b50a Custom RIG Framework (#5613)
* Framework for Custom RIG sprites.

* Fixfix
2018-09-30 17:50:39 -04:00
Spades
9e86743d00 Merge pull request #4163 from Mewchild/MC-Syringes
Reverts Syringe infections
2018-09-27 19:38:08 -04:00
Spades
c0b0621503 Merge pull request #4166 from deathride58/characterdirectory
Adds the character directory
2018-09-27 19:35:53 -04:00
Arokha Sieyes
cb43ac69ea Satisfy stupid indentation.awk, which is just wrong. 2018-09-27 18:22:55 -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
Mechoid
b7231dc8cc Don't spawn things in Null please. 2018-09-23 00:24:34 -07:00
Wickedtemp
21878523b1 Adds the Biopsy Scanner to the Surgery Kit (#5589)
* Adds the Biopsy Scanner to the Surgery Kit

Since it's actually used in a surgical operation, it should proooobably be in the kit. Iunno if the kit is really used here aside from antag shuttles, but they might as well have it.

* Added a missing comma

Missed a comma, might be what's causing issues. Iunno. It worked flawlessly in dream-maker.
2018-09-22 18:53:36 -05:00
Atermonera
46f151745f Merge pull request #5581 from Anewbe/mining_toys
Technically adds the Ore Redemption Machine
2018-09-22 13:38:10 -07:00