mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
Rebalanced sleepy pen, takes about 30 seconds to fall asleep, and 2 minutes total from stabbing to wear off. Fixes aliens, can no longer be pushed over by airflow, and all their powers work correctly. CentComm console has a 5 second cooldown now.
This commit is contained in:
@@ -53,6 +53,9 @@ mob/proc/airflow_stun()
|
|||||||
if(stat == 2)
|
if(stat == 2)
|
||||||
return 0
|
return 0
|
||||||
if(last_airflow_stun > world.time - vsc.airflow_stun_cooldown) return 0
|
if(last_airflow_stun > world.time - vsc.airflow_stun_cooldown) return 0
|
||||||
|
if(!canstun || !canweaken)
|
||||||
|
src << "\blue You stay upright as the air rushes past you."
|
||||||
|
return 0
|
||||||
if(weakened <= 0) src << "\red The sudden rush of air knocks you over!"
|
if(weakened <= 0) src << "\red The sudden rush of air knocks you over!"
|
||||||
weakened = max(weakened,5)
|
weakened = max(weakened,5)
|
||||||
last_airflow_stun = world.time
|
last_airflow_stun = world.time
|
||||||
@@ -70,6 +73,9 @@ mob/living/carbon/human/airflow_stun()
|
|||||||
if(wear_suit.flags & SUITSPACE) return 0
|
if(wear_suit.flags & SUITSPACE) return 0
|
||||||
if(shoes)
|
if(shoes)
|
||||||
if(shoes.flags & NOSLIP) return 0
|
if(shoes.flags & NOSLIP) return 0
|
||||||
|
if(!canstun || !canweaken)
|
||||||
|
src << "\blue You stay upright as the air rushes past you."
|
||||||
|
return 0
|
||||||
if(weakened <= 0) src << "\red The sudden rush of air knocks you over!"
|
if(weakened <= 0) src << "\red The sudden rush of air knocks you over!"
|
||||||
weakened = max(weakened,rand(1,5))
|
weakened = max(weakened,rand(1,5))
|
||||||
last_airflow_stun = world.time
|
last_airflow_stun = world.time
|
||||||
|
|||||||
@@ -195,8 +195,8 @@
|
|||||||
usr << "Message transmitted."
|
usr << "Message transmitted."
|
||||||
log_say("[key_name(usr)] has sent Centcomm a message: [input]")
|
log_say("[key_name(usr)] has sent Centcomm a message: [input]")
|
||||||
centcomm_message_cooldown = 1
|
centcomm_message_cooldown = 1
|
||||||
spawn(600)//One minute cooldown
|
spawn(50)//One minute cooldown, nah 5 seconds
|
||||||
message_cooldown = 0
|
centcomm_message_cooldown = 0
|
||||||
|
|
||||||
|
|
||||||
// OMG SYNDICATE ...LETTERHEAD
|
// OMG SYNDICATE ...LETTERHEAD
|
||||||
@@ -212,8 +212,8 @@
|
|||||||
usr << "Message transmitted."
|
usr << "Message transmitted."
|
||||||
log_say("[key_name(usr)] has sent the Syndicate a message: [input]")
|
log_say("[key_name(usr)] has sent the Syndicate a message: [input]")
|
||||||
centcomm_message_cooldown = 1
|
centcomm_message_cooldown = 1
|
||||||
spawn(600)//One minute cooldown
|
spawn(50)//One minute cooldown, nah 5 seconds
|
||||||
message_cooldown = 0
|
centcomm_message_cooldown = 0
|
||||||
|
|
||||||
if("RestoreBackup")
|
if("RestoreBackup")
|
||||||
usr << "Backup routing data restored!"
|
usr << "Backup routing data restored!"
|
||||||
|
|||||||
@@ -255,10 +255,10 @@
|
|||||||
return
|
return
|
||||||
|
|
||||||
/obj/item/weapon/pen/sleepypen/New()
|
/obj/item/weapon/pen/sleepypen/New()
|
||||||
var/datum/reagents/R = new/datum/reagents(60) //Used to be 300
|
var/datum/reagents/R = new/datum/reagents(18) //Used to be 300
|
||||||
reagents = R
|
reagents = R
|
||||||
R.my_atom = src
|
R.my_atom = src
|
||||||
R.add_reagent("stoxin", 60)
|
R.add_reagent("stoxin", 18)
|
||||||
..()
|
..()
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -267,7 +267,7 @@
|
|||||||
return
|
return
|
||||||
..()
|
..()
|
||||||
if(reagents.total_volume)
|
if(reagents.total_volume)
|
||||||
if(M.reagents) reagents.trans_to(M, 20) //used to be 150
|
if(M.reagents) reagents.trans_to(M, 6) //used to be 150, 6 gives around 2 minutes of knock out.
|
||||||
return
|
return
|
||||||
|
|
||||||
//NEW STYLE PARAPEN
|
//NEW STYLE PARAPEN
|
||||||
|
|||||||
@@ -85,6 +85,8 @@ I kind of like the right click only--the window version can get a little confusi
|
|||||||
M.show_message(text("\green <B>[user] vomits globs of vile stuff all over [src]!</B>"), 1)
|
M.show_message(text("\green <B>[user] vomits globs of vile stuff all over [src]!</B>"), 1)
|
||||||
A.tick()
|
A.tick()
|
||||||
|
|
||||||
|
// This one is currently broken, however the other one isn't. And they both do the same thing. Weird.
|
||||||
|
/*
|
||||||
/mob/living/carbon/alien/humanoid/proc/corrode_target() //Aliens only see items on the list of objects that they can actually spit on./N
|
/mob/living/carbon/alien/humanoid/proc/corrode_target() //Aliens only see items on the list of objects that they can actually spit on./N
|
||||||
set name = "Spit Corrosive Acid (200)"
|
set name = "Spit Corrosive Acid (200)"
|
||||||
set desc = "Drench an object in acid, destroying it over time."
|
set desc = "Drench an object in acid, destroying it over time."
|
||||||
@@ -106,7 +108,7 @@ I kind of like the right click only--the window version can get a little confusi
|
|||||||
else
|
else
|
||||||
src << "\green Target is too far away."
|
src << "\green Target is too far away."
|
||||||
return
|
return
|
||||||
|
*/
|
||||||
/mob/living/carbon/alien/humanoid/verb/corrode(obj/O as anything in oview(1)) //If they right click to corrode, an error will flash if its an invalid target./N
|
/mob/living/carbon/alien/humanoid/verb/corrode(obj/O as anything in oview(1)) //If they right click to corrode, an error will flash if its an invalid target./N
|
||||||
set name = "Corrode with Acid (200)"
|
set name = "Corrode with Acid (200)"
|
||||||
set desc = "Drench an object in acid, destroying it over time."
|
set desc = "Drench an object in acid, destroying it over time."
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
src.name = text("alien drone ([rand(1, 1000)])")
|
src.name = text("alien drone ([rand(1, 1000)])")
|
||||||
src.real_name = src.name
|
src.real_name = src.name
|
||||||
spawn (1)
|
spawn (1)
|
||||||
src.verbs += /mob/living/carbon/alien/humanoid/proc/corrode_target
|
// src.verbs += /mob/living/carbon/alien/humanoid/proc/corrode
|
||||||
src.verbs -= /mob/living/carbon/alien/humanoid/verb/ActivateHuggers
|
src.verbs -= /mob/living/carbon/alien/humanoid/verb/ActivateHuggers
|
||||||
src.stand_icon = new /icon('alien.dmi', "aliend_s")
|
src.stand_icon = new /icon('alien.dmi', "aliend_s")
|
||||||
src.lying_icon = new /icon('alien.dmi', "aliend_l")
|
src.lying_icon = new /icon('alien.dmi', "aliend_l")
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
src.name = text("alien sentinel ([rand(1, 1000)])")
|
src.name = text("alien sentinel ([rand(1, 1000)])")
|
||||||
src.real_name = src.name
|
src.real_name = src.name
|
||||||
spawn (1)
|
spawn (1)
|
||||||
src.verbs += /mob/living/carbon/alien/humanoid/proc/corrode_target
|
// src.verbs += /mob/living/carbon/alien/humanoid/proc/corrode
|
||||||
src.stand_icon = new /icon('alien.dmi', "aliens_s")
|
src.stand_icon = new /icon('alien.dmi', "aliens_s")
|
||||||
src.lying_icon = new /icon('alien.dmi', "aliens_l")
|
src.lying_icon = new /icon('alien.dmi', "aliens_l")
|
||||||
src.resting_icon = new /icon('alien.dmi', "aliens_sleep")
|
src.resting_icon = new /icon('alien.dmi', "aliens_sleep")
|
||||||
@@ -182,5 +182,5 @@
|
|||||||
A.current = U
|
A.current = U
|
||||||
A.yo = U.y - T.y
|
A.yo = U.y - T.y
|
||||||
A.xo = U.x - T.x
|
A.xo = U.x - T.x
|
||||||
A.process()
|
A.fired()
|
||||||
return
|
return
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
// src.name = text("alien ([rand(1, 1000)])")
|
// src.name = text("alien ([rand(1, 1000)])")
|
||||||
src.real_name = src.name
|
src.real_name = src.name
|
||||||
spawn (1)
|
spawn (1)
|
||||||
src.verbs += /mob/living/carbon/alien/humanoid/proc/corrode_target
|
// src.verbs += /mob/living/carbon/alien/humanoid/proc/corrode
|
||||||
src.verbs += /mob/living/carbon/alien/humanoid/sentinel/verb/spit
|
src.verbs += /mob/living/carbon/alien/humanoid/sentinel/verb/spit
|
||||||
src.verbs -= /mob/living/carbon/alien/humanoid/verb/ventcrawl
|
src.verbs -= /mob/living/carbon/alien/humanoid/verb/ventcrawl
|
||||||
src.stand_icon = new /icon('alien.dmi', "queen_s")
|
src.stand_icon = new /icon('alien.dmi', "queen_s")
|
||||||
|
|||||||
Reference in New Issue
Block a user