Fixed blank sprite for velvet chord organ

This commit is contained in:
Fermi
2019-06-22 13:09:18 +01:00
parent d2685be3f6
commit 226dbe7804
4 changed files with 19 additions and 5 deletions
+15 -2
View File
@@ -614,9 +614,22 @@
//Heavily modified voice of god code
/obj/item/organ/vocal_cords/velvet
name = "velvet chords"
name = "Velvet chords"
desc = "The voice spoken from these just make you want to drift off, sleep and obey."
icon_state = "in_love"
icon_state = "velvet_chords"
/datum/action/item_action/organ_action/velvet
name = "Velvet speech"
var/obj/item/organ/vocal_cords/velvet/cords = null
icon_icon = 'icons/mob/screen_alert.dmi'
button_icon_state = "in_love"
/datum/action/item_action/organ_action/velvet/New()
..()
cords = target
/datum/action/item_action/organ_action/velvet/IsAvailable()
return TRUE
/datum/action/item_action/organ_action/velvet/Trigger()
. = ..()
Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

@@ -522,10 +522,11 @@
cooldown = 0
if (tranceTime > 0) //custom trances only last 50 ticks.
tranceTime -= 1
else if (!tranceTime == null) //remove trance after.
else if (tranceTime <= 0) //remove trance after.
M.cure_trauma_type(/datum/brain_trauma/hypnosis, TRAUMA_RESILIENCE_SURGERY)
M.remove_status_effect(/datum/status_effect/trance)
tranceTime = null
message_admins("test")
//..()
//Remove all stuff
@@ -597,7 +598,7 @@
C.lay_down()
//strip (some) clothes
else if (lowertext(customTriggers[trigger]) == "strip")//This wasn't meant to just be a lewd thing oops, is this pref breaking?
else if (lowertext(customTriggers[trigger]) == "strip")//This wasn't meant to just be a lewd thing oops.
var/mob/living/carbon/human/o = owner
var/items = o.get_contents()
for(var/obj/item/W in items)
@@ -133,7 +133,7 @@ Creating a chem with a low purity will make you permanently fall in love with so
name = "MKUltra"
id = "enthrall"
description = "A forbidden deep red mixture that overwhelms a foreign body with waves of pleasure, intoxicating them into servitude. When taken by the creator, it will enhance the draw of their voice to those affected by it."
color = "#2C051A" // rgb: , 0, 255
color = "#80000c" // rgb: , 0, 255
taste_description = "synthetic chocolate, a base tone of alcohol, and high notes of roses"
overdose_threshold = 100 //If this is too easy to get 100u of this, then double it please.
DoNotSplit = TRUE