cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-17 10:03:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12

Browse Source
This commit is contained in:
caelaislinn
2012-07-01 19:44:34 +10:00
parent a8c727ba1a 75e162c615
commit cfb1bf3111
15 changed files with 6183 additions and 6149 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+19
View File
@@ -158,6 +158,7 @@
new /obj/item/weapon/reagent_containers/pill/fluff/listermed( src )
new /obj/item/weapon/reagent_containers/pill/fluff/listermed( src )
new /obj/item/weapon/reagent_containers/pill/fluff/listermed( src )
/obj/item/weapon/reagent_containers/pill/fluff/listermed
name = "anti-depressant pill"
desc = "Used to deal with depression."
@@ -167,6 +168,18 @@
reagents.add_reagent("stoxin", 5)
reagents.add_reagent("sugar", 10)
reagents.add_reagent("ethanol", 5)
/obj/item/clothing/mask/fluff/electriccig //CubeJackal: Barry Sharke
name = "Electronic cigarette"
desc = "An electronic cigarette. Most of the relief of a real cigarette with none of the side effects. Often used by smokers who are trying to quit the habit."
icon = 'custom_items.dmi'
icon_state = "cigon"
throw_speed = 0.5
item_state = "ciglit"
w_class = 1
body_parts_covered = null
flags = FPRINT|TABLEPASS
//////////////////////////////////
//////////// Clothing ////////////
//////////////////////////////////
@@ -261,6 +274,12 @@
item_state = "leatherjack"
color = "leatherjack"
/obj/item/clothing/suit/storage/labcoat/fluff/burnt //Jamini: Edwin Atweeke
name = "burnt labcoat"
desc = "This lab coat has clearly seen better, less burnt, days."
icon = 'custom_items.dmi'
icon_state = "labcoat_burnt_open"
//////////// Uniforms ////////////
/obj/item/clothing/under/fluff/jumpsuitdown //searif: Yuki Matsuda