Hawk_v3
a5c7909ed7
Merge remote-tracking branch 'upstream/master'
2019-11-17 12:42:55 +00:00
Heroman3003
cfe37161cd
Switches to a different system for gateway map use.
2019-10-30 10:54:27 +10:00
Hawk_v3
27e73883fc
Merge remote-tracking branch 'upstream/release'
2019-05-04 21:03:48 +01:00
Novacat
fb52ec08c6
Merge pull request #5114 from Novacat/nova-weapons
...
Expedition Sub-department
2019-04-28 22:57:13 -04:00
Hawk_v3
50e2482613
Merge remote-tracking branch 'upstream/master'
2019-04-22 20:12:14 +01:00
Atermonera
9152030002
Merge pull request #6117 from Neerti/ai_shell_manifest_fix
...
Hides AI Shells from the manifest.
2019-04-22 14:31:22 -04:00
Unknown
afc0d67f21
[WIP] Expedition Sub-department
...
- Moves explorer job roles from their respective departments into an Exploration sub-department
- CHAIN OF COMMAND WILL REMAIN UNCHANGED
- ACCESS WILL REMAIN UNCHANGED
Note: Pathfinder's minimum access is getting tweaked, in case minimum access ever gets used.
This is a purely clerical change that is being done for two reasons.
1: To enable off duty exploration role, important for the upcoming timeclock PR. The upcoming timeclock functionality will cause difficulties for expedition roles, due to, at present, being in a wide variety of different departments.
2: Generally, explorer roles in other departments tended to create confusion, as people would ask (or even demand) those roles to do station-side duties, even if their access (or lack thereof) made it impossible.
2019-04-21 17:05:58 -04:00
Repede
e4dd365fe1
Merge branch 'master' of https://github.com/VOREStation/VOREStation into self
...
# Conflicts:
# code/_helpers/unsorted.dm
# code/controllers/subsystems/mapping_vr.dm
# code/datums/datum.dm
# code/datums/datumvars.dm
# code/datums/supplypacks/voidsuits.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/objects/items/devices/defib.dm
# code/game/objects/items/weapons/tools/weldingtool.dm
# code/game/world.dm
# code/modules/client/preference_setup/loadout/loadout_accessories.dm
# code/modules/client/preference_setup/loadout/loadout_eyes.dm
# code/modules/client/preference_setup/loadout/loadout_head.dm
# code/modules/client/preference_setup/loadout/loadout_suit.dm
# code/modules/client/preference_setup/loadout/loadout_uniform.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/food/food/snacks.dm
# code/modules/mob/living/carbon/human/species/station/station_vr.dm
# code/modules/reagents/Chemistry-Recipes.dm
# code/world.dm
# config/custom_items.txt
# config/example/config.txt
# config/example/game_options.txt
# icons/mob/robots.dmi
# icons/obj/mining.dmi
# maps/submaps/surface_submaps/wilderness/wilderness.dm
# vorestation.dme
2019-04-07 19:40:12 -04:00
Unknown
cf39c61c2d
Conflict Resolution
...
This one made a lynx cry.
2019-03-28 13:19:19 -04:00
Neerti
3256202407
[READY]Ports /tg/station pixel projectiles, processing subsystems, timer subsystems, and some misc stuff to make it all work
2019-03-27 22:02:07 -04:00
Repede
7fcb6c1488
revering back to collar commit
2019-03-11 23:13:04 -04:00
Repede
eb06799e86
Updating TGS/DMAPI to version 4
2019-03-11 21:31:45 -04:00
Repede
a4202ec1d6
Implemented basic GLOB and TGS3's DMAPI
2018-02-27 18:31:13 -05:00
