Merge remote-tracking branch 'upstream/master' into loadout-json

This commit is contained in:
timothyteakettle
2020-12-06 17:26:04 +00:00
574 changed files with 9774 additions and 9127 deletions
+1 -1
View File
@@ -7,4 +7,4 @@
RegisterSignal(target, COMSIG_ATOM_UPDATE_ICON, .proc/block_update_icon)
/datum/element/update_icon_blocker/proc/block_update_icon()
return COMSIG_ATOM_NO_UPDATE_ICON_STATE | COMSIG_ATOM_NO_UPDATE_OVERLAYS
return COMSIG_ATOM_NO_UPDATE_ICON_STATE | COMSIG_ATOM_NO_UPDATE_OVERLAYS