mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
you can now go full undertale mode with the flower tendril loot (#14944)
* New tator item: Air Shoes New 'air shoes' -intended tot item for 4-5tc -functionally wheelys that can ollie as well -slight maneuverability in 0g just like moths Co-Authored-By: Byemoh <5091394+ToasterBiome@users.noreply.github.com> * things changed -tried giving them the ability to ollie but botched it and idk how -nvm baiomu told me * Update scooter.dm sparks appear on activation of shoes * making it so if atmos is ok and gravity is gone yo can still move * LAST THING DIDNT WORK trying tje walk in pressurized thing again * what do you MEAN UNDEFINED VAR * stole from mothcode again instead fuckin indentationerrors * Update miscellaneous.dm * fuck it dealing with this part later * SPRITES BABEY airshoes have proper worn/item sprites now * changing shoe toggle sprites toggling them on has its own sprite, but working on getting the ollie one to work properly * another shot at the movement in 0g second attempt at allowing movement in 0g and atmos * headache part 4 * Update miscellaneous.dm * messed up vehicle sprites added in icons for riding but sprites are a bit buggy atm, will replace later when replacements come in * trying to figure out why a button wont change * got it no longer skateboard ollie * just had a worse idea gonna replace noslip with something else * yes its dashing * jorts * jorts 2 * vehicle sprite * last sprite thing added custom sprite for shoe dash * shoes can be renamed now * Update miscellaneous.dm * other actions now available+fixed sprite mistake -removed a redundant line stopping the action from being recognized -removed old shoe vehicle sprites so there's no shoes on top of shoes * Update miscellaneous.dm * fixed a problem walking while dashing used to just interrupt the dash so i just made the dash happen faster * why does this keep happening when i merge master god * think thats all the code? * orca fixed my sprite at gunpoint * think the code's finished? * WHY THE FUCK WERE THESE GONE * Update necropolis_chests.dm * literally 1984 Co-authored-by: Byemoh <5091394+ToasterBiome@users.noreply.github.com> Co-authored-by: ToasterBiome <baiomurang@gmail.com>
This commit is contained in:
@@ -1112,3 +1112,50 @@
|
||||
/datum/status_effect/knuckled/be_replaced()
|
||||
owner.underlays -= bruise
|
||||
..()
|
||||
|
||||
/datum/status_effect/taming
|
||||
id = "taming"
|
||||
duration = -1
|
||||
tick_interval = 6
|
||||
alert_type = null
|
||||
var/tame_amount = 1
|
||||
var/tame_buildup = 1
|
||||
var/tame_crit = 35
|
||||
var/needs_to_tame = FALSE
|
||||
var/mob/living/tamer
|
||||
|
||||
/datum/status_effect/taming/on_creation(mob/living/owner, mob/living/user)
|
||||
. = ..()
|
||||
if(!.)
|
||||
return
|
||||
tamer = user
|
||||
|
||||
/datum/status_effect/taming/on_apply()
|
||||
if(owner.stat == DEAD)
|
||||
return FALSE
|
||||
return ..()
|
||||
|
||||
/datum/status_effect/taming/tick()
|
||||
if(owner.stat == DEAD)
|
||||
qdel(src)
|
||||
|
||||
/datum/status_effect/taming/proc/add_tame(amount)
|
||||
tame_amount += amount
|
||||
if(tame_amount)
|
||||
if(tame_amount >= tame_crit)
|
||||
needs_to_tame = TRUE
|
||||
qdel(src)
|
||||
else
|
||||
qdel(src)
|
||||
|
||||
/datum/status_effect/taming/on_remove()
|
||||
var/mob/living/simple_animal/hostile/M = owner
|
||||
if(needs_to_tame)
|
||||
var/turf/T = get_turf(M)
|
||||
new /obj/effect/temp_visual/love_heart(T)
|
||||
M.drop_loot()
|
||||
M.loot = null
|
||||
M.add_atom_colour("#11c42f", FIXED_COLOUR_PRIORITY)
|
||||
M.faction = tamer.faction
|
||||
to_chat(tamer, span_notice("[M] is now friendly after exposure to the flowers!"))
|
||||
. = ..()
|
||||
|
||||
Reference in New Issue
Block a user