prebed fixes
This commit is contained in:
@@ -300,3 +300,22 @@
|
||||
var/obj/effect/decal/cleanable/oil/B = locate() in T.contents
|
||||
if(!B)
|
||||
B = new(T)
|
||||
|
||||
//I think I had a plan, but it went out the window.
|
||||
/mob/living/proc/IncreaseBloodVol(var/value)
|
||||
blood_ratio += value
|
||||
return
|
||||
|
||||
/mob/living/proc/DecreaseBloodVol(var/value)
|
||||
blood_ratio -= value
|
||||
|
||||
/mob/living/proc/ResetBloodVol()
|
||||
if(ishuman(src))
|
||||
if src.has_quirk(/datum/quirk/BloodPressure)
|
||||
blood_ratio = 1.2
|
||||
blood_ratio = 1
|
||||
|
||||
/mob/living/proc/AdjustBloodVol(var/value)
|
||||
if(blood_ratio == value)
|
||||
return
|
||||
blood_ratio = value
|
||||
|
||||
@@ -886,7 +886,7 @@ im
|
||||
for (var/datum/reagent/reagentgas in reagent_list)
|
||||
R.add_reagent(reagentgas, amount/5)
|
||||
remove_reagent(reagentgas, amount/5)
|
||||
s.set_up(R, CLAMP(amount/10, 0, 1), T)
|
||||
s.set_up(R, CLAMP(amount/10, 0, 2), T)
|
||||
s.start()
|
||||
return FALSE
|
||||
|
||||
|
||||
@@ -884,13 +884,12 @@
|
||||
descmessage += " And yet, it feels good..!"
|
||||
E.enthrallTally += power_multiplier
|
||||
E.resistanceTally -= power_multiplier
|
||||
E.cooldown += 1
|
||||
*/
|
||||
else
|
||||
addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, L, "<span class='warning'>I've failed [E.master]...</b></span>"), 5)
|
||||
E.resistanceTally += power_multiplier
|
||||
E.enthrallTally += power_multiplier
|
||||
E.cooldown += 1
|
||||
E.resistanceTally += power_multiplier
|
||||
E.enthrallTally += power_multiplier
|
||||
SEND_SIGNAL(L, COMSIG_ADD_MOOD_EVENT, "enthrallscold", /datum/mood_event/enthrallscold, descmessage)
|
||||
E.cooldown += 1
|
||||
|
||||
@@ -1126,6 +1125,7 @@
|
||||
return
|
||||
else
|
||||
user.emote(user, 1, "puts their hands upon [H.name]'s head and looks deep into their eyes, whispering something to them.'")
|
||||
user.SetStun(1000)//Hands are handy, so you have to stay still
|
||||
H.SetStun(1000)
|
||||
if (E.mental_capacity >= 10)
|
||||
var/trigger = stripped_input(user, "Enter the trigger phrase", MAX_MESSAGE_LEN)
|
||||
@@ -1145,6 +1145,7 @@
|
||||
to_chat(user, "<span class='warning'>Your pet looks at you confused, it seems they don't understand that effect!</b></span>")
|
||||
else
|
||||
to_chat(user, "<span class='warning'>Your pet looks at you with a vacant blase expression, you don't think you can program anything else into them</b></span>")
|
||||
user.SetStun(0)
|
||||
H.SetStun(0)
|
||||
|
||||
//CUSTOM OBJECTIVE
|
||||
@@ -1158,6 +1159,7 @@
|
||||
return
|
||||
else
|
||||
user.emote(user, 1, "puts their hands upon [H.name]'s head and looks deep into their eyes, whispering something to them.'")
|
||||
user.SetStun(1000)//So you can't run away!
|
||||
H.SetStun(1000)
|
||||
if (E.mental_capacity >= 250 || message == "objective")
|
||||
var/datum/objective/brainwashing/objective = stripped_input(user, "Add an objective to give your pet.", MAX_MESSAGE_LEN)
|
||||
@@ -1177,6 +1179,7 @@
|
||||
//else if (E.mental_capacity >= 150)
|
||||
else
|
||||
to_chat(user, "<span class='warning'>Your pet looks at you with a vacant blasé expression, you don't think you can program anything else into them</b></span>")
|
||||
user.SetStun(0)
|
||||
H.SetStun(0)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user