Hawk_v3
9e88f55480
Merge remote-tracking branch 'upstream/release'
2019-09-16 14:57:39 +01:00
Heroman
c92960feca
Some post-release fixes
2019-09-15 06:27:32 +10:00
Hawk_v3
6d4ec50e08
Merge remote-tracking branch 'upstream/master'
2019-09-01 19:02:01 +01:00
Unknown
0d73c8ad76
Early Polaris Ports
...
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434
No vorestation edit markings because they are polariscode ports.
2019-08-30 23:55:58 -04:00
Hawk_v3
b6ebecf7ec
Merge remote-tracking branch 'upstream/master'
2019-08-30 21:38:17 +01:00
Anewbe
083a0634a0
Merge pull request #6429 from Heroman3003/idfix
...
Fixes editing colony director IDs editing global 'station access' list
2019-08-29 18:27:58 -04:00
Heroman
cd5f25b853
Also adds feedback message
2019-08-29 08:12:11 +10:00
Heroman
ba71025007
Adds description to Request Spice
2019-08-29 07:59:39 +10:00
Hawk_v3
0973c49633
Merge remote-tracking branch 'upstream/master'
2019-08-27 00:22:31 +01:00
Heroman
f118fe8eda
Returns shadekin smites
2019-08-23 10:46:42 +10:00
Hawk_v3
96b8a7ab95
Merge remote-tracking branch 'upstream/master'
2019-08-17 21:06:48 +01:00
BlackMajor
419db94458
Adds requested changes yeet
2019-08-11 17:22:20 +12:00
BlackMajor
67885bca42
Oh wait that's important
2019-08-11 02:03:32 +12:00
BlackMajor
1035c6e8dd
ew empty lines
2019-08-11 01:45:39 +12:00
BlackMajor
da7949b4b6
I should probably remove those debug messages
2019-08-11 01:38:57 +12:00
BlackMajor
0a2e805735
Adds spawn character as mob verb
2019-08-11 01:37:36 +12:00
Hawk_v3
0c85b3a4dd
Merge remote-tracking branch 'upstream/master'
2019-08-09 21:35:04 +01:00
Atermonera
1a15bb765d
Merge pull request #6387 from Heroman3003/ahelp-feedback
...
Makes ahelping on existing ticket give proper feedback
2019-08-08 16:09:05 -04:00
if there were two guys on the moon
e51356209e
10 min CD
2019-07-27 19:21:21 +01:00
if there were two guys on the moon
bd9c75327c
Request Spice
2019-07-27 17:04:21 +01:00
Hawk_v3
70a2fa937c
Merge remote-tracking branch 'upstream/master'
2019-06-05 00:25:36 +01:00
Atermonera
2f434b45c1
Merge pull request #6189 from mistyLuminescence/manup
...
Critical ManUpulator Fix
2019-06-04 13:13:57 -04:00
Hawk_v3
3aa4e406f9
Merge remote-tracking branch 'upstream/master'
2019-05-15 14:46:50 +01:00
Heroman3003
6f80f45eed
Ports character setup subsystem
2019-05-14 11:48:34 +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
Neerti
16b3b58259
[REVIEW] Ports Modular Computers from Baystation
2019-04-28 22:06:40 -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
Hawk_v3
41f0bd9f6d
Merge remote-tracking branch 'upstream/master'
2019-04-14 19:44:13 +01:00
Novacat
466516b066
Revert "Un-kevinzes nanoui and chemistry subsystems back into processes for greater good"
2019-04-08 15:24:27 -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
128229c12e
Ports kick fix early
2019-04-06 12:22:51 -04:00
Heroman
b11015107c
REVERT of nanoui/chemistry becoming subsystems (temp)
2019-04-05 13:30:32 +10:00
Novacat
2c07c85138
Adds New Alert Levels ( #6019 )
...
* Adds New Alert Levels
2019-03-30 18:29:12 -04:00
Novacat
c570f25dd8
Merge branch 'master' into upstream-merge-5905
2019-03-28 14:55:54 -04:00
Unknown
2767f5917d
Fixes Conflict
2019-03-28 14:49:44 -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
Novacat
97e98dd04d
Merge pull request #4682 from VOREStation/upstream-merge-5829
...
[MIRROR] Ports TGstation view variables + admin proccall guards, and all the baggage that comes with it
2019-03-27 16:37:45 -04:00
kevinz000
6415e4193f
[READY]Makes a bunch of processes subsystems instead
2019-03-27 16:03:51 -04:00
Unknown
6636f1ba37
Conflict Resolution Part 2
2019-03-27 15:51:05 -04:00
Unknown
55b4d304f5
Conflict Resolution Part One
2019-03-27 15:21:58 -04:00
Novacat
7bd0f8e2db
Merge pull request #4676 from VOREStation/upstream-merge-5820
...
[MIRROR] Makes IC ticket response less rude
2019-03-27 15:18:06 -04:00
Novacat
a9f4906995
Merge pull request #4667 from VOREStation/upstream-merge-5772
...
[MIRROR] Refactors poi rotation to use degrees instead of dir
2019-03-27 15:16:02 -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
Neerti
ee18328ce0
Refactors poi rotation to use degrees instead of dir
2019-03-27 12:57:16 -04:00
Unknown
0e6c82ed60
Conflict Resolution
2019-03-27 12:05:38 -04:00
kevinz000
dfbd0bd72b
Upgrades SDQL2 and refactors it to a datum
2019-03-27 11:50:49 -04:00
Neerti
1dd3bb4532
Stops initialization from grinding to a halt when loading maps
2019-03-27 01:49:25 -04:00
Spades
6e2172a5ae
Merge branch 'master' into upstream-merge-5654
2019-03-01 05:42:07 -05:00
Anewbe
c3574a3a56
Woops I misse dit, removes the forced announce from atom proccall
2019-01-28 22:10:55 -05:00
