September 2020 Upstream Merge

This commit is contained in:
Razgriz
2020-09-25 23:07:08 -07:00
1653 changed files with 731193 additions and 1032379 deletions
@@ -12,11 +12,8 @@
max_complexity = IC_COMPLEXITY_BASE
var/obj/item/clothing/clothing = null
/obj/item/device/electronic_assembly/clothing/nano_host()
return clothing
/obj/item/device/electronic_assembly/clothing/resolve_nano_host()
return clothing
/obj/item/device/electronic_assembly/clothing/tgui_host()
return clothing.tgui_host()
/obj/item/device/electronic_assembly/clothing/update_icon()
..()
@@ -10,11 +10,8 @@
max_complexity = IC_COMPLEXITY_BASE / 2
var/obj/item/weapon/implant/integrated_circuit/implant = null
/obj/item/device/electronic_assembly/implant/nano_host()
return implant
/obj/item/device/electronic_assembly/implant/resolve_nano_host()
return implant
/obj/item/device/electronic_assembly/implant/tgui_host()
return implant.tgui_host()
/obj/item/device/electronic_assembly/implant/update_icon()
..()