-Wallets now have sprites for holding silver head IDs and red Centcom IDs.
-New spare ID box sprite. New pill-bottle box sprite. -Added spades for botanists who want to play with dirt. -A spade can be found in the hydroponics supply area, along with a couple spare tools useful for the job. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3782 316c924e-a436-60f5-8080-3fe189b3f50e
@@ -78,7 +78,7 @@
|
|||||||
/obj/item/weapon/storage/pillbottlebox
|
/obj/item/weapon/storage/pillbottlebox
|
||||||
name = "box of pill bottles"
|
name = "box of pill bottles"
|
||||||
desc = "It has pictures of pill bottles on its front."
|
desc = "It has pictures of pill bottles on its front."
|
||||||
icon_state = "box"
|
icon_state = "pillbox"
|
||||||
item_state = "syringe_kit"
|
item_state = "syringe_kit"
|
||||||
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
|
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
|
||||||
|
|
||||||
@@ -219,12 +219,19 @@
|
|||||||
|
|
||||||
update_icon()
|
update_icon()
|
||||||
for(var/obj/item/weapon/card/id/ID in contents)
|
for(var/obj/item/weapon/card/id/ID in contents)
|
||||||
if(ID.icon_state == "gold")
|
switch(ID.icon_state)
|
||||||
icon_state = "walletid_gold"
|
if("id")
|
||||||
return
|
icon_state = "walletid"
|
||||||
else if(ID.icon_state == "id")
|
return
|
||||||
icon_state = "walletid"
|
if("silver")
|
||||||
return
|
icon_state = "walletid_silver"
|
||||||
|
return
|
||||||
|
if("gold")
|
||||||
|
icon_state = "walletid_gold"
|
||||||
|
return
|
||||||
|
if("centcom")
|
||||||
|
icon_state = "walletid_centcom"
|
||||||
|
return
|
||||||
icon_state = "wallet"
|
icon_state = "wallet"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -263,7 +263,8 @@ proc/move_mining_shuttle()
|
|||||||
/*****************************Shovel********************************/
|
/*****************************Shovel********************************/
|
||||||
|
|
||||||
/obj/item/weapon/shovel
|
/obj/item/weapon/shovel
|
||||||
name = "Shovel"
|
name = "shovel"
|
||||||
|
desc = "A large tool for digging and moving dirt."
|
||||||
icon = 'items.dmi'
|
icon = 'items.dmi'
|
||||||
icon_state = "shovel"
|
icon_state = "shovel"
|
||||||
flags = FPRINT | TABLEPASS| CONDUCT
|
flags = FPRINT | TABLEPASS| CONDUCT
|
||||||
@@ -275,11 +276,14 @@ proc/move_mining_shuttle()
|
|||||||
m_amt = 50
|
m_amt = 50
|
||||||
origin_tech = "materials=1;engineering=1"
|
origin_tech = "materials=1;engineering=1"
|
||||||
|
|
||||||
|
/obj/item/weapon/shovel/spade
|
||||||
|
name = "spade"
|
||||||
|
desc = "A small tool for digging and moving dirt."
|
||||||
|
icon_state = "spade"
|
||||||
|
item_state = "spade"
|
||||||
|
force = 5.0
|
||||||
|
throwforce = 7.0
|
||||||
|
w_class = 2.0
|
||||||
|
|
||||||
|
|
||||||
/**********************Mining car (Crate like thing, not the rail car)**************************/
|
/**********************Mining car (Crate like thing, not the rail car)**************************/
|
||||||
|
|||||||
|
Before Width: | Height: | Size: 110 KiB After Width: | Height: | Size: 110 KiB |
|
Before Width: | Height: | Size: 110 KiB After Width: | Height: | Size: 110 KiB |
|
Before Width: | Height: | Size: 53 KiB After Width: | Height: | Size: 54 KiB |
|
Before Width: | Height: | Size: 47 KiB After Width: | Height: | Size: 48 KiB |
@@ -1697,7 +1697,7 @@
|
|||||||
"aGG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/hallway/primary/central)
|
"aGG" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/turf/simulated/floor/plating,/area/hallway/primary/central)
|
||||||
"aGH" = (/obj/machinery/vending/snack,/turf/simulated/floor{icon_state = "dark"},/area/hallway/primary/central)
|
"aGH" = (/obj/machinery/vending/snack,/turf/simulated/floor{icon_state = "dark"},/area/hallway/primary/central)
|
||||||
"aGI" = (/turf/simulated/floor{icon_state = "neutral"; dir = 4},/area/hallway/primary/central)
|
"aGI" = (/turf/simulated/floor{icon_state = "neutral"; dir = 4},/area/hallway/primary/central)
|
||||||
"aGJ" = (/obj/machinery/light{dir = 1},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
|
"aGJ" = (/obj/machinery/light{dir = 1},/obj/structure/closet/crate/hydroponics,/obj/item/weapon/shovel/spade,/obj/item/weapon/wrench,/obj/item/weapon/screwdriver,/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
|
||||||
"aGK" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
|
"aGK" = (/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = "Streight"},/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
|
||||||
"aGL" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/closet/secure_closet/hydroponics,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
|
"aGL" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/structure/closet/secure_closet/hydroponics,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
|
||||||
"aGM" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/item/device/radio/intercom{pixel_y = 25},/obj/structure/closet/secure_closet/hydroponics,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
|
"aGM" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/item/device/radio/intercom{pixel_y = 25},/obj/structure/closet/secure_closet/hydroponics,/turf/simulated/floor{icon_state = "hydrofloor"},/area/hydroponics)
|
||||||
|
|||||||