cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

this kills tactical carp fucking (#40770)

Browse Source 
Fixes #39371.

I left the stuffing thing alone because it is both funny and not a TC exploit
This commit is contained in:
bgobandit
2018-10-17 06:23:54 -04:00
committed by Ling
parent 39e35d5e41
commit e715f25a2b
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/items/dehy_carp.dm
View File

@@ -19,6 +19,9 @@
else else
return ..() return ..()
/obj/item/toy/plush/carpplushie/dehy_carp/plop(obj/item/toy/plush/Daddy)
return FALSE
/obj/item/toy/plush/carpplushie/dehy_carp/proc/Swell() /obj/item/toy/plush/carpplushie/dehy_carp/proc/Swell()
desc = "It's growing!" desc = "It's growing!"
visible_message("<span class='notice'>[src] swells up!</span>") visible_message("<span class='notice'>[src] swells up!</span>")

8
code/game/objects/items/plushes.dm
View File

@@ -16,6 +16,7 @@
var/obj/item/toy/plush/plush_child var/obj/item/toy/plush/plush_child
var/obj/item/toy/plush/paternal_parent //who initiated creation var/obj/item/toy/plush/paternal_parent //who initiated creation
var/obj/item/toy/plush/maternal_parent //who owns, see love() var/obj/item/toy/plush/maternal_parent //who owns, see love()
var/static/list/breeding_blacklist = typecacheof(/obj/item/toy/plush/carpplushie/dehy_carp) // you cannot have sexual relations with this plush
var/list/scorned = list() //who the plush hates var/list/scorned = list() //who the plush hates
var/list/scorned_by = list() //who hates the plush, to remove external references on Destroy() var/list/scorned_by = list() //who hates the plush, to remove external references on Destroy()
var/heartbroken = FALSE var/heartbroken = FALSE
@@ -203,7 +204,7 @@
else if(Kisser.partner == src && !plush_child) //the one advancing does not take ownership of the child and we have a one child policy in the toyshop else if(Kisser.partner == src && !plush_child) //the one advancing does not take ownership of the child and we have a one child policy in the toyshop
user.visible_message("<span class='notice'>[user] is going to break [Kisser] and [src] by bashing them like that.</span>", user.visible_message("<span class='notice'>[user] is going to break [Kisser] and [src] by bashing them like that.</span>",
"<span class='notice'>[Kisser] passionately embraces [src] in your hands. Look away you perv!</span>") "<span class='notice'>[Kisser] passionately embraces [src] in your hands. Look away you perv!</span>")
plop(Kisser) if(plop(Kisser))
user.visible_message("<span class='notice'>Something drops at the feet of [user].</span>", user.visible_message("<span class='notice'>Something drops at the feet of [user].</span>",
"<span class='notice'>The miracle of oh god did that just come out of [src]?!</span>") "<span class='notice'>The miracle of oh god did that just come out of [src]?!</span>")
@@ -271,7 +272,10 @@
/obj/item/toy/plush/proc/plop(obj/item/toy/plush/Daddy) /obj/item/toy/plush/proc/plop(obj/item/toy/plush/Daddy)
if(partner != Daddy) if(partner != Daddy)
return //we do not have bastards in our toyshop return FALSE //we do not have bastards in our toyshop
if(is_type_in_typecache(Daddy, breeding_blacklist))
return FALSE // some love is forbidden
if(prob(50)) //it has my eyes if(prob(50)) //it has my eyes
plush_child = new type(get_turf(loc)) plush_child = new type(get_turf(loc))