Merged in Erthilo's stuff.

This commit is contained in:
SkyMarshal
2012-03-29 21:11:17 -07:00
71 changed files with 9980 additions and 7140 deletions
+145 -37
View File
@@ -48,7 +48,8 @@
can_hold = list("/obj/item/weapon/dice")
/obj/item/weapon/storage/box
name = "Box"
name = "box"
desc = "It's just an ordinary box."
icon_state = "box"
item_state = "syringe_kit"
@@ -59,34 +60,50 @@
desc = "Full of masks and emergency anesthetic tanks."
/obj/item/weapon/storage/box/syndicate
icon_state = "box_of_doom"
/obj/item/weapon/storage/box/ert
name = "medical box"
desc = "Full of goodness."
icon_state = "implant"
item_state = "syringe_kit"
/obj/item/weapon/storage/cupbox
name = "box of paper cups"
desc = "It has pictures of paper cups on the front."
icon_state = "box"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
New()
..()
new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
/obj/item/weapon/storage/pillbottlebox
name = "pill bottles"
desc = "A box of pill bottles."
name = "box of pill bottles"
desc = "It has pictures of pill bottles on its front."
icon_state = "box"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/blankbox
name = "blank shells"
desc = "A box containing...stuff..."
name = "box of blank shells"
desc = "It has a picture of a gun and several warning symbols on the front."
icon_state = "box"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/backpack/clown
name = "clown's backpack"
desc = "The backpack made by Honk. Co."
name = "Giggles Von Honkerton"
desc = "It's a backpack made by Honk! Co."
icon_state = "clownpack"
/obj/item/weapon/storage/backpack/medic
name = "medic's backpack"
desc = "The backpack used to keep with the sterile environment."
name = "medical backpack"
desc = "It's a backpack especially designed for use in a sterile environment."
icon_state = "medicalpack"
/obj/item/weapon/storage/backpack/medic/full
@@ -102,17 +119,20 @@
/obj/item/weapon/storage/backpack/security
name = "security backpack"
desc = "A very robust backpack."
desc = "It's a very robust backpack."
icon_state = "securitypack"
/obj/item/weapon/storage/backpack/satchel
name = "Satchel"
desc = "A very robust satchel to wear on your back."
name = "satchel"
desc = "It's a very robust satchel to wear on your back."
icon_state = "satchel"
New()
..()
/obj/item/weapon/storage/backpack/bandolier
name = "Bandolier"
desc = "A very old bandolier to wear on your back."
name = "bandolier"
desc = "It's a very old bandolier to wear on your back."
icon_state = "bandolier"
/obj/item/weapon/storage/backpack/medicalsatchel
@@ -122,7 +142,7 @@
/obj/item/weapon/storage/backpack/industrial
name = "industrial backpack"
desc = "A tough backpack for the daily grind"
desc = "It's a tough backpack for the daily grind of station life."
icon_state = "engiepack"
/obj/item/weapon/storage/backpack/industrial/full
@@ -174,7 +194,7 @@
/obj/item/weapon/storage/briefcase
name = "briefcase"
desc = "Used by the lawyer in the court room."
desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
icon_state = "briefcase"
flags = FPRINT | TABLEPASS| CONDUCT
force = 8.0
@@ -184,24 +204,90 @@
max_w_class = 3
max_combined_w_class = 16
/obj/item/weapon/storage/wallet
name = "wallet"
desc = "It can hold a few small and personal things."
storage_slots = 4
icon_state = "wallet"
can_hold = list(
"/obj/item/weapon/spacecash",
"/obj/item/weapon/card",
"/obj/item/clothing/mask/cigarette",
"/obj/item/device/flashlight/pen",
"/obj/item/seeds",
"/obj/item/stack/medical",
"/obj/item/toy/crayon",
"/obj/item/weapon/coin",
"/obj/item/weapon/dice",
"/obj/item/weapon/disk",
"/obj/item/weapon/implanter",
"/obj/item/weapon/lighter",
"/obj/item/weapon/match",
"/obj/item/weapon/paper",
"/obj/item/weapon/pen",
"/obj/item/weapon/photo",
"/obj/item/weapon/reagent_containers/dropper",
"/obj/item/weapon/screwdriver",
"/obj/item/weapon/stamp")
attackby(obj/item/A as obj, mob/user as mob)
..()
update_icon()
return
update_icon()
for(var/obj/item/weapon/card/id/ID in contents)
if(ID.icon_state == "gold")
icon_state = "walletid_gold"
return
else if(ID.icon_state == "id")
icon_state = "walletid"
return
icon_state = "wallet"
proc/get_id()
for(var/obj/item/weapon/card/id/ID in contents)
if(istype(ID))
return ID
/obj/item/weapon/storage/wallet/random/New()
..()
var/item1_type = pick( /obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c20,/obj/item/weapon/spacecash/c200,/obj/item/weapon/spacecash/c50, /obj/item/weapon/spacecash/c500)
var/item2_type
if(prob(50))
item2_type = pick( /obj/item/weapon/spacecash/c10,/obj/item/weapon/spacecash/c100,/obj/item/weapon/spacecash/c1000,/obj/item/weapon/spacecash/c20,/obj/item/weapon/spacecash/c200,/obj/item/weapon/spacecash/c50, /obj/item/weapon/spacecash/c500)
var/item3_type = pick( /obj/item/weapon/coin/silver, /obj/item/weapon/coin/silver, /obj/item/weapon/coin/gold, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron, /obj/item/weapon/coin/iron )
spawn(2)
if(item1_type)
new item1_type(src)
if(item2_type)
new item2_type(src)
if(item3_type)
new item3_type(src)
/obj/item/weapon/storage/disk_kit
name = "data disks"
desc = "For disks."
name = "box of data disks"
desc = "It has a picture of a data disk on it."
icon_state = "id"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/disk_kit/disks
/obj/item/weapon/storage/disk_kit/disks2
/obj/item/weapon/storage/fcard_kit
name = "Fingerprint Cards"
desc = "This contains cards which are used to take fingerprints."
name = "box of fingerprint cards"
desc = "It has a picture of a fingerprint on each of its faces."
icon_state = "id"
item_state = "syringe_kit"
/obj/item/weapon/storage/firstaid
name = "First-Aid"
name = "first-aid kit"
desc = "In case of injury."
icon_state = "firstaid"
throw_speed = 2
@@ -209,7 +295,7 @@
var/empty = 0
/obj/item/weapon/storage/firstaid/fire
name = "Fire First Aid"
name = "fire first-aid kit"
desc = "Contains burn treatments."
icon_state = "ointment"
item_state = "firstaid-ointment"
@@ -240,60 +326,78 @@
desc = "<FONT color=red><B>WARNING: Do not use without reading these preautions!</B></FONT>\n<B>These devices are extremely dangerous and can cause blindness or deafness if used incorrectly.</B>\nThe chemicals contained in these devices have been tuned for maximal effectiveness and due to\nextreme safety precuaiotn shave been incased in a tamper-proof pack. DO NOT ATTEMPT TO OPEN\nFLASH WARNING: Do not use continually. Excercise extreme care when detonating in closed spaces.\n\tMake attemtps not to detonate withing range of 2 meters of the intended target. It is imperative\n\tthat the targets visit a medical professional after usage. Damage to eyes increases extremely per\n\tuse and according to range. Glasses with flash resistant filters DO NOT always work on high powered\n\tflash devices such as this. <B>EXERCISE CAUTION REGARDLESS OF CIRCUMSTANCES</B>\nSOUND WARNING: Do not use continually. Visit a medical professional if hearing is lost.\n\tThere is a slight chance per use of complete deafness. Exercise caution and restraint.\nSTUN WARNING: If the intended or unintended target is too close to detonation the resulting sound\n\tand flash have been known to cause extreme sensory overload resulting in temporary\n\tincapacitation.\n<B>DO NOT USE CONTINUALLY</B>\nOperating Directions:\n\t1. Pull detonnation pin. <B>ONCE THE PIN IS PULLED THE GRENADE CAN NOT BE DISARMED!</B>\n\t2. Throw grenade. <B>NEVER HOLD A LIVE FLASHBANG</B>\n\t3. The grenade will detonste 10 seconds hafter being primed. <B>EXCERCISE CAUTION</B>\n\t-<B>Never prime another grenade until after the first is detonated</B>\nNote: Usage of this pyrotechnic device without authorization is an extreme offense and can\nresult in severe punishment upwards of <B>10 years in prison per use</B>.\n\nDefault 3 second wait till from prime to detonation. This can be switched with a screwdriver\nto 10 seconds.\n\nCopyright of Nanotrasen Industries- Military Armnaments Division\nThis device was created by Nanotrasen Labs a member of the Expert Advisor Corporation"
icon_state = "flashbang"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/emp_kit
name = "emp grenades"
desc = "A box with 5 emp grenades."
icon_state = "flashbang"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/gl_kit
name = "Prescription Glasses"
desc = "This box contains vision correcting glasses."
desc = "This box contains vison correcting glasses."
icon_state = "glasses"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/seccart_kit
name = "Spare R.O.B.U.S.T. Cartridges"
desc = "A box full of R.O.B.U.S.T. Cartridges, used by Security."
icon = 'pda.dmi'
icon_state = "pdabox"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/handcuff_kit
name = "Spare Handcuffs"
desc = "A box full of handcuffs."
icon_state = "handcuff"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/id_kit
name = "Spare IDs"
desc = "Has so many blank IDs."
desc = "Has many empty IDs."
icon_state = "id"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/lglo_kit
name = "Latex Gloves"
desc = "Contains white gloves."
icon_state = "latex"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/injectbox
name = "DNA-Injectors"
desc = "This box contains injectors, it seems."
desc = "This box contains injectors it seems."
icon_state = "box"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/stma_kit
name = "Sterile Masks"
desc = "This box contains masks of +2 constitution." //I made it better. --SkyMarshal
icon_state = "mask"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/trackimp_kit
name = "Tracking Implant Kit"
desc = "Box full of tracking utensils."
desc = "Box full of tracking implants."
icon_state = "implant"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/chemimp_kit
name = "Chemical Implant Kit"
desc = "Box of stuff used to implant chemicals."
icon_state = "implant"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/deathalarm_kit
name = "Death Alarm Kit"
@@ -351,6 +455,7 @@
/obj/item/weapon/storage/toolbox/electrical
name = "electrical toolbox"
desc = "A toolbox for holding tools about electronics."
icon_state = "yellow"
item_state = "toolbox_yellow"
@@ -362,7 +467,7 @@
item_state = "syringe_kit"
/obj/item/weapon/storage/toolbox/syndicate
name = "Suspicious looking toolbox"
name = "suspicious looking toolbox"
desc = "You have no idea what this is."
icon_state = "syndicate"
item_state = "toolbox_syndi"
@@ -403,25 +508,28 @@
icon_state ="koran"
/obj/item/weapon/storage/mousetraps
name = "Pest-B-Gon Mousetraps"
desc = "WARNING: Keep out of reach of children."
name = "box of Pest-B-Gon Mousetraps"
desc = "<B><FONT=red>WARNING:</FONT></B> <I>Keep out of reach of children</I>."
icon_state = "mousetraps"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/donkpocket_kit
name = "Donk-Pockets"
desc = "Remember to fully heat prior to serving. Product will cool if not eaten within seven minutes."
name = "box of donk-pockets"
desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
icon_state = "donk_kit"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/condimentbottles
name = "Condiment Bottles"
desc = "A box of empty condiment bottles."
name = "box of condiment bottles"
desc = "It has a large ketchup smear on it."
icon_state = "box"
item_state = "syringe_kit"
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
/obj/item/weapon/storage/drinkingglasses
name = "Drinking Glasses"
desc = "A box of clean drinking glasses"
name = "box of drinking glasses"
desc = "It has a picture of drinking glasses on it."
icon_state = "box"
item_state = "syringe_kit"
item_state = "syringe_kit"
+225 -83
View File
@@ -3,7 +3,7 @@
icon = 'weapons.dmi'
/obj/item/weapon/offhand
name = "Offhand"
name = "offhand"
var/linked_weapon_name = ""
w_class = 5.0
icon_state = "offhand"
@@ -13,7 +13,7 @@
/obj/item/weapon/shield/riot
name = "riot shield"
desc = "A shield adept at blocking blunt objects."
desc = "A shield adept at blocking blunt objects from connecting with the torso of the shield wielder."
icon = 'weapons.dmi'
icon_state = "riot"
flags = FPRINT | TABLEPASS| CONDUCT| ONBACK
@@ -29,15 +29,27 @@
IsShield()
return 1
/obj/item/weapon/nullrod
name = "null rod"
desc = "A rod of pure obsidian, its very presence disrupts and dampens the powers of Nar-Sie's followers."
icon_state = "nullrod"
item_state = "nullrod"
flags = FPRINT | ONBELT | TABLEPASS
force = 15
throw_speed = 1
throw_range = 4
throwforce = 10
w_class = 1
/*/obj/item/weapon/sord
name = "SORD"
name = "\improper SORD"
desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
icon_state = "sord"
item_state = "sord"
flags = FPRINT | ONBELT | TABLEPASS
force = 2
throwforce = 1
w_class = 3 */
w_class = 3*/
/obj/item/weapon/claymore
name = "claymore"
@@ -47,7 +59,7 @@
flags = FPRINT | ONBELT | TABLEPASS
force = 40
throwforce = 10
w_class = 3.0
w_class = 3
IsShield()
return 1
@@ -68,7 +80,7 @@
origin_tech = "materials=2"
/obj/item/weapon/rsf
name = "Rapid-Service-Fabricator (RSF)"
name = "\improper Rapid-Service-Fabricator"
desc = "A device used to rapidly deploy service items."
icon = 'items.dmi'
icon_state = "rcd"
@@ -81,7 +93,7 @@
w_class = 3.0
/obj/item/weapon/rsp
name = "Rapid-Seed-Producer (RSP)"
name = "\improper Rapid-Seed-Producer"
desc = "A device used to rapidly deploy seeds."
icon = 'items.dmi'
icon_state = "rcd"
@@ -94,7 +106,7 @@
w_class = 3.0
/obj/item/weapon/rcd_ammo
name = "Compressed matter cartridge"
name = "compressed matter cartridge"
desc = "Highly compressed matter for the RCD."
icon = 'ammo.dmi'
icon_state = "rcd"
@@ -108,12 +120,13 @@
var/ammo = 10
/obj/item/weapon/rcd_ammo/large
name = "Super compressed matter cartridge"
name = "super compressed matter cartridge"
ammo = 30
/obj/item/weapon/spacecash
name = "Space Cash"
desc = "You're rich, bitch!"
name = "space cash"
desc = "It's worth 1 credit."
gender = PLURAL
icon = 'items.dmi'
icon_state = "spacecash"
opacity = 0
@@ -130,25 +143,31 @@
/obj/item/weapon/spacecash/c10
icon_state = "spacecash10"
access = access_crate_cash
desc = "It's worth 10 credits."
/obj/item/weapon/spacecash/c20
icon_state = "spacecash20"
access = access_crate_cash
desc = "It's worth 20 credits."
/obj/item/weapon/spacecash/c50
icon_state = "spacecash50"
access = access_crate_cash
desc = "It's worth 50 credits."
/obj/item/weapon/spacecash/c100
icon_state = "spacecash100"
access = access_crate_cash
desc = "It's worth 100 credits."
/obj/item/weapon/spacecash/c200
icon_state = "spacecash200"
access = access_crate_cash
desc = "It's worth 200 credits."
/obj/item/weapon/spacecash/c500
icon_state = "spacecash500"
access = access_crate_cash
desc = "It's worth 500 credits."
/obj/item/weapon/spacecash/c1000
icon_state = "spacecash1000"
access = access_crate_cash
desc = "It's worth 1000 credits."
/obj/item/device/mass_spectrometer
desc = "A hand-held mass spectrometer which identifies trace chemicals in a blood sample."
@@ -174,7 +193,7 @@
origin_tech = "magnets=4;biotech=2"
/obj/item/weapon/melee/baton
name = "Stun Baton"
name = "stun baton"
desc = "The police baton of the future."
icon_state = "stunbaton"
item_state = "baton"
@@ -188,7 +207,7 @@
origin_tech = "combat=2"
/*/obj/item/weapon/melee/chainofcommand
name = "Chain of Command"
name = "chain of command"
desc = "The Captain is first and all other heads are last."
icon_state = "chainofcommand"
item_state = "chainofcommand"
@@ -199,13 +218,13 @@
var/charges = 50.0
var/maximum_charges = 50.0
var/status = 1
origin_tech = "combat=4" */
origin_tech = "combat=4"*/
/obj/item/weapon/melee/energy
var/active = 0
/obj/item/weapon/melee/energy/axe
name = "Axe"
name = "energy axe"
desc = "An energised battle axe."
icon_state = "axe0"
force = 40.0
@@ -219,7 +238,7 @@
/obj/item/weapon/melee/energy/sword
var/color
name = "energy sword"
desc = "It cuts AND cooks at the same time!."
desc = "It cuts AND cooks at the same time!"
icon_state = "sword0"
force = 3.0
throwforce = 5.0
@@ -252,7 +271,7 @@
var/datum/effect/effect/system/spark_spread/spark_system
/obj/item/weapon/bananapeel
name = "Banana Peel"
name = "banana peel"
desc = "A peel from a banana."
icon = 'items.dmi'
icon_state = "banana_peel"
@@ -263,8 +282,9 @@
throw_range = 20
/obj/item/weapon/soap
name = "Soap"
name = "soap"
desc = "A cheap bar of soap. Doesn't smell."
gender = PLURAL
icon = 'items.dmi'
icon_state = "soap"
w_class = 1.0
@@ -362,7 +382,7 @@
color = "brown"
/obj/item/weapon/bikehorn
name = "Bike Horn"
name = "bike horn"
desc = "A horn off of a bicycle."
icon = 'items.dmi'
icon_state = "bike_horn"
@@ -404,6 +424,7 @@
/obj/item/stack/medical/ointment
name = "ointment"
desc = "Used to treat those nasty burns."
gender = PLURAL
singular_name = "ointment"
icon_state = "ointment"
heal_burn = 1
@@ -419,19 +440,23 @@
/obj/item/stack/medical/advanced/bruise_pack
name = "advanced trauma kit"
singular_name = "advanced bruise pack"
singular_name = "advanced trauma kit"
desc = "An advanced trauma kit for severe injuries."
icon_state = "brutepack"
icon_state = "traumakit"
heal_brute = 1
origin_tech = "biotech=1"
amount = 10
max_amount = 10
/obj/item/stack/medical/advanced/ointment
name = "advanced burn kit"
singular_name = "advanced burn kit"
desc = "An advanced treatment kit for severe burns."
icon_state = "ointment"
icon_state = "burnkit"
heal_burn = 1
origin_tech = "biotech=1"
amount = 10
max_amount = 10
/obj/item/weapon/c_tube
name = "cardboard tube"
@@ -452,6 +477,92 @@
w_class = 2.0
origin_tech = "magnets=1"
/obj/item/weapon/card
name = "card"
desc = "Does card things."
icon = 'card.dmi'
w_class = 1.0
var/list/files = list( )
/obj/item/weapon/card/data
name = "data disk"
desc = "A disk of data."
icon_state = "data"
var/function = "storage"
var/data = "null"
var/special = null
item_state = "card-id"
/obj/item/weapon/card/data/clown
name = "coordinates to clown planet"
icon_state = "data"
item_state = "card-id"
layer = 3
level = 2
desc = "This card contains coordinates to the fabled Clown Planet. Handle with care."
function = "teleporter"
data = "Clown Land"
/obj/item/weapon/card/emag
desc = "An identification card. Seems to have some funny chip on it, though."
name = "modified identification card"
icon_state = "emag"
item_state = "card-id"
origin_tech = "magnets=2;syndicate=2"
var/uses = 5
/obj/item/weapon/card/id
name = "identification card"
desc = "An identification card."
icon_state = "id"
item_state = "card-id"
var/access = list()
var/registered_name = null
var/assignment = null
var/obj/item/weapon/photo/PHOTO = null
var/over_jumpsuit = 1 // If set to 0, it won't display on top of the mob's jumpsuit
var/dorm = 0 // determines if this ID has claimed a dorm already
/obj/item/weapon/card/id/gold
name = "identification card"
desc = "A golden card which shows authority."
icon_state = "gold"
item_state = "gold_id"
/obj/item/weapon/card/id/syndicate
name = "agent card"
desc = "Shhhhh."
access = list(access_maint_tunnels)
origin_tech = "syndicate=3"
/obj/item/weapon/card/id/syndicate_command
name = "syndicate ID card"
desc = "An ID straight from the Syndicate."
registered_name = "Syndicate"
assignment = "Syndicate Overlord"
access = list(access_syndicate)
/obj/item/weapon/card/id/captains_spare
name = "captain's spare ID"
desc = "The spare ID of the Captain himself."
icon_state = "gold"
item_state = "gold_id"
registered_name = "Captain"
assignment = "Captain"
New()
access = get_access("Captain")
..()
/obj/item/weapon/card/id/centcom
name = "\improper CentCom. ID"
desc = "An ID straight from Cent. Com."
icon_state = "centcom"
registered_name = "Central Command"
assignment = "General"
New()
access = get_all_centcom_access()
..()
/obj/item/weapon/cleaner
desc = "A chemical that cleans messes."
@@ -586,7 +697,7 @@
/obj/item/weapon/fireaxe // DEM AXES MAN, marker -Agouri
icon_state = "fireaxe0"
name = "Fire axe"
name = "fire axe"
desc = "A tool for breaking down those obstructions that stop you from fighting that fire." //Less ROBUST. --SkyMarshal
force = 5
w_class = 4.0
@@ -616,7 +727,7 @@
icon = 'items.dmi'
/obj/item/weapon/disk/nuclear
name = "Nuclear Authentication Disk"
name = "nuclear authentication disk"
desc = "Better keep this safe, it can activate the nuke."
icon_state = "nucleardisk"
item_state = "card-id"
@@ -646,7 +757,7 @@
m_amt = 90
/obj/item/weapon/f_card
name = "Finger Print Card"
name = "finger print card"
desc = "Used to take fingerprints."
icon = 'card.dmi'
icon_state = "fingerprint0"
@@ -659,7 +770,7 @@
/obj/item/weapon/fcardholder
name = "Finger Print Case"
name = "fingerprint card case"
desc = "Holds fingerprint cards."
icon = 'items.dmi'
icon_state = "fcardholder0"
@@ -726,6 +837,7 @@
/obj/item/weapon/handcuffs
name = "handcuffs"
desc = "Use this to keep prisoners in line."
gender = PLURAL
icon = 'items.dmi'
icon_state = "handcuff"
flags = FPRINT | TABLEPASS | CONDUCT | ONBELT
@@ -786,6 +898,10 @@
w_class = 2.0
flags = FPRINT | TABLEPASS
/obj/item/weapon/caution/cone
desc = "This cone is trying to warn you of something!"
name = "warning cone"
icon_state = "cone"
/obj/item/weapon/paper
name = "Paper"
@@ -801,7 +917,6 @@
var/list/stamped
var/see_face = 1
var/body_parts_covered = HEAD
protective_temperature = T0C + 10
var/heat_transfer_coefficient = 0.99
var/gas_transfer_coefficient = 1
var/permeability_coefficient = 0.99
@@ -809,7 +924,8 @@
var/iteration
/obj/item/weapon/directions
name = "Crumpled Paper"
name = "crumpled paper"
gender = PLURAL
desc = "This is a crumpled piece of paper."
icon = 'weapons.dmi'
icon_state = "crumpled"
@@ -823,7 +939,7 @@
name = "paper - 'Judgement'"
info = "For crimes against the station, the offender is sentenced to:<BR>\n<BR>\n"
/obj/item/weapon/paper/certificate //What is this? -Kaleb702
/obj/item/weapon/paper/certificate
name = "paper - 'Certificate'"
info = "Due to this person's unique actions in the past, we hereby certify that they are \"Totally Radical\"<br><br>----<b>Central Command</b><BR><i>This paper has been stamped with the central command rubber stamp.</i><BR>"
stamped = list(/obj/item/weapon/stamp/centcom)
@@ -895,8 +1011,8 @@
name = "multicolor pen"
/obj/item/weapon/banhammer
desc = "A banhammer."
name = "Banhammer"
desc = "A banhammer"
name = "banhammer"
icon = 'items.dmi'
icon_state = "toyhammer"
flags = FPRINT | ONBELT | TABLEPASS
@@ -924,8 +1040,8 @@
m_amt = 3750
/obj/item/weapon/rubber_chicken
name = "Rubber Chicken"
desc = "A rubber chicken. Isn't that hilarious?"
name = "rubber chicken"
desc = "A rubber chicken, isn't that hilarious?"
icon = 'items.dmi'
icon_state = "rubber_chicken"
item_state = "rubber_chicken"
@@ -933,7 +1049,7 @@
/obj/item/weapon/screwdriver
name = "screwdriver"
desc = "You can be totally screwy with this."
desc = "Used for screwing."
icon = 'items.dmi'
icon_state = "screwdriver"
flags = FPRINT | TABLEPASS| CONDUCT
@@ -957,8 +1073,8 @@
g_amt = 3750
/obj/item/weapon/SWF_uplink
name = "station bounced radio"
desc = "Used to communicate it appears."
name = "station-bounced radio"
desc = "used to comunicate it appears."
icon = 'radio.dmi'
icon_state = "radio"
var/temp = null
@@ -988,6 +1104,7 @@
var/temp = null
var/spell_type = "verb"
var/max_uses = 5
var/op = 1
/obj/item/weapon/spellbook/object_type_spells //used for giving out object spells as opposed to verb spells
spell_type = "object"
@@ -1021,6 +1138,7 @@
/obj/item/weapon/table_parts
name = "table parts"
desc = "Parts of a table. Poor table."
gender = PLURAL
icon = 'items.dmi'
icon_state = "table_parts"
m_amt = 3750
@@ -1041,7 +1159,7 @@
flags = null
/obj/item/weapon/teleportation_scroll
name = "Teleportation Scroll"
name = "scroll of teleportation"
desc = "A scroll for moving around."
icon = 'wizard.dmi'
icon_state = "scroll"
@@ -1092,7 +1210,7 @@
var/minor_fault = 0 //If not 100% reliable, it will build up faults.
/obj/item/weapon/cell/crap
name = "Nanotrasen Brand Rechargable AA Battery"
name = "\improper NanoTrasen Brand Rechargable AA Battery"
desc = "You can't top the plasma top." //TOTALLY TRADEMARK INFRINGEMENT
origin_tech = "powerstorage=0"
maxcharge = 500
@@ -1106,7 +1224,7 @@
/obj/item/weapon/cell/super
name = "super-capacity power cell"
origin_tech = "powerstorage=3"
origin_tech = "powerstorage=5"
maxcharge = 20000
g_amt = 70
@@ -1125,7 +1243,7 @@
return 1
/*/obj/item/weapon/cell/potato
name = "Potato Battery" // This needs more Portal 2 refs. -Kaleb702
name = "Potato Battery"
desc = "A rechargable starch based power cell."
icon = 'harvest.dmi'
icon_state = "potato_battery"
@@ -1180,7 +1298,7 @@
g_amt = 50
/obj/item/weapon/module/id_auth
name = "ID authentication module"
name = "\improper ID authentication module"
icon_state = "id_mod"
desc = "A module allowing secure authorization of ID cards."
@@ -1228,7 +1346,7 @@
w_class = 3.0
/obj/item/weapon/kitchenknife
name = "Kitchen knife"
name = "kitchen knife"
icon = 'kitchen.dmi'
icon_state = "knife"
desc = "A general purpose Chef's Knife made by SpaceCook Incorporated. Guaranteed to stay sharp for years to come."
@@ -1242,7 +1360,7 @@
origin_tech = "materials=1"
/obj/item/weapon/butch
name = "Butcher's Cleaver"
name = "butcher's cleaver"
icon = 'kitchen.dmi'
icon_state = "butch"
desc = "A huge thing used for chopping and chopping up meat."
@@ -1256,10 +1374,10 @@
origin_tech = "materials=1"
/obj/item/weapon/tray
name = "Tray"
name = "tray"
icon = 'food.dmi'
icon_state = "tray"
desc = "A plastic tray to lay food on."
desc = "A tray to lay food on."
throwforce = 12.0
throwforce = 10.0
throw_speed = 1
@@ -1392,7 +1510,7 @@
origin_tech = "materials=1;biotech=1"
/obj/item/weapon/syntiflesh
name = "Syntiflesh"
name = "syntiflesh"
desc = "Meat that appears...strange..."
icon = 'food.dmi'
icon_state = "meat"
@@ -1400,6 +1518,20 @@
w_class = 1.0
origin_tech = "biotech=2"
/*/obj/item/weapon/hatchet
name = "hatchet"
desc = "A very sharp axe blade upon a short fibremetal handle. It has a long history of chopping things, but now it is used for chopping wood."
icon = 'weapons.dmi'
icon_state = "hatchet"
flags = FPRINT | TABLEPASS | CONDUCT
force = 12.0
w_class = 1.0
throwforce = 15.0
throw_speed = 4
throw_range = 4
m_amt = 15000
origin_tech = "materials=2;combat=1"*/
/obj/item/weapon/stamp
desc = "A rubber stamp for stamping important documents."
name = "rubber stamp"
@@ -1499,8 +1631,17 @@
name = "d6"
desc = "A dice with six sides."
var/sides = 6
icon_state = "dice"
item_state = "dice"
icon = 'dice.dmi'
icon_state = "d66"
/obj/item/weapon/dice/New()
icon_state = "[name][rand(sides)]"
/obj/item/weapon/dice/d20 // -- TLE
name = "d20"
desc = "A dice with twenty sides."
sides = 20
icon_state = "d2020"
/obj/item/weapon/dice/d8 // -- SkyMarshal
name = "d8"
@@ -1515,14 +1656,6 @@
sides = 12
icon_state = "d20"
item_state = "dice"
/obj/item/weapon/dice/d20 // -- TLE
name = "d20"
desc = "A dice with...hell, that is a lot of sides."
sides = 20
icon_state = "d20"
item_state = "dice"
/obj/item/weapon/pai_cable
desc = "A flexible coated cable with a universal jack on one end."
desc = "Some spacey cable."
@@ -1532,8 +1665,9 @@
var/obj/machinery/machine
/obj/item/weapon/plastique
name = "Plastic Explosives"
name = "plastic explosives"
desc = "Used to put holes in specific areas without too much extra hole."
gender = PLURAL
icon = 'assemblies.dmi'
icon_state = "plastic-explosive0"
item_state = "plasticx"
@@ -1548,6 +1682,7 @@
/obj/item/weapon/stock_parts
name = "stock part"
desc = "What?"
gender = PLURAL
icon = 'stock_parts.dmi'
w_class = 2.0
var/rating = 1
@@ -1558,14 +1693,14 @@
//Rank 1
/obj/item/weapon/stock_parts/console_screen
name = "Console Screen"
name = "console screen"
desc = "Used in the construction of computers and other devices with a interactive console."
icon_state = "screen"
origin_tech = "materials=1"
g_amt = 200
/obj/item/weapon/stock_parts/capacitor
name = "Capacitor"
name = "capacitor"
desc = "A basic capacitor used in the construction of a variety of devices."
icon_state = "capacitor"
origin_tech = "powerstorage=1"
@@ -1573,7 +1708,7 @@
g_amt = 50
/obj/item/weapon/stock_parts/scanning_module
name = "Scanning Module"
name = "scanning module"
desc = "A compact, high resolution scanning module used in the construction of certain devices."
icon_state = "scan_module"
origin_tech = "magnets=1"
@@ -1581,14 +1716,14 @@
g_amt = 20
/obj/item/weapon/stock_parts/manipulator
name = "Micro-Manipulator"
name = "micro-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "micro_mani"
origin_tech = "materials=1;programming=1"
m_amt = 30
/obj/item/weapon/stock_parts/micro_laser
name = "Micro-laser"
name = "micro-laser"
desc = "A tiny laser used in certain devices."
icon_state = "micro_laser"
origin_tech = "magnets=1"
@@ -1596,7 +1731,7 @@
g_amt = 20
/obj/item/weapon/stock_parts/matter_bin
name = "Matter Bin"
name = "matter bin"
desc = "A container for hold compressed matter awaiting re-construction."
icon_state = "matter_bin"
origin_tech = "materials=1"
@@ -1605,7 +1740,7 @@
//Rank 2
/obj/item/weapon/stock_parts/capacitor/adv
name = "Advanced Capacitor"
name = "advanced capacitor"
desc = "An advanced capacitor used in the construction of a variety of devices."
origin_tech = "powerstorage=3"
rating = 2
@@ -1613,7 +1748,7 @@
g_amt = 50
/obj/item/weapon/stock_parts/scanning_module/adv
name = "Advanced Scanning Module"
name = "advanced scanning module"
desc = "A compact, high resolution scanning module used in the construction of certain devices."
icon_state = "scan_module"
origin_tech = "magnets=3"
@@ -1622,7 +1757,7 @@
g_amt = 20
/obj/item/weapon/stock_parts/manipulator/nano
name = "Nano-Manipulator"
name = "nano-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
icon_state = "micro_mani"
origin_tech = "materials=3,programming=2"
@@ -1630,7 +1765,7 @@
m_amt = 30
/obj/item/weapon/stock_parts/micro_laser/high
name = "High-Power Micro-laser"
name = "high-power micro-laser"
desc = "A tiny laser used in certain devices."
icon_state = "micro_laser"
origin_tech = "magnets=3"
@@ -1639,7 +1774,7 @@
g_amt = 20
/obj/item/weapon/stock_parts/matter_bin/adv
name = "Advanced Matter Bin"
name = "advanced matter bin"
desc = "A container for hold compressed matter awaiting re-construction."
icon_state = "matter_bin"
origin_tech = "materials=3"
@@ -1649,15 +1784,15 @@
//Rating 3
/obj/item/weapon/stock_parts/capacitor/super
name = "Super Capacitor"
name = "super capacitor"
desc = "A super-high capacity capacitor used in the construction of a variety of devices."
origin_tech = "powerstorage=5;materials=4"
origin_tech = "powerstorage=3;materials=4"
rating = 3
m_amt = 50
g_amt = 50
/obj/item/weapon/stock_parts/scanning_module/phasic
name = "Phasic Scanning Module"
name = "phasic scanning module"
desc = "A compact, high resolution phasic scanning module used in the construction of certain devices."
origin_tech = "magnets=5"
rating = 3
@@ -1665,14 +1800,14 @@
g_amt = 20
/obj/item/weapon/stock_parts/manipulator/pico
name = "Pico-Manipulator"
name = "pico-manipulator"
desc = "A tiny little manipulator used in the construction of certain devices."
origin_tech = "materials=5,programming=2"
rating = 3
m_amt = 30
/obj/item/weapon/stock_parts/micro_laser/ultra
name = "Ultra-High-Power Micro-laser"
name = "ultra-high-power micro-laser"
desc = "A tiny laser used in certain devices."
origin_tech = "magnets=5"
rating = 3
@@ -1680,7 +1815,7 @@
g_amt = 20
/obj/item/weapon/stock_parts/matter_bin/super
name = "Super Matter Bin"
name = "super matter bin"
desc = "A container for hold compressed matter awaiting re-construction."
origin_tech = "materials=5"
rating = 3
@@ -1689,7 +1824,7 @@
// Subspace stock parts
/obj/item/weapon/stock_parts/subspace/ansible
name = "Subspace Ansible"
name = "subspace ansible"
icon_state = "subspace_ansible"
desc = "A compact module capable of sensing extradimensional activity."
origin_tech = "programming=3;magnets=5;materials=4;bluespace=2"
@@ -1697,7 +1832,7 @@
g_amt = 10
/obj/item/weapon/stock_parts/subspace/filter
name = "Hyperwave Filter"
name = "hyperwave filter"
icon_state = "hyperwave_filter"
desc = "A tiny device capable of filtering and converting super-intense radiowaves."
origin_tech = "programming=4;magnets=2"
@@ -1705,7 +1840,7 @@
g_amt = 10
/obj/item/weapon/stock_parts/subspace/amplifier
name = "Subspace Amplifier"
name = "subspace amplifier"
icon_state = "subspace_amplifier"
desc = "A compact micro-machine capable of amplifying weak subspace transmissions."
origin_tech = "programming=3;magnets=4;materials=4;bluespace=2"
@@ -1713,7 +1848,7 @@
g_amt = 10
/obj/item/weapon/stock_parts/subspace/treatment
name = "Subspace Treatment Disk"
name = "subspace treatment disk"
icon_state = "treatment_disk"
desc = "A compact micro-machine capable of stretching out hyper-compressed radio waves."
origin_tech = "programming=3;magnets=2;materials=5;bluespace=2"
@@ -1721,7 +1856,7 @@
g_amt = 10
/obj/item/weapon/stock_parts/subspace/analyzer
name = "Subspace Wavelength Analyzer"
name = "subspace wavelength analyzer"
icon_state = "wavelength_analyzer"
desc = "A sophisticated analyzer capable of analyzing cryptic subspace wavelengths."
origin_tech = "programming=3;magnets=4;materials=4;bluespace=2"
@@ -1729,15 +1864,22 @@
g_amt = 10
/obj/item/weapon/stock_parts/subspace/crystal
name = "Ansible Crystal"
name = "ansible crystal"
icon_state = "ansible_crystal"
desc = "A crystal made from pure glass used to transmit laser databursts to subspace."
origin_tech = "magnets=4;materials=4;bluespace=2"
g_amt = 50
/obj/item/weapon/stock_parts/subspace/transmitter
name = "Subspace Transmitter"
name = "subspace transmitter"
icon_state = "subspace_transmitter"
desc = "A large piece of equipment used to open a window into the subspace dimension."
origin_tech = "magnets=5;materials=5;bluespace=3"
m_amt = 50
m_amt = 50
/obj/item/weapon/ectoplasm
name = "ectoplasm"
desc = "spooky"
gender = PLURAL
icon = 'wizard.dmi'
icon_state = "ectoplasm"