mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 10:21:11 +00:00
New sprites for hydroponic tray (belongs to Farart).
Fixed some typos. Categorized some noncategorical verbs. Badmins and trial admins now can use "select equipment" verb. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1770 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -85,7 +85,7 @@ datum/mind
|
|||||||
else if (src in ticker.mode.revolutionaries)
|
else if (src in ticker.mode.revolutionaries)
|
||||||
text += "head|officer|<a href='?src=\ref[src];revolution=clear'>employee</a>|<a href='?src=\ref[src];revolution=headrev'>headrev</a>|<b>REV</b>"
|
text += "head|officer|<a href='?src=\ref[src];revolution=clear'>employee</a>|<a href='?src=\ref[src];revolution=headrev'>headrev</a>|<b>REV</b>"
|
||||||
else
|
else
|
||||||
text += "head|officer|<b>EMPLOYER</b>|<a href='?src=\ref[src];revolution=headrev'>headrev</a>|<a href='?src=\ref[src];revolution=rev'>rev</a>"
|
text += "head|officer|<b>EMPLOYEE</b>|<a href='?src=\ref[src];revolution=headrev'>headrev</a>|<a href='?src=\ref[src];revolution=rev'>rev</a>"
|
||||||
sections["revolution"] = text
|
sections["revolution"] = text
|
||||||
|
|
||||||
/** CULT ***/
|
/** CULT ***/
|
||||||
@@ -105,7 +105,7 @@ datum/mind
|
|||||||
text += "<br>Objectives are empty! Set to sacrifice and <a href='?src=\ref[src];cult=escape'>escape</a> or <a href='?src=\ref[src];cult=summon'>summon</a>."
|
text += "<br>Objectives are empty! Set to sacrifice and <a href='?src=\ref[src];cult=escape'>escape</a> or <a href='?src=\ref[src];cult=summon'>summon</a>."
|
||||||
*/
|
*/
|
||||||
else
|
else
|
||||||
text += "head|officer|<b>EMPLOYER</b>|<a href='?src=\ref[src];cult=cultist'>cultist</a>"
|
text += "head|officer|<b>EMPLOYEE</b>|<a href='?src=\ref[src];cult=cultist'>cultist</a>"
|
||||||
sections["cult"] = text
|
sections["cult"] = text
|
||||||
|
|
||||||
/** WIZARD ***/
|
/** WIZARD ***/
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
/obj/machinery/hydroponics
|
/obj/machinery/hydroponics
|
||||||
name = "Hydroponics Tray"
|
name = "Hydroponics Tray"
|
||||||
icon = 'hydroponics.dmi'
|
icon = 'hydroponics.dmi'
|
||||||
icon_state = "hydrotraynew"
|
icon_state = "hydrotray3"
|
||||||
density = 1
|
density = 1
|
||||||
anchored = 1
|
anchored = 1
|
||||||
var/waterlevel = 100 // The amount of water in the tray (max 100)
|
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
|
overlays += image('hydroponics.dmi', icon_state="[src.myseed.species]-grow[src.myseed.growthstages]") // Same
|
||||||
|
|
||||||
if(src.waterlevel <= 10)
|
if(src.waterlevel <= 10)
|
||||||
overlays += image('hydroponics.dmi', icon_state="over_lowwater")
|
overlays += image('hydroponics.dmi', icon_state="over_lowwater3")
|
||||||
if(src.nutrilevel <= 2)
|
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))
|
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)
|
if(src.weedlevel >= 5)
|
||||||
overlays += image('hydroponics.dmi', icon_state="over_alert")
|
overlays += image('hydroponics.dmi', icon_state="over_alert3")
|
||||||
if(src.pestlevel >= 5)
|
if(src.pestlevel >= 5)
|
||||||
overlays += image('hydroponics.dmi', icon_state="over_alert")
|
overlays += image('hydroponics.dmi', icon_state="over_alert3")
|
||||||
if(src.toxic >= 40)
|
if(src.toxic >= 40)
|
||||||
overlays += image('hydroponics.dmi', icon_state="over_alert")
|
overlays += image('hydroponics.dmi', icon_state="over_alert3")
|
||||||
if(src.harvest)
|
if(src.harvest)
|
||||||
overlays += image('hydroponics.dmi', icon_state="over_harvest")
|
overlays += image('hydroponics.dmi', icon_state="over_harvest3")
|
||||||
|
|
||||||
if(myseed)
|
if(myseed)
|
||||||
if(luminosity && !istype(myseed,/obj/item/seeds/glowshroom)) //revert luminosity to 0
|
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)
|
del(myseed)
|
||||||
planted = 0
|
planted = 0
|
||||||
dead = 0
|
dead = 0
|
||||||
updateicon()
|
updateicon()
|
||||||
|
|||||||
@@ -394,6 +394,7 @@
|
|||||||
|
|
||||||
verbs += /obj/admins/proc/edit_memory
|
verbs += /obj/admins/proc/edit_memory
|
||||||
verbs += /obj/admins/proc/edit_player
|
verbs += /obj/admins/proc/edit_player
|
||||||
|
verbs += /client/proc/cmd_admin_dress
|
||||||
//verbs += /client/proc/cmd_admin_alienize
|
//verbs += /client/proc/cmd_admin_alienize
|
||||||
//verbs += /client/proc/cmd_admin_changelinginize
|
//verbs += /client/proc/cmd_admin_changelinginize
|
||||||
//verbs += /client/proc/cmd_admin_abominize // -- TLE
|
//verbs += /client/proc/cmd_admin_abominize // -- TLE
|
||||||
@@ -555,6 +556,7 @@
|
|||||||
|
|
||||||
verbs += /obj/admins/proc/edit_memory
|
verbs += /obj/admins/proc/edit_memory
|
||||||
verbs += /obj/admins/proc/edit_player
|
verbs += /obj/admins/proc/edit_player
|
||||||
|
verbs += /client/proc/cmd_admin_dress
|
||||||
//verbs += /client/proc/cmd_admin_alienize
|
//verbs += /client/proc/cmd_admin_alienize
|
||||||
//verbs += /client/proc/cmd_admin_changelinginize
|
//verbs += /client/proc/cmd_admin_changelinginize
|
||||||
//verbs += /client/proc/cmd_admin_abominize // -- TLE
|
//verbs += /client/proc/cmd_admin_abominize // -- TLE
|
||||||
|
|||||||
@@ -18,6 +18,7 @@
|
|||||||
|
|
||||||
verb/rotate()
|
verb/rotate()
|
||||||
set name = "Rotate"
|
set name = "Rotate"
|
||||||
|
set category = "Object"
|
||||||
set src in oview(1)
|
set src in oview(1)
|
||||||
|
|
||||||
if (src.anchored || usr:stat)
|
if (src.anchored || usr:stat)
|
||||||
|
|||||||
@@ -56,6 +56,7 @@ PE|PE|PE
|
|||||||
|
|
||||||
verb/rotate()
|
verb/rotate()
|
||||||
set name = "Rotate"
|
set name = "Rotate"
|
||||||
|
set category = "Object"
|
||||||
set src in oview(1)
|
set src in oview(1)
|
||||||
|
|
||||||
if (src.anchored || usr:stat)
|
if (src.anchored || usr:stat)
|
||||||
@@ -185,6 +186,7 @@ PE|PE|PE
|
|||||||
|
|
||||||
verb/rotate()
|
verb/rotate()
|
||||||
set name = "Rotate"
|
set name = "Rotate"
|
||||||
|
set category = "Object"
|
||||||
set src in oview(1)
|
set src in oview(1)
|
||||||
|
|
||||||
if (src.anchored || usr:stat)
|
if (src.anchored || usr:stat)
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 82 KiB After Width: | Height: | Size: 84 KiB |
Reference in New Issue
Block a user