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

Adds a toy neural overclocker to maint loot (#19277)

Browse Source 
* Lol

* Update toys.dm

* Update toys.dm
This commit is contained in:
Molti
2023-06-25 22:42:12 -05:00
committed by GitHub
parent 76b2191fcc
commit 447e134994
3 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
code/modules/surgery/organs/augments_chest.dm
View File

@@ -258,17 +258,19 @@
if(COOLDOWN_FINISHED(src, startsoundcooldown))
playsound(owner, 'sound/effects/spinal_implant_on.ogg', 60)
COOLDOWN_START(src, startsoundcooldown, 1 SECONDS)
owner.add_movespeed_modifier("spinalimplant", priority=100, multiplicative_slowdown=-1)
owner.next_move_modifier *= 0.7
owner?.dna?.species?.action_speed_coefficient *= 0.7
if(syndicate_implant)//the toy doesn't do anything aside from the trail and the sound
owner.add_movespeed_modifier("spinalimplant", priority=100, multiplicative_slowdown=-1)
owner.next_move_modifier *= 0.7
owner?.dna?.species?.action_speed_coefficient *= 0.7
RegisterSignal(owner, COMSIG_MOVABLE_PRE_MOVE, PROC_REF(move_react))
else
if(COOLDOWN_FINISHED(src, endsoundcooldown))
playsound(owner, 'sound/effects/spinal_implant_off.ogg', 70)
COOLDOWN_START(src, endsoundcooldown, 1 SECONDS)
owner.next_move_modifier /= 0.7
owner?.dna?.species?.action_speed_coefficient /= 0.7
owner.remove_movespeed_modifier("spinalimplant")
if(syndicate_implant)
owner.next_move_modifier /= 0.7
owner?.dna?.species?.action_speed_coefficient /= 0.7
owner.remove_movespeed_modifier("spinalimplant")
UnregisterSignal(owner, COMSIG_MOVABLE_PRE_MOVE)
on = !on
if(!silent)
@@ -313,6 +315,9 @@
F.color = usedcolor //gotta add the flair
/obj/item/organ/cyberimp/chest/spinalspeed/on_life()
if(!syndicate_implant)//the toy doesn't have a drawback
return
if(on)
if(owner.stat == UNCONSCIOUS || owner.stat == DEAD)
toggle(silent = TRUE)
@@ -345,6 +350,11 @@
/obj/item/organ/cyberimp/chest/spinalspeed/emp_act(severity)
. = ..()
if(!syndicate_implant)//the toy has a different emp act
owner.adjust_dizzy(10 SECONDS / severity)
to_chat(owner, span_warning("Your spinal implant makes you feel queasy!"))
return
switch(severity)//i don't want emps to just be damage again, that's boring
if(EMP_HEAVY)
owner.set_drugginess(40)
@@ -363,6 +373,11 @@
owner.adjustFireLoss(5)
to_chat(owner, span_danger("Your spinal implant malfunctions and you suddenly feel... wrong."))
/obj/item/organ/cyberimp/chest/spinalspeed/toy
name = "glowy after-image trail implant"
desc = "Donk Co's first forray into the world of entertainment implants. Projects a series of after-images as you move, perfect for starting a dance party all on your own."
syndicate_implant = FALSE
/obj/item/organ/cyberimp/chest/cooling_intake
name = "cooling intake"
desc = "An external port that can intake air from the environment or coolant from a tank."

3
code/modules/vending/toys.dm
View File

@@ -27,7 +27,8 @@
/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted = 10,
/obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted = 10,
/obj/item/toy/katana = 10,
/obj/item/twohanded/dualsaber/toy = 5)
/obj/item/twohanded/dualsaber/toy = 5,
/obj/item/organ/cyberimp/chest/spinalspeed/toy = 5)
armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50)
resistance_flags = FIRE_PROOF
refill_canister = /obj/item/vending_refill/donksoft

1
yogstation/code/_globalvars/lists/maintenance_loot.dm
View File

@@ -481,6 +481,7 @@ GLOBAL_LIST_INIT(maintenance_loot_makeshift,list(
/obj/item/reagent_containers/autoinjector/medipen/pumpup = W_ESSENTIAL,
/obj/item/organ/heart/ghetto = W_RARE,
/obj/item/organ/lungs/ghetto = W_RARE,
/obj/item/organ/cyberimp/chest/spinalspeed/toy = W_RARE,
/obj/item/reagent_containers/food/drinks/bottle/hooch = W_ESSENTIAL,
/obj/item/reagent_containers/food/drinks/bottle/kong = W_RARE,
/obj/item/reagent_containers/food/drinks/bottle/lizardwine = W_RARE,