I added in three new clothing pieces. A chicken suit, a Holidaypriest suit and a nurse suit and nurse hat.

I added the holidaypriest suit and the nurse suit and hat to their respective lockers in chapel and Medbay. I also placed the chicken suit in the theatre.

Barman has a new drink named Singulo and Carrot Fries and Meatball spagetti was fixed.

Thanks goes to Farart for all these great sprites. So thanks Farart.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1806 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
firecage@hotmail.com
2011-07-08 20:53:39 +00:00
parent a2dac2c1b5
commit 988f795be2
20 changed files with 6704 additions and 6613 deletions

View File

@@ -2984,4 +2984,21 @@ datum
..()
return
singulo
name = "Singulo"
id = "singulo"
description = "A blue-space beverage!"
reagent_state = LIQUID
on_mob_life(var/mob/living/M as mob)
if(!data) data = 1
data++
M.dizziness +=15
if(data >= 55 && data <115)
if (!M.stuttering) M.stuttering = 1
M.stuttering += 15
else if(data >= 115 && prob(33))
M.confused = max(M:confused+15,15)
..()
return

View File

@@ -932,3 +932,10 @@ datum
result = "bananahonk"
required_reagents = list("banana" = 1, "cream" = 1, "sugar" = 1)
result_amount = 3
singulo
name = "Singulo"
id = "singulo"
result = "singulo"
required_reagents = list("vodka" = 1, "cream" = 1, "milk" = 1, "wine" = 1)
result_amount = 4

View File

@@ -2769,6 +2769,10 @@
icon_state = "bananahonkglass"
name = "Banana Honk"
desc = "A drink from Clown Heaven."
if("singulo")
icon_state = "singulo"
name = "Singulo"
desc = "A blue-space beverage."
else
icon_state ="glass_brown"
name = "Glass of ..what?"

View File

@@ -391,3 +391,9 @@
desc = "A hoodie for the chaplain!!!"
icon_state = "chaplain_hood"
flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES
/obj/item/clothing/head/nursehat
name = "Nurse Hat"
desc = "Smokin'"
icon_state = "nursehat"
flags = FPRINT|TABLEPASS|HEADSPACE

View File

@@ -461,4 +461,13 @@
icon_state = "bluesuit"
item_state = "bluesuit"
color = "bluesuit"
desc = "A classy suit and tie"
desc = "A classy suit and tie"
/obj/item/clothing/under/rank/nursesuit
desc = "Now THIS is hot."
name = "Nurse Suit"
icon_state = "nursesuit"
item_state = "nursesuit"
color = "nursesuit"
permeability_coefficient = 0.50
armor = list(melee = 0, bullet = 0, laser = 2, taser = 2, bomb = 0, bio = 10, rad = 0)

View File

@@ -604,3 +604,20 @@
body_parts_covered = UPPER_TORSO|ARMS
armor = list(melee = 5, bullet = 2, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/suit/suit
name = "Chicken Suit"
desc = "A suit made long ago by the ancient empire KFC."
icon_state = "chickensuit"
item_state = "chickensuit"
body_parts_covered = UPPER_TORSO|ARMS|LOWER_TORSO|LEGS|FEET|HEAD
armor = list(melee = 5, bullet = 2, laser = 2, taser = 2, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/suit/holidaypriest
name = "Holiday Priest"
desc = "This is a nice holiday my son."
icon_state = "holidaypriest"
item_state = "holidaypriest"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS

View File

@@ -40,6 +40,8 @@
new /obj/item/weapon/cartridge/medical( src )
new /obj/item/device/radio/headset/headset_med( src )
new /obj/item/weapon/storage/utilitybelt/medical( src )
new /obj/item/clothing/under/rank/nursesuit ( src )
new /obj/item/clothing/head/nursehat ( src )
return
/obj/secure_closet/CMO/New()
@@ -54,4 +56,6 @@
new /obj/item/clothing/suit/labcoat(src)
new /obj/item/clothing/mask/gas( src )
new /obj/item/device/radio/headset/heads/cmo( src )
new /obj/item/clothing/under/rank/nursesuit ( src )
new /obj/item/clothing/head/nursehat ( src )
return

View File

@@ -84,6 +84,7 @@
new /obj/item/clothing/suit/nun( src )
new /obj/item/clothing/suit/chaplain_hoodie( src )
new /obj/item/clothing/head/chaplain_hood( src )
new /obj/item/clothing/suit/holidaypriest( src )
return
/obj/closet/wardrobe/green/New()

View File

@@ -1028,6 +1028,15 @@
reagents.add_reagent("nutriment", 3)
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/carrotfries
name = "Carrot Fries"
desc = "Tasty fries from fresh Carrots."
icon_state = "carrotfries"
New()
..()
reagents.add_reagent("nutriment", 2)
bitesize = 2
/////////////////////////////////////////////////Sliceable////////////////////////////////////////
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels

View File

@@ -848,7 +848,6 @@
result = /obj/item/weapon/reagent_containers/food/snacks/pastatomato
/datum/recipe/poppypretzel
reagents = list("water" = 20)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/flour,
/obj/item/seeds/poppyseed,
@@ -857,3 +856,20 @@
/obj/item/weapon/reagent_containers/food/snacks/egg,
)
result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel
/datum/recipe/meatballspagetti
reagents = list("water" = 20)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/spagetti,
/obj/item/weapon/reagent_containers/food/snacks/faggot,
/obj/item/weapon/reagent_containers/food/snacks/faggot,
)
result = /obj/item/weapon/reagent_containers/food/snacks/meatballspagetti
/datum/recipe/carrotfries
items = list(
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
/obj/item/weapon/reagent_containers/food/snacks/grown/carrot,
)
result = /obj/item/weapon/reagent_containers/food/snacks/carrotfries

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 88 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 89 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 160 KiB

After

Width:  |  Height:  |  Size: 163 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 131 KiB

After

Width:  |  Height:  |  Size: 132 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

After

Width:  |  Height:  |  Size: 47 KiB

File diff suppressed because it is too large Load Diff