space cleanup (#17300)

* space cleanup

* this

* this too

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
Kashargul
2025-03-14 11:37:13 +01:00
committed by GitHub
parent a7314a8766
commit c8aff28c5b
128 changed files with 1859 additions and 1861 deletions
+24 -24
View File
@@ -1,30 +1,30 @@
/datum/modifier/crusher_mark
name = "destabilized"
desc = "You've been struck by a destabilizing bolt. By all accounts, this is probably a bad thing."
stacks = MODIFIER_STACK_EXTEND
on_created_text = span_warning("You feel physically unstable.")
on_expired_text = span_notice("You feel physically stable again.")
var/mutable_appearance/marked_underlay
var/obj/item/kinetic_crusher/hammer_synced
name = "destabilized"
desc = "You've been struck by a destabilizing bolt. By all accounts, this is probably a bad thing."
stacks = MODIFIER_STACK_EXTEND
on_created_text = span_warning("You feel physically unstable.")
on_expired_text = span_notice("You feel physically stable again.")
var/mutable_appearance/marked_underlay
var/obj/item/kinetic_crusher/hammer_synced
/datum/modifier/crusher_mark/New(var/new_holder, var/new_origin)
. = ..()
if(isliving(new_origin))
var/mob/living/origin = new_origin
var/obj/item/kinetic_crusher/to_sync
if(istype(origin.get_active_hand(), /obj/item/kinetic_crusher))
to_sync = origin.get_active_hand()
else if (istype(origin.get_inactive_hand(), /obj/item/kinetic_crusher))
to_sync = origin.get_inactive_hand()
if(to_sync) // did we find it?
hammer_synced = to_sync // go ahead
if(hammer_synced? hammer_synced.can_mark(holder) : TRUE)
marked_underlay = mutable_appearance('icons/effects/effects.dmi', "shield2")
marked_underlay.pixel_x = -holder.pixel_x
marked_underlay.pixel_y = -holder.pixel_y
holder.underlays += marked_underlay
else
Destroy()
. = ..()
if(isliving(new_origin))
var/mob/living/origin = new_origin
var/obj/item/kinetic_crusher/to_sync
if(istype(origin.get_active_hand(), /obj/item/kinetic_crusher))
to_sync = origin.get_active_hand()
else if (istype(origin.get_inactive_hand(), /obj/item/kinetic_crusher))
to_sync = origin.get_inactive_hand()
if(to_sync) // did we find it?
hammer_synced = to_sync // go ahead
if(hammer_synced? hammer_synced.can_mark(holder) : TRUE)
marked_underlay = mutable_appearance('icons/effects/effects.dmi', "shield2")
marked_underlay.pixel_x = -holder.pixel_x
marked_underlay.pixel_y = -holder.pixel_y
holder.underlays += marked_underlay
else
Destroy()
/datum/modifier/crusher_mark/Destroy()
hammer_synced = null
+3 -3
View File
@@ -87,9 +87,9 @@
return eyeobj.EyeMove(n, direct)
/mob/observer/eye/proc/GetViewerClient()
if(owner)
return owner.client
return null
if(owner)
return owner.client
return null
/mob/observer/eye/EyeMove(n, direct)
var/initial = initial(sprint)
+6 -6
View File
@@ -184,13 +184,13 @@
return list("AI") // AI door!
/proc/encode_html_emphasis(message)
var/tagged_message = message
for(var/delimiter in GLOB.speech_toppings)
var/regex/R = new("\\[delimiter](.+?)\\[delimiter]","g")
var/tag = GLOB.speech_toppings[delimiter]
tagged_message = R.Replace(tagged_message,"<[tag]>$1</[tag]>")
var/tagged_message = message
for(var/delimiter in GLOB.speech_toppings)
var/regex/R = new("\\[delimiter](.+?)\\[delimiter]","g")
var/tag = GLOB.speech_toppings[delimiter]
tagged_message = R.Replace(tagged_message,"<[tag]>$1</[tag]>")
return tagged_message
return tagged_message
/mob/proc/hear_radio(var/list/message_pieces, var/verb = "says", var/part_a, var/part_b, var/part_c, var/part_d, var/part_e, var/mob/speaker = null, var/hard_to_hear = 0, var/vname = "")
if(!client)
+2 -2
View File
@@ -80,8 +80,8 @@
colour = "bug"
key = "X"
syllables = list("vaur","uyek","uyit","avek","sc'theth","k'ztak","teth","wre'ge","lii","dra'","zo'","ra'","kax'","zz","vh","ik","ak",
"uhk","zir","sc'orth","sc'er","thc'yek","th'zirk","th'esk","k'ayek","ka'mil","sc'","ik'yir","yol","kig","k'zit","'","'","zrk","krg","isk'yet","na'k",
"sc'azz","th'sc","nil","n'ahk","sc'yeth","aur'sk","iy'it","azzg","a'","i'","o'","u'","a","i","o","u","zz","kr","ak","nrk","tzzk","bz","xic'","k'lax'","histh")
"uhk","zir","sc'orth","sc'er","thc'yek","th'zirk","th'esk","k'ayek","ka'mil","sc'","ik'yir","yol","kig","k'zit","'","'","zrk","krg","isk'yet","na'k",
"sc'azz","th'sc","nil","n'ahk","sc'yeth","aur'sk","iy'it","azzg","a'","i'","o'","u'","a","i","o","u","zz","kr","ak","nrk","tzzk","bz","xic'","k'lax'","histh")
/datum/language/shadekin
name = LANGUAGE_SHADEKIN
@@ -59,7 +59,7 @@
else
visible_message(span_infoplain(span_bold("\The [src]") + " starts licking the wounds on [M]'s [affecting.name] clean."), \
span_notice("You start licking the wounds on [M]'s [affecting.name] clean.") )
span_notice("You start licking the wounds on [M]'s [affecting.name] clean.") )
for (var/datum/wound/W in affecting.wounds)
@@ -76,11 +76,11 @@
else
visible_message(span_notice("\The [src] [pick("slathers \a [W.desc] on [M]'s [affecting.name] with their spit.",
"drags their tongue across \a [W.desc] on [M]'s [affecting.name].",
"drips saliva onto \a [W.desc] on [M]'s [affecting.name].",
"uses their tongue to disinfect \a [W.desc] on [M]'s [affecting.name].",
"licks \a [W.desc] on [M]'s [affecting.name], cleaning it.")]"), \
span_notice("You treat \a [W.desc] on [M]'s [affecting.name] with your antiseptic saliva.") )
"drags their tongue across \a [W.desc] on [M]'s [affecting.name].",
"drips saliva onto \a [W.desc] on [M]'s [affecting.name].",
"uses their tongue to disinfect \a [W.desc] on [M]'s [affecting.name].",
"licks \a [W.desc] on [M]'s [affecting.name], cleaning it.")]"), \
span_notice("You treat \a [W.desc] on [M]'s [affecting.name] with your antiseptic saliva.") )
adjust_nutrition(-20)
W.salve()
W.bandage()
+1 -1
View File
@@ -428,7 +428,7 @@
return
/mob/living/proc/adjust_fire_stacks(add_fire_stacks) //Adjusting the amount of fire_stacks we have on person
fire_stacks = CLAMP(fire_stacks + add_fire_stacks, FIRE_MIN_STACKS, FIRE_MAX_STACKS)
fire_stacks = CLAMP(fire_stacks + add_fire_stacks, FIRE_MIN_STACKS, FIRE_MAX_STACKS)
/mob/living/proc/handle_fire()
if(fire_stacks < 0)
@@ -165,15 +165,15 @@
B.digest_mode = DM_SELECT
/mob/living/simple_mob/vore/pakkun/attackby(var/obj/item/O, var/mob/user) //if they're newspapered, they'll spit out any junk they've eaten for whatever reason
if(istype(O, /obj/item/newspaper) && !ckey && isturf(user.loc))
user.visible_message(span_info("[user] swats [src] with [O]!"))
release_vore_contents()
for(var/mob/living/L in living_mobs(0))
if(!(LAZYFIND(prey_excludes, L)))
LAZYSET(prey_excludes, L, world.time)
addtimer(CALLBACK(src, PROC_REF(removeMobFromPreyExcludes), WEAKREF(L)), 5 MINUTES)
else
..()
if(istype(O, /obj/item/newspaper) && !ckey && isturf(user.loc))
user.visible_message(span_info("[user] swats [src] with [O]!"))
release_vore_contents()
for(var/mob/living/L in living_mobs(0))
if(!(LAZYFIND(prey_excludes, L)))
LAZYSET(prey_excludes, L, world.time)
addtimer(CALLBACK(src, PROC_REF(removeMobFromPreyExcludes), WEAKREF(L)), 5 MINUTES)
else
..()
//a palette-swapped version that's a bit bossier, in JRPG tradition
@@ -117,13 +117,13 @@
consider_wg()
/mob/living/simple_mob/vore/raptor/proc/consider_wg()
var/past_state = wg_state
if(nutrition >= 900)
wg_state = 1
else
wg_state = 0
if(past_state != wg_state)
update_icon()
var/past_state = wg_state
if(nutrition >= 900)
wg_state = 1
else
wg_state = 0
if(past_state != wg_state)
update_icon()
/mob/living/simple_mob/vore/raptor/update_icon()
if(wg_state == 1)
@@ -1228,13 +1228,13 @@
ckeys_allowed = list("natje")
/datum/sprite_accessory/ears/frost
name = "Frost antenna"
desc = ""
icon_state = "frosted_tips"
ckeys_allowed = list("tucker0666")
name = "Frost antenna"
desc = ""
icon_state = "frosted_tips"
ckeys_allowed = list("tucker0666")
/datum/sprite_accessory/ears/sylv_pip
name = "sylveon ears and ribbons (Pip Shyner)"
desc = ""
icon_state = "pipears"
ckeys_allowed = list("phoaly")
name = "sylveon ears and ribbons (Pip Shyner)"
desc = ""
icon_state = "pipears"
ckeys_allowed = list("phoaly")
@@ -126,22 +126,22 @@
do_colouration = 1
/datum/sprite_accessory/tail/rabbit
name = "rabbit, colourable (vwag)"
desc = ""
icon_state = "rabbit"
do_colouration = TRUE
color_blend_mode = ICON_MULTIPLY
ani_state = "rabbit_w"
name = "rabbit, colourable (vwag)"
desc = ""
icon_state = "rabbit"
do_colouration = TRUE
color_blend_mode = ICON_MULTIPLY
ani_state = "rabbit_w"
/datum/sprite_accessory/tail/rabbitalt
name = "rabbit, dual color (vwag)"
desc = ""
icon_state = "rabbitalt"
extra_overlay = "rabbitalt-tips"
do_colouration = TRUE
color_blend_mode = ICON_MULTIPLY
ani_state = "rabbitalt_w"
extra_overlay_w = "rabbitalt-tips_w"
name = "rabbit, dual color (vwag)"
desc = ""
icon_state = "rabbitalt"
extra_overlay = "rabbitalt-tips"
do_colouration = TRUE
color_blend_mode = ICON_MULTIPLY
ani_state = "rabbitalt_w"
extra_overlay_w = "rabbitalt-tips_w"
/datum/sprite_accessory/tail/bear_brown
name = "bear, brown"
@@ -1169,14 +1169,14 @@
extra_overlay = "ninekitsune-tips"
/datum/sprite_accessory/tail/hideableninetails
name = "Kitsune 9-in-1 tail, colourable (vwag)"
desc = ""
icon_state = "ninekitsune"
extra_overlay = "ninekitsune-tips"
do_colouration = TRUE
color_blend_mode = ICON_MULTIPLY
ani_state = "foxtail_w"
extra_overlay_w = "foxtail-tips_w"
name = "Kitsune 9-in-1 tail, colourable (vwag)"
desc = ""
icon_state = "ninekitsune"
extra_overlay = "ninekitsune-tips"
do_colouration = TRUE
color_blend_mode = ICON_MULTIPLY
ani_state = "foxtail_w"
extra_overlay_w = "foxtail-tips_w"
/datum/sprite_accessory/tail/shadekin_short
name = "Shadekin Short Tail, colorable"
@@ -1702,16 +1702,16 @@
ckeys_allowed = list("arokha")
/datum/sprite_accessory/tail/cabletail
name = "cabletail"
desc = "cabletail"
icon_state = "cabletail"
ckeys_allowed = list("tucker0666")
name = "cabletail"
desc = "cabletail"
icon_state = "cabletail"
ckeys_allowed = list("tucker0666")
/datum/sprite_accessory/tail/featherfluff_tail
name = "featherfluff_tail"
desc = ""
icon_state = "featherfluff_tail"
ckeys_allowed = list("tucker0666")
name = "featherfluff_tail"
desc = ""
icon_state = "featherfluff_tail"
ckeys_allowed = list("tucker0666")
/datum/sprite_accessory/tail/holly
name = "tigress tail (Holly)"
@@ -569,11 +569,11 @@
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/wing/mothwings_luna_colorable
name = "Moth Wings (Luna, Colorable)"
desc = ""
icon_state = "mothwings_luna_colorable"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
name = "Moth Wings (Luna, Colorable)"
desc = ""
icon_state = "mothwings_luna_colorable"
do_colouration = 1
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/wing/sect_drone_alt
name = "Sect drone wings Alt. (To use with bodytype marking)"