Skip to content

Commit

Permalink
-Adds scythes
Browse files Browse the repository at this point in the history
-Adds weed control crates, orderable by cargo techs, for the purpose of kudzu control.
-You can now construct folders with cardboard sheets.
-Moves newspaper sprites out of weapons.dmi

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5206 316c924e-a436-60f5-8080-3fe189b3f50e
  • Loading branch information
d_h2005@yahoo.com committed Nov 27, 2012
1 parent 93e4d88 commit ffe7bc7
Show file tree
Hide file tree
Showing 12 changed files with 62 additions and 0 deletions.
10 changes: 10 additions & 0 deletions code/datums/supplypacks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,16 @@
containername = "Seeds crate"
access = access_hydroponics

/datum/supply_packs/weedcontrol
name = "Weed Control Crate"
contains = list(/obj/item/weapon/scythe,
/obj/item/clothing/mask/gas,
/obj/item/weapon/grenade/chem_grenade/antiweed,
/obj/item/weapon/grenade/chem_grenade/antiweed)
cost = 20
containertype = /obj/structure/closet/crate/secure/hydrosec
containername = "Weed control crate"
access = access_hydroponics

/datum/supply_packs/exoticseeds
name = "Exotic Seeds Crate"
Expand Down
21 changes: 21 additions & 0 deletions code/defines/obj/weapon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1435,6 +1435,27 @@
playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
return ..()

/obj/item/weapon/scythe
icon_state = "scythe0"
name = "scythe"
desc = "A sharp and curved blade on a long fibremetal handle, this tool makes it easy to reap what you sow."
force = 16.0
throwforce = 5.0
throw_speed = 1
throw_range = 3
w_class = 4.0
flags = FPRINT | TABLEPASS | NOSHIELD
slot_flags = SLOT_BACK
origin_tech = "materials=2;combat=2"
attack_verb = list("chopped", "sliced", "cut", "reaped")

/obj/item/weapon/scythe/afterattack(atom/A, mob/user as mob)
if(istype(A, /obj/effect/spacevine))
for(var/obj/effect/spacevine/B in orange(A,1))
if(prob(80))
del B
del A

/*
/obj/item/weapon/cigarpacket
name = "Pete's Cuban Cigars"
Expand Down
1 change: 1 addition & 0 deletions code/game/machinery/newscaster.dm
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,7 @@ var/list/obj/machinery/newscaster/allCasters = list() //Global list that will co
/obj/item/weapon/newspaper
name = "newspaper"
desc = "An issue of The Griffon, the newspaper circulating aboard Nanotrasen Space Stations."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "newspaper"
w_class = 2 //Let's make it fit in trashbags!
attack_verb = list("bapped")
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \
new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \
new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \
new/datum/stack_recipe("folder", /obj/item/weapon/folder), \
)

/obj/item/stack/sheet/cardboard //BubbleWrap
Expand Down
20 changes: 20 additions & 0 deletions code/game/objects/items/weapons/grenades/chem_grenade.dm
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,26 @@
beakers += B2
icon_state = "grenade"

/obj/item/weapon/grenade/chem_grenade/antiweed
name = "weedkiller grenade"
desc = "Used for purging large areas of invasive plant species. Contents under pressure. Do not directly inhale contents."
path = 1
stage = 2

New()
..()
var/obj/item/weapon/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/weapon/reagent_containers/glass/beaker/B2 = new(src)

B1.reagents.add_reagent("plantbgone", 25)
B1.reagents.add_reagent("potassium", 25)
B2.reagents.add_reagent("phosphorus", 25)
B2.reagents.add_reagent("sugar", 25)

beakers += B1
beakers += B2
icon_state = "grenade"

/obj/item/weapon/grenade/chem_grenade/cleaner
name = "Cleaner Grenade"
desc = "BLAM!-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas."
Expand Down
9 changes: 9 additions & 0 deletions code/game/objects/structures/crates_lockers/crates.dm
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,15 @@
icon_opened = "secgearcrateopen"
icon_closed = "secgearcrate"

/obj/structure/closet/crate/secure/hydrosec
desc = "A crate with a lock on it, painted in the scheme of the station's botanists."
name = "secure hydroponics crate"
icon = 'icons/obj/storage.dmi'
icon_state = "hydrosecurecrate"
density = 1
icon_opened = "hydrosecurecrateopen"
icon_closed = "hydrosecurecrate"

/obj/structure/closet/crate/secure/bin
desc = "A secure bin."
name = "Secure bin"
Expand Down
Binary file modified icons/mob/back.dmi
Binary file not shown.
Binary file modified icons/mob/items_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/items_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/bureaucracy.dmi
Binary file not shown.
Binary file modified icons/obj/storage.dmi
Binary file not shown.
Binary file modified icons/obj/weapons.dmi
Binary file not shown.

0 comments on commit ffe7bc7

Please sign in to comment.