Fixes #454 and Hivenet (#453)

This commit is contained in:
LordFowl
2016-06-25 00:38:12 +03:00
committed by skull132
parent 9400104bf5
commit ba2997d231
3 changed files with 44 additions and 6 deletions
+5 -5
View File
@@ -1023,19 +1023,19 @@ I said no!
items = list(/obj/item/organ/brain)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake
/datum/recipe/vaurca/friedkois
/datum/recipe/friedkois
fruit = list("koisspore" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/friedkois
/datum/recipe/vaurca/koiswaffles
/datum/recipe/koiswaffles
items = list(/obj/item/weapon/reagent_containers/food/snacks/koissoup)
result = /obj/item/weapon/reagent_containers/food/snacks/koiswaffles
/datum/recipe/vaurca/koisjelly
/datum/recipe/koisjelly
fruit = list("koisspore" = 2)
items = list(/obj/item/weapon/reagent_containers/food/snacks/koissoup)
result = /obj/item/weapon/reagent_containers/food/snacks/koisjelly
/datum/recipe/vaurca/neuralbroke
/datum/recipe/neuralbroke
items = list(/obj/item/organ/vaurca/neuralsocket)
result = /obj/item/weapon/neuralbroke
result = /obj/item/weapon/neuralbroke
+3 -1
View File
@@ -99,7 +99,9 @@
var/mob/living/carbon/human/M = other
if(!istype(M))
return 1
return 0
if(istype(M, /mob/new_player))
return 0
if(locate(/obj/item/organ/vaurca/neuralsocket) in M.internal_organs)
return 1
+36
View File
@@ -0,0 +1,36 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: LordFowl
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Fixed Vaurca hivenet broadcasting into OoC."