Glorious Return Update:

- Adjusted OnConsume proc in food so that it occurs before the check to see if the item is finished (so that you can do triggers whenever you take a bite rather then only when it's completely eaten). Adjusted existing food items so that they still work the same.
- Eating popcorn now has a random chance of having the user accidentally bite on an un-popped kernel. This doesn't do anything other then give the user a message though.
- Kabobs now return the bar used to make them.
- New atom flag: NOREACT. Reagents stored in objects, mobs, and turfs that have this flag do not react. Right now, only the microwave and mobs have this effect (only mobs had this effect before). It's intended to simplify devices that use reagents. ADMIN NOTE: You can remove this flag from people if you feel like being a dick.
- NOREACT flag automatically gets removed on death. (Commented out for now)
- Removed a flag on certain mobs that wasn't actually doing anything.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1459 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
morikou@gmail.com
2011-04-17 02:02:24 +00:00
parent 1bfcf3875f
commit 6809b02dfd
10 changed files with 54 additions and 24 deletions
+41 -14
View File
@@ -33,11 +33,12 @@
icon_state = "banana"
item_state = "banana"
On_Consume()
var/mob/M = usr
var/obj/item/weapon/bananapeel/W = new /obj/item/weapon/bananapeel( M )
M << "\blue You peel the banana."
M.put_in_hand(W)
W.add_fingerprint(M)
if(!reagents.total_volume)
var/mob/M = usr
var/obj/item/weapon/bananapeel/W = new /obj/item/weapon/bananapeel( M )
M << "\blue You peel the banana."
M.put_in_hand(W)
W.add_fingerprint(M)
New()
..()
reagents.add_reagent("banana", 5)
@@ -469,6 +470,12 @@
..()
reagents.add_reagent("nutriment", 8)
bitesize = 2
On_Consume()
if(!reagents.total_volume)
var/mob/M = usr
var/obj/item/stack/rods/W = new /obj/item/stack/rods( M )
M << "\blue You lick clean the rod."
M.put_in_hand(W)
/obj/item/weapon/reagent_containers/food/snacks/monkeykabob
name = "Meat-kabob"
@@ -478,6 +485,12 @@
..()
reagents.add_reagent("nutriment", 8)
bitesize = 2
On_Consume()
if(!reagents.total_volume)
var/mob/M = usr
var/obj/item/stack/rods/W = new /obj/item/stack/rods( M )
M << "\blue You lick clean the rod."
M.put_in_hand(W)
/obj/item/weapon/reagent_containers/food/snacks/tofukabob
name = "Tofu-kabob"
@@ -487,6 +500,12 @@
..()
reagents.add_reagent("nutriment", 8)
bitesize = 2
On_Consume()
if(!reagents.total_volume)
var/mob/M = usr
var/obj/item/stack/rods/W = new /obj/item/stack/rods( M )
M << "\blue You lick clean the rod."
M.put_in_hand(W)
/obj/item/weapon/reagent_containers/food/snacks/cubancarp
name = "Cuban Carp"
@@ -503,10 +522,17 @@
name = "Popcorm" //not a typo
desc = "Now let's find some cinema."
icon_state = "popcorn"
var/unpopped = 0
New()
..()
unpopped = rand(1,10)
reagents.add_reagent("nutriment", 2)
bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0
On_Consume()
if(prob(unpopped))
usr << "\red You bite down on an un-popped kernel!"
unpopped = max(0, unpopped-1)
/obj/item/weapon/reagent_containers/food/snacks/sosjerky
name = "Scaredy's Private Reserve Beef Jerky"
@@ -598,14 +624,15 @@
reagents.add_reagent("nutriment", 3)
bitesize = 2
On_Consume()
var/mob/M = usr
var/obj/item/weapon/paper/paper = locate() in src
M.visible_message( \
"\blue [M] takes a piece of paper from the cookie!", \
"\blue You take a piece of paper from the cookie! Read it!" \
)
M.put_in_hand(paper)
paper.add_fingerprint(M)
if(!reagents.total_volume)
var/mob/M = usr
var/obj/item/weapon/paper/paper = locate() in src
M.visible_message( \
"\blue [M] takes a piece of paper from the cookie!", \
"\blue You take a piece of paper from the cookie! Read it!" \
)
M.put_in_hand(paper)
paper.add_fingerprint(M)
/obj/item/weapon/reagent_containers/food/snacks/badrecipe
name = "Burned mess"
@@ -618,7 +645,7 @@
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/meatstake
name = "Meat stake"
name = "Meat steak"
desc = "A piece of hot spicy meat."
icon_state = "meatstake"
New()
+1 -1
View File
@@ -30,7 +30,7 @@
var/lastname_index = findtext(human_name, " ")
if (lastname_index)
human_name = copytext(human_name,lastname_index+1)
var/obj/item/weapon/reagent_containers/food/snacks/human/HB = ..(container)
HB.name = human_name+HB.name
HB.job = human_job
@@ -14,7 +14,8 @@
if (istype(src.wear_suit, /obj/item/clothing/suit/space/space_ninja)&&src.wear_suit:initialize)
var/location = src.loc
explosion(location, 1, 2, 3, 4)
//src.flags = 0
//reagents.handle_reactions() //No magic stomach for corpses.
src.canmove = 0
if(src.client)
src.blind.layer = 0