Merge remote-tracking branch 'upstream/master' into fuck512

This commit is contained in:
Archie
2021-06-28 03:32:04 -03:00
61 changed files with 4386 additions and 3937 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
/datum/component/lockon_aiming
dupe_mode = COMPONENT_DUPE_ALLOWED
var/lock_icon = 'icons/mob/blob.dmi'
var/lock_icon = 'icons/mob/cameramob.dmi'
var/lock_icon_state = "marker"
var/mutable_appearance/lock_appearance
var/list/image/lock_images