cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-05 05:40:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,497 Commits 8 Branches 26 Tags
abcde8fe5fa2114b9611899c343dfd60759d14c6
Commit Graph

1307 Commits

Author SHA1 Message Date
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
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
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
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
Spades
c29cea0e9f Merge pull request #4123 from Zap-zapper/sleevemate 
[FEATURE]Sleevemate new functions
 2018-09-17 14:12:07 -04:00
Neerti
3aca2c38e2 Yet Another Circuit Update (#5549) 
* Circuit updates, adds new components, improves printer, new assemblies.

* Finishes powernet circuit.

* Adds wearable assemblies.

* Finialization before merging with GLOB port.

* Finishes circuit update, hopefully.

* Forgot to undo map.

* Removes debug output.
 2018-09-12 20:51:32 -05:00
Poojawa
6b403022a7 Ports /vg/ instrument frame work, adds client based sound pref 
Also shifts sound files which is 98% of the bulk here.
 2018-09-05 03:35:34 -05:00
atermonera
24c4c6dd9f Ready for merge 2018-09-02 14:16:00 -07:00
Atermonera
347c97326a Appeases travis (Round 2) 2018-08-26 18:00:51 -07:00
Atermonera
0ce768af5a Appeases travis (Round 1) 2018-08-26 17:43:52 -07:00
Atermonera
22d9c89a97 Merc blast door controller 2018-08-26 17:08:46 -07:00
Atermonera
63473cb903 Status display access 2018-08-26 17:08:46 -07:00
Atermonera
11d46f1d8c Supply cartridge 2018-08-26 17:08:46 -07:00
atermonera
1f2c7cd9f6 Reorganize GPS to proper organization, important comments 2018-08-26 17:08:32 -07:00
atermonera
96d24e7427 GPS cartridge 2018-08-26 17:08:32 -07:00
atermonera
da45a40fad Refactor crew manifest to a separate file 2018-08-26 17:08:31 -07:00
atermonera
849a3cba56 Cartridge work: part 2 
* Power monitoring console
 * Cartridges have persistent, internal data
 * Code to load element-specific data upon request, instead of serving all relevant data at once
 * Janitorial Supply Locator
 2018-08-26 17:08:02 -07:00
atermonera
cce2201dd7 Cartridge work part 1 2018-08-26 17:08:02 -07:00
atermonera
84458be631 Med records, Sec records, Emp records 2018-08-26 17:07:39 -07:00
atermonera
32bca3d9b6 Template progress 2018-08-26 17:07:38 -07:00
atermonera
5cdeab7208 Cartridge devices 2018-08-26 17:06:53 -07:00
atermonera
3f6ec3e329 Adds newscast viewing, manifest 2018-08-26 17:06:15 -07:00
atermonera
1c8b408594 Initial Work: Manifest, Newsfeed 2018-08-26 17:06:14 -07:00
Atermonera
de65c3c643 NanoUI now processes again 2018-08-25 21:13:16 -07:00
Zap-zapper
b0a0a1e276 Protection from impersonation. Updated to 3700 2018-08-22 17:47:11 +07:00
Zap-zapper
02b58fdb99 Ghosts which joined soulcatcher can't be downloaded in Sleevemate 2018-08-20 23:45:17 +07:00