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

Fix neaera cubes, change monkeycube eat varfind method to not create nullspace monkeys

Browse Source
This commit is contained in:
GinjaNinja32
2014-11-23 18:57:42 +00:00
parent 0ef913292f
commit fbce3cba4b
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1563,12 +1563,11 @@
if (istype(M, /mob/living/carbon/human)) if (istype(M, /mob/living/carbon/human))
//Do not try to understand. //Do not try to understand.
var/obj/item/weapon/surprise = new/obj/item/weapon(M) var/obj/item/weapon/surprise = new/obj/item/weapon(M)
var/mob/living/carbon/monkey/ook = new monkey_type(null) //no other way to get access to the vars, alas var/mob/ook = monkey_type
surprise.icon = ook.icon surprise.icon = initial(ook.icon)
surprise.icon_state = ook.icon_state surprise.icon_state = initial(ook.icon_state)
surprise.name = "malformed [ook.name]" surprise.name = "malformed [initial(ook.name)]"
surprise.desc = "Looks like \a very deformed [ook.name], a little small for its kind. It shows no signs of life." surprise.desc = "Looks like \a very deformed [initial(ook.name)], a little small for its kind. It shows no signs of life."
del(ook) //rip nullspace monkey
surprise.transform *= 0.6 surprise.transform *= 0.6
surprise.add_blood(M) surprise.add_blood(M)
var/mob/living/carbon/human/H = M var/mob/living/carbon/human/H = M
@@ -1629,7 +1628,7 @@
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/neaeracube /obj/item/weapon/reagent_containers/food/snacks/monkeycube/neaeracube
name = "neaera cube" name = "neaera cube"
monkey_type ="skrell" monkey_type = /mob/living/carbon/monkey/skrell
/obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube
name = "neaera cube" name = "neaera cube"
monkey_type =/mob/living/carbon/monkey/skrell monkey_type =/mob/living/carbon/monkey/skrell