Novacat
26660c5f70
Merge pull request #4832 from VOREStation/upstream-merge-5985
...
[MIRROR] Subspace Jammer now blocks signalers, suit sensors, lasts longer
2019-03-28 21:59:48 -04:00
Novacat
e47a99824c
Update jammer.dm
2019-03-28 21:46:37 -04:00
Unknown
3aa0fdfda5
Removes conductive flags from VR stuff
2019-03-28 21:45:38 -04:00
Neerti
30b967e28a
Items are now assumed to be conductive, rather than the opposite
2019-03-28 21:45:38 -04:00
Novacat
956809d681
Merge branch 'master' into upstream-merge-5985
2019-03-28 21:32:18 -04:00
Unknown
32bab4ba00
...Part two
2019-03-28 19:08:04 -04:00
Unknown
58427861e8
Fixes compile error
2019-03-28 19:06:53 -04:00
Unknown
4df295de75
Conflict Resolution
2019-03-28 18:43:38 -04:00
Mechoid
023815e2d2
Flash rebalance.
2019-03-28 18:23:33 -04:00
Novacat
65cd059497
Merge pull request #4751 from VOREStation/upstream-merge-5869
...
[MIRROR] Adds the Zaddat Race + Modifies pressure damage calculations
2019-03-28 18:17:11 -04:00
Novacat
f797a8a715
Merge pull request #4728 from VOREStation/upstream-merge-5899
...
[MIRROR] Ghosts who antagHUD can't make communicator calls
2019-03-28 17:25:35 -04:00
elgeonmb
9d056decda
Adds the Zaddat Race + Modifies pressure damage calculations
2019-03-28 16:54:32 -04:00
Unknown
3e2d0bf9ea
Conflict Resolution Part Two
2019-03-28 15:09:40 -04:00
Atermonera
7403591727
Ghosts who antagHUD can't make communicator calls
2019-03-28 15:05:25 -04:00
Novacat
56752a1337
Merge branch 'master' into upstream-merge-5901
2019-03-28 14:37:02 -04:00
Novacat
aefedea4a3
Merge pull request #4694 from VOREStation/upstream-merge-5858
...
[MIRROR] Suit coolers don't overheat in vacuum
2019-03-27 18:58:47 -04:00
Novacat
dce3466f3b
Merge pull request #4684 from VOREStation/upstream-merge-5814
...
[MIRROR] [READY]Makes a bunch of processes subsystems instead
2019-03-27 17:46:31 -04:00
kevinz000
6415e4193f
[READY]Makes a bunch of processes subsystems instead
2019-03-27 16:03:51 -04:00
Neerti
fe0b7373b3
Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
2019-03-27 14:49:30 -04:00
Unknown
4e67e1b9ab
Conflict Resolution
2019-03-27 04:11:30 -04:00
Anewbe
09b01407e3
Adds Various Sounds, Looping Sound System
2019-03-27 03:55:21 -04:00
Neerti
585b688709
Adds Identification System, New Autoinjectors
2019-03-27 02:25:55 -04:00
Neerti
86174593bf
Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer
2019-03-26 23:58:26 -04:00
Atermonera
131636b1d2
Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding
2019-03-26 13:21:08 -04:00
Neerti
627cdecf66
Subspace Jammer now blocks signalers, suit sensors, lasts longer
2019-03-04 22:58:41 -05:00
Spades
6e2172a5ae
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
Poojawa
6f2548e47b
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream/upstream-merge-5735
2019-02-02 03:55:21 -06:00
Atermonera
439afee2ab
Unclogs powersink drains
2019-01-26 17:54:34 -05:00
Spades
30ab44613d
Merge pull request #4540 from VOREStation/upstream-merge-5714
...
[MIRROR] Borg, Gripper, and Integrated Circuit interaction update.
2019-01-21 11:42:38 -05:00
Anewbe
8e9e83fde0
Merge pull request #5858 from Atermonera/suitcooler_pressurization
...
Suit coolers don't overheat in vacuum
2019-01-18 09:15:04 -05:00
Spades
c6c7d98a2d
Merge branch 'master' into upstream-merge-5735
2019-01-14 11:20:55 -05:00
Unknown
05b876aa3a
Adds an Admin Subspace Jammer for events
...
I plan on doing a stationary version down the road but that will require a lot more work.
2018-12-31 09:13:39 -05:00
Spades
e956afedbf
Merge pull request #4529 from VOREStation/upstream-merge-5649
...
[MIRROR] ᵗᵉᵉⁿʸ ᶠˡᵃˢʰˡᶦᵍʰᵗ ᵗʷᵉᵃᵏ
2018-12-12 21:24:38 -05:00
Spades
9b92dc1836
Merge pull request #4462 from Novacat/nova-basicfixes
...
Expedition Job and Gear tweaks
2018-12-08 09:44:15 -05:00
kevinz000
fc178c1e04
Makes math helpers defines for performance
2018-12-06 16:15:00 -05:00
Atermonera
0a77d0d70d
Borg, Gripper, and Integrated Circuit interaction update.
2018-12-03 20:22:47 -05:00
Atermonera
034c3e6615
Merge pull request #5649 from lbnesquik/Kates-Flashlight-F
...
ᵗᵉᵉⁿʸ ᶠˡᵃˢʰˡᶦᵍʰᵗ ᵗʷᵉᵃᵏ
2018-12-01 00:33:49 -05:00
Atermonera
2df5e9fe0e
Merges AI Branch into Master
2018-12-01 00:06:38 -05:00
Unknown
797b9fa6e7
More Access Fixes
2018-11-24 15:10:29 -05:00
Unknown
3969e2ab09
Tightens up radio access a bit
2018-11-18 15:16:26 -05:00
Unknown
6018fe8d23
Travis plz
2018-10-30 13:47:32 -04:00
Unknown
9d382a8df5
Minor changes
2018-10-30 11:33:12 -04:00
Unknown
fd8d32896e
Remove Srcs (Thanks Aro)
2018-10-30 11:28:55 -04:00
Unknown
ee756cfb29
Default Internal Channels Update
2018-10-30 10:31:24 -04:00
Unknown
bf63a5152e
Requested Changes 1
2018-10-30 02:36:20 -04:00
Unknown
84358c4fd0
Adds Subspace Radio
...
Pathfinder special equipment, currently spawns in the Pathfinder's locker.
It is a backpack radio that functionally works similar to a defibrillator, that can send and receive messages from anywhere regardless of telecoms. Is still susceptible to the usual methods of signal disruption such as jamming.
2018-10-28 19:38:05 -04:00
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
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
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
Anewbe
3d4bed20c2
Merge pull request #5548 from Poojawa/pls-stop-moosic
...
Ports /vg/ instrument frame work, adds client based sound pref toggle.
2018-09-19 15:04:06 -05:00
