diff --git a/code/datums/mind.dm b/code/datums/mind.dm index f1f7781bffe..548151a00cc 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -85,7 +85,7 @@ datum/mind else if (src in ticker.mode.revolutionaries) text += "head|officer|employee|headrev|REV" else - text += "head|officer|EMPLOYER|headrev|rev" + text += "head|officer|EMPLOYEE|headrev|rev" sections["revolution"] = text /** CULT ***/ @@ -105,7 +105,7 @@ datum/mind text += "
Objectives are empty! Set to sacrifice and escape or summon." */ else - text += "head|officer|EMPLOYER|cultist" + text += "head|officer|EMPLOYEE|cultist" sections["cult"] = text /** WIZARD ***/ diff --git a/code/game/machinery/hydroponics.dm b/code/game/machinery/hydroponics.dm index 0bbee28560a..1e2f0bb3357 100644 --- a/code/game/machinery/hydroponics.dm +++ b/code/game/machinery/hydroponics.dm @@ -1,7 +1,7 @@ /obj/machinery/hydroponics name = "Hydroponics Tray" icon = 'hydroponics.dmi' - icon_state = "hydrotraynew" + icon_state = "hydrotray3" density = 1 anchored = 1 var/waterlevel = 100 // The amount of water in the tray (max 100) @@ -154,19 +154,19 @@ obj/machinery/hydroponics/proc/updateicon() overlays += image('hydroponics.dmi', icon_state="[src.myseed.species]-grow[src.myseed.growthstages]") // Same if(src.waterlevel <= 10) - overlays += image('hydroponics.dmi', icon_state="over_lowwater") + overlays += image('hydroponics.dmi', icon_state="over_lowwater3") if(src.nutrilevel <= 2) - overlays += image('hydroponics.dmi', icon_state="over_lownutri") + overlays += image('hydroponics.dmi', icon_state="over_lownutri3") if(src.health <= (src.myseed.endurance / 2)) - overlays += image('hydroponics.dmi', icon_state="over_lowhealth") + overlays += image('hydroponics.dmi', icon_state="over_lowhealth3") if(src.weedlevel >= 5) - overlays += image('hydroponics.dmi', icon_state="over_alert") + overlays += image('hydroponics.dmi', icon_state="over_alert3") if(src.pestlevel >= 5) - overlays += image('hydroponics.dmi', icon_state="over_alert") + overlays += image('hydroponics.dmi', icon_state="over_alert3") if(src.toxic >= 40) - overlays += image('hydroponics.dmi', icon_state="over_alert") + overlays += image('hydroponics.dmi', icon_state="over_alert3") if(src.harvest) - overlays += image('hydroponics.dmi', icon_state="over_harvest") + overlays += image('hydroponics.dmi', icon_state="over_harvest3") if(myseed) if(luminosity && !istype(myseed,/obj/item/seeds/glowshroom)) //revert luminosity to 0 @@ -895,4 +895,4 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob) del(myseed) planted = 0 dead = 0 - updateicon() \ No newline at end of file + updateicon() diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index bf4630a42d4..3ea6431f20e 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -394,6 +394,7 @@ verbs += /obj/admins/proc/edit_memory verbs += /obj/admins/proc/edit_player + verbs += /client/proc/cmd_admin_dress //verbs += /client/proc/cmd_admin_alienize //verbs += /client/proc/cmd_admin_changelinginize //verbs += /client/proc/cmd_admin_abominize // -- TLE @@ -555,6 +556,7 @@ verbs += /obj/admins/proc/edit_memory verbs += /obj/admins/proc/edit_player + verbs += /client/proc/cmd_admin_dress //verbs += /client/proc/cmd_admin_alienize //verbs += /client/proc/cmd_admin_changelinginize //verbs += /client/proc/cmd_admin_abominize // -- TLE diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index ef4e6e0644a..9811155b1f1 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -18,6 +18,7 @@ verb/rotate() set name = "Rotate" + set category = "Object" set src in oview(1) if (src.anchored || usr:stat) diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm index 1cdc477ca94..fa8aea3d080 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm @@ -56,6 +56,7 @@ PE|PE|PE verb/rotate() set name = "Rotate" + set category = "Object" set src in oview(1) if (src.anchored || usr:stat) @@ -185,6 +186,7 @@ PE|PE|PE verb/rotate() set name = "Rotate" + set category = "Object" set src in oview(1) if (src.anchored || usr:stat) diff --git a/icons/obj/hydroponics.dmi b/icons/obj/hydroponics.dmi index 1f0ebfc5d47..91554e19643 100644 Binary files a/icons/obj/hydroponics.dmi and b/icons/obj/hydroponics.dmi differ