shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14971 from Arturlang/nanite_updates

Browse Source 
Ports update appearance
This commit is contained in:
silicons
2021-08-08 04:06:18 -07:00
committed by GitHub
parent 9457b6b3e2 feac8568b6
commit 59e541d2e7
218 changed files with 2251 additions and 1898 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/research/nanites/nanite_program_hub.dm
+6 -3
View File
@@ -28,11 +28,10 @@
/obj/machinery/nanite_program_hub/update_overlays()
. = ..()
SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
if((stat & (NOPOWER|MAINT|BROKEN)) || panel_open)
return
SSvis_overlays.add_vis_overlay(src, icon, "nanite_program_hub_on", layer, plane)
SSvis_overlays.add_vis_overlay(src, icon, "nanite_program_hub_on", EMISSIVE_LAYER, EMISSIVE_PLANE)
. += mutable_appearance(icon, "nanite_program_hub_on")
. += emissive_appearance(icon, "nanite_program_hub_on")
/obj/machinery/nanite_program_hub/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/disk/nanite_program))
@@ -148,3 +147,7 @@
disk.program = null
disk.name = initial(disk.name)
. = TRUE
/obj/machinery/nanite_program_hub/admin/Initialize()
. = ..()
linked_techweb = SSresearch.admin_tech
code/modules/research/nanites/nanite_programmer.dm
+2 -3
View File
@@ -13,11 +13,10 @@
/obj/machinery/nanite_programmer/update_overlays()
. = ..()
SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays)
if((stat & (NOPOWER|MAINT|BROKEN)) || panel_open)
return
SSvis_overlays.add_vis_overlay(src, icon, "nanite_programmer_on", layer, plane)
SSvis_overlays.add_vis_overlay(src, icon, "nanite_programmer_on", EMISSIVE_LAYER, EMISSIVE_PLANE)
. += mutable_appearance(icon, "nanite_programmer_on")
. += emissive_appearance(icon, "nanite_programmer_on")
/obj/machinery/nanite_programmer/attackby(obj/item/I, mob/user)
if(istype(I, /obj/item/disk/nanite_program))
code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+15 -15
View File
@@ -1,4 +1,4 @@
/obj/screen/alert/status_effect/rainbow_protection
/atom/movable/screen/alert/status_effect/rainbow_protection
name = "Rainbow Protection"
desc = "You are defended from harm, but so are those you might seek to injure!"
icon_state = "slime_rainbowshield"
@@ -6,7 +6,7 @@
/datum/status_effect/rainbow_protection
id = "rainbow_protection"
duration = 100
alert_type = /obj/screen/alert/status_effect/rainbow_protection
alert_type = /atom/movable/screen/alert/status_effect/rainbow_protection
var/originalcolor
/datum/status_effect/rainbow_protection/on_apply()
@@ -29,7 +29,7 @@
"<span class='warning'>You no longer feel protected...</span>")
return ..()
/obj/screen/alert/status_effect/slimeskin
/atom/movable/screen/alert/status_effect/slimeskin
name = "Adamantine Slimeskin"
desc = "You are covered in a thick, non-neutonian gel."
icon_state = "slime_stoneskin"
@@ -37,7 +37,7 @@
/datum/status_effect/slimeskin
id = "slimeskin"
duration = 300
alert_type = /obj/screen/alert/status_effect/slimeskin
alert_type = /atom/movable/screen/alert/status_effect/slimeskin
var/originalcolor
/datum/status_effect/slimeskin/on_apply()
@@ -91,14 +91,14 @@
owner.forceMove(target.loc)
return ..()
/obj/screen/alert/status_effect/freon/stasis
/atom/movable/screen/alert/status_effect/freon/stasis
desc = "You're frozen inside of a protective ice cube! While inside, you can't do anything, but are immune to harm! Resist to get out."
/datum/status_effect/frozenstasis
id = "slime_frozen"
status_type = STATUS_EFFECT_UNIQUE
duration = -1 //Will remove self when block breaks.
alert_type = /obj/screen/alert/status_effect/freon/stasis
alert_type = /atom/movable/screen/alert/status_effect/freon/stasis
var/obj/structure/ice_stasis/cube
/datum/status_effect/frozenstasis/on_apply()
@@ -162,7 +162,7 @@
qdel(clone)
return ..()
/obj/screen/alert/status_effect/clone_decay
/atom/movable/screen/alert/status_effect/clone_decay
name = "Clone Decay"
desc = "You are simply a construct, and cannot maintain this form forever. You will be returned to your original body if you should fall."
icon_state = "slime_clonedecay"
@@ -171,7 +171,7 @@
id = "slime_clonedecay"
status_type = STATUS_EFFECT_UNIQUE
duration = -1
alert_type = /obj/screen/alert/status_effect/clone_decay
alert_type = /atom/movable/screen/alert/status_effect/clone_decay
/datum/status_effect/slime_clone_decay/tick()
owner.adjustToxLoss(1, 0)
@@ -180,7 +180,7 @@
owner.adjustFireLoss(1, 0)
owner.color = "#007BA7"
/obj/screen/alert/status_effect/bloodchill
/atom/movable/screen/alert/status_effect/bloodchill
name = "Bloodchilled"
desc = "You feel a shiver down your spine after getting hit with a glob of cold blood. You'll move slower and get frostbite for a while!"
icon_state = "bloodchill"
@@ -188,7 +188,7 @@
/datum/status_effect/bloodchill
id = "bloodchill"
duration = 100
alert_type = /obj/screen/alert/status_effect/bloodchill
alert_type = /atom/movable/screen/alert/status_effect/bloodchill
/datum/status_effect/bloodchill/on_apply()
owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/bloodchill)
@@ -202,7 +202,7 @@
owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/bloodchill)
return ..()
/obj/screen/alert/status_effect/bloodchill
/atom/movable/screen/alert/status_effect/bloodchill
name = "Bloodchilled"
desc = "You feel a shiver down your spine after getting hit with a glob of cold blood. You'll move slower and get frostbite for a while!"
icon_state = "bloodchill"
@@ -210,7 +210,7 @@
/datum/status_effect/bonechill
id = "bonechill"
duration = 80
alert_type = /obj/screen/alert/status_effect/bonechill
alert_type = /atom/movable/screen/alert/status_effect/bonechill
/datum/status_effect/bonechill/on_apply()
owner.add_movespeed_modifier(/datum/movespeed_modifier/status_effect/bonechill)
@@ -226,7 +226,7 @@
owner.remove_movespeed_modifier(/datum/movespeed_modifier/status_effect/bonechill)
return ..()
/obj/screen/alert/status_effect/bonechill
/atom/movable/screen/alert/status_effect/bonechill
name = "Bonechilled"
desc = "You feel a shiver down your spine after hearing the haunting noise of bone rattling. You'll move slower and get frostbite for a while!"
icon_state = "bloodchill"
@@ -661,7 +661,7 @@
return ..()
//Bluespace has an icon because it's kinda active.
/obj/screen/alert/status_effect/bluespaceslime
/atom/movable/screen/alert/status_effect/bluespaceslime
name = "Stabilized Bluespace Extract"
desc = "You shouldn't see this, since we set it to change automatically!"
icon_state = "slime_bluespace_on"
@@ -674,7 +674,7 @@
/datum/status_effect/stabilized/bluespace
id = "stabilizedbluespace"
colour = "bluespace"
alert_type = /obj/screen/alert/status_effect/bluespaceslime
alert_type = /atom/movable/screen/alert/status_effect/bluespaceslime
var/healthcheck
/datum/status_effect/stabilized/bluespace/tick()