Merge pull request #148 from Huz2e:glasses #2
Annotations
10 errors and 1 notice
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Fore Central Primary Hallway (75,145,2)! Please manually address all potential merge conflicts!!!
|
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Library (84,141,2)! Please manually address all potential merge conflicts!!!
|
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Aft Central Primary Hallway (85,126,2)! Please manually address all potential merge conflicts!!!
|
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Aft Central Primary Hallway (85,125,2)! Please manually address all potential merge conflicts!!!
|
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Greater Central Maintenance (86,141,2)! Please manually address all potential merge conflicts!!!
|
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Greater Central Maintenance (86,140,2)! Please manually address all potential merge conflicts!!!
|
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Hydroponics (86,139,2)! Please manually address all potential merge conflicts!!!
|
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Aft Central Primary Hallway (86,125,2)! Please manually address all potential merge conflicts!!!
|
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Greater Central Maintenance (87,141,2)! Please manually address all potential merge conflicts!!!
|
|
code/modules/unit_tests/mapping.dm#L19
HEY, LISTEN!!! Merge Conflict Marker detected at Aft Central Primary Hallway (87,126,2)! Please manually address all potential merge conflicts!!!
|
|
code/modules/unit_tests/subsystem_init.dm#L22
Lua Scripting (/datum/controller/subsystem/lua) is a subsystem meant to initialize but could not get initialized.
The subsystem reported the following: Error initializing SSlua: FAILED (Couldn't find call_proc_by_id)
This subsystem is marked as SS_OK_TO_FAIL_INIT. This is still a bug, but it is non-blocking.
|
This job failed
Loading