Fixed issue 1008. (Putting stuff into the seed extractor doesn't update sprites)

Added floor safes.
Fixed the icon paths (or lack thereof) for bluespace artillery, and the capitalisation.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4883 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-10-15 16:17:55 +00:00
parent 5b1e7cb336
commit 606e40729a
4 changed files with 46 additions and 20 deletions

View File

@@ -1,22 +1,21 @@
/obj/machinery/seed_extractor
name = "Seed Extractor"
desc = "Extracts seeds from produce"
name = "seed extractor"
desc = "Extracts and bags seeds from produce."
icon = 'icons/obj/hydroponics.dmi'
icon_state = "sextractor"
density = 1
anchored = 1
obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob)
//Called when mob user "attacks" it with object O
if (istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/))
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown/))
var/obj/item/weapon/reagent_containers/food/snacks/grown/F = O
user << "\blue You extract some seeds from the [F.name]"
user.drop_item()
user << "<span class='notice'>You extract some seeds from the [F.name].</span>"
var/seed = text2path(F.seed)
var/t_amount = 0
var/t_max = rand(1,4)
while ( t_amount < t_max)
var/obj/item/seeds/t_prod = new seed(src.loc)
while(t_amount < t_max)
var/obj/item/seeds/t_prod = new seed(loc)
t_prod.species = F.species
t_prod.lifespan = F.lifespan
t_prod.endurance = F.endurance
@@ -27,14 +26,15 @@ obj/machinery/seed_extractor/attackby(var/obj/item/O as obj, var/mob/user as mob
t_amount++
del(O)
else if (istype(O, /obj/item/weapon/grown/))
else if(istype(O, /obj/item/weapon/grown/))
var/obj/item/weapon/grown/F = O
user << "\blue You extract some seeds from the [F.name]"
user.drop_item()
user << "<span class='notice'>You extract some seeds from the [F.name].</span>"
var/seed = text2path(F.seed)
var/t_amount = 0
var/t_max = rand(1,4)
while ( t_amount < t_max)
var/obj/item/seeds/t_prod = new seed(src.loc)
while(t_amount < t_max)
var/obj/item/seeds/t_prod = new seed(loc)
t_prod.species = F.species
t_prod.lifespan = F.lifespan
t_prod.endurance = F.endurance

View File

@@ -1,3 +1,10 @@
/*
CONTAINS:
SAFES
FLOOR SAFES
*/
//SAFES
/obj/structure/safe
name = "safe"
desc = "A huge chunk of metal with a dial embedded in it. Fine print on the dial reads \"Scarborough Arms - 2 tumbler safe, guaranteed thermite resistant, explosion resistant, and assistant resistant.\""
@@ -16,11 +23,11 @@
/obj/structure/safe/New()
tumbler_1_pos = round(rand(0, 72))
tumbler_1_open = round(rand(0, 72))
tumbler_1_pos = rand(0, 72)
tumbler_1_open = rand(0, 72)
tumbler_2_pos = round(rand(0, 72))
tumbler_2_open = round(rand(0, 72))
tumbler_2_pos = rand(0, 72)
tumbler_2_open = rand(0, 72)
/obj/structure/safe/initialize()
@@ -161,4 +168,23 @@ obj/structure/safe/ex_act(severity)
obj/structure/safe/meteorhit(obj/O as obj)
return
return
//FLOOR SAFES
/obj/structure/safe/floor
name = "floor safe"
icon_state = "floorsafe"
density = 0
level = 1 //underfloor
layer = 2.5
/obj/structure/safe/floor/initialize()
..()
var/turf/T = loc
hide(T.intact)
/obj/structure/safe/floor/hide(var/intact)
invisibility = intact ? 101 : 0

View File

@@ -1,9 +1,9 @@
/obj/machinery/artillerycontrol
var/reload = 180
name = "Bluespace Artillery Control"
name = "bluespace artillery control"
icon_state = "control_boxp1"
icon = 'particle_accelerator.dmi'
icon = 'icons/obj/machines/particle_accelerator.dmi'
density = 1
anchored = 1
@@ -13,7 +13,7 @@
/obj/structure/artilleryplaceholder
name = "artillery"
icon = 'particle_accelerator.dmi'
icon = 'icons/obj/machines/particle_accelerator.dmi'
anchored = 1
density = 1