cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into limbs

Browse Source
This commit is contained in:
Zuhayr
2015-03-26 23:25:26 +10:30
parent 139edb4f9b ab0ffe7767
commit aa6439096c
103 changed files with 897 additions and 2547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
code/modules/reagents/reagent_containers/food/snacks.dm
View File

@@ -1543,7 +1543,7 @@
filling_color = "#ADAC7F"
var/wrapped = 0
var/monkey_type = /mob/living/carbon/monkey
var/monkey_type = "Monkey"
New()
..()
@@ -1561,6 +1561,7 @@
if(wrapped)
Unwrap(user)
/*
On_Consume(var/mob/M)
M << "<span class = 'warning'>Something inside of you suddently expands!</span>"
@@ -1586,7 +1587,7 @@
else //someone is having a bad day
E.createwound(CUT, 30)
E.embed(surprise)
else if (ismonkey(M))
else if (issmall(M))
M.visible_message("<span class='danger'>[M] suddenly tears in half!</span>")
var/mob/living/carbon/monkey/ook = new monkey_type(M.loc)
ook.name = "malformed [ook.name]"
@@ -1594,11 +1595,13 @@
ook.add_blood(M)
M.gib()
..()
*/
proc/Expand()
for(var/mob/M in viewers(src,7))
M << "\red \The [src] expands!"
new monkey_type(src)
var/mob/living/carbon/human/H = new (src)
H.set_species(monkey_type)
del(src)
proc/Unwrap(mob/user as mob)
@@ -1612,24 +1615,30 @@
desc = "Still wrapped in some paper."
icon_state = "monkeycubewrap"
wrapped = 1
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/farwacube
name = "farwa cube"
monkey_type = /mob/living/carbon/monkey/tajara
monkey_type = "Farwa"
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/farwacube
name = "farwa cube"
monkey_type =/mob/living/carbon/monkey/tajara
monkey_type = "Farwa"
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/stokcube
name = "stok cube"
monkey_type = /mob/living/carbon/monkey/unathi
monkey_type = "Stok"
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/stokcube
name = "stok cube"
monkey_type =/mob/living/carbon/monkey/unathi
monkey_type = "Stok"
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/neaeracube
name = "neaera cube"
monkey_type = /mob/living/carbon/monkey/skrell
monkey_type = "Neara"
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube
name = "neaera cube"
monkey_type =/mob/living/carbon/monkey/skrell
monkey_type = "Neara"
/obj/item/weapon/reagent_containers/food/snacks/spellburger