mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 20:16:55 +01:00
File standardisation (#13131)
* Adds the check components * Adds in trailing newlines * Converts all CRLF to LF * Post merge EOF * Post merge line endings * Final commit
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
/mob/new_player/Logout()
|
||||
ready = 0
|
||||
..()
|
||||
if(!spawning)//Here so that if they are spawning and log out, the other procs can play out and they will have a mob to come back to.
|
||||
key = null//We null their key before deleting the mob, so they are properly kicked out.
|
||||
qdel(src)
|
||||
return
|
||||
/mob/new_player/Logout()
|
||||
ready = 0
|
||||
..()
|
||||
if(!spawning)//Here so that if they are spawning and log out, the other procs can play out and they will have a mob to come back to.
|
||||
key = null//We null their key before deleting the mob, so they are properly kicked out.
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
+661
-661
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -56,4 +56,4 @@
|
||||
|
||||
/datum/sprite_accessory/hair/diona/diona_wildflow
|
||||
name = "Wildflowers"
|
||||
icon_state = "wildflower"
|
||||
icon_state = "wildflower"
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
/datum/sprite_accessory/body_markings/drask/arm_spines_drask
|
||||
icon = 'icons/mob/sprite_accessories/drask/drask_body_markings.dmi'
|
||||
name = "Drask Arm Spines"
|
||||
icon_state = "armspines"
|
||||
icon_state = "armspines"
|
||||
|
||||
@@ -32,4 +32,4 @@
|
||||
|
||||
/datum/sprite_accessory/body_markings/tattoo/nightling
|
||||
name = "Nightling Tattoo"
|
||||
icon_state = "nightling"
|
||||
icon_state = "nightling"
|
||||
|
||||
@@ -102,4 +102,4 @@
|
||||
icon_state = "unshaven"
|
||||
//////////////////////////////
|
||||
//////END VG HAIRSTYLES///////
|
||||
//////////////////////////////
|
||||
//////////////////////////////
|
||||
|
||||
@@ -755,4 +755,4 @@
|
||||
/datum/sprite_accessory/hair/fluff/pinapple_fluff_hair //Pineapple Salad hair fluff its for a slime..has to go under human
|
||||
name = "Sasook Hair"
|
||||
icon_state = "psalad_fluff_hair"
|
||||
species_allowed = list("Slime People")
|
||||
species_allowed = list("Slime People")
|
||||
|
||||
@@ -132,4 +132,4 @@
|
||||
|
||||
/datum/sprite_accessory/hair/ipc/fluff/lumi_waiting //Lumi Fluff hair
|
||||
name = "Lumi Waiting"
|
||||
icon_state = "lumi_waiting"
|
||||
icon_state = "lumi_waiting"
|
||||
|
||||
@@ -23,4 +23,4 @@
|
||||
/datum/sprite_accessory/body_markings/head/optics/xion_alt
|
||||
name = "Xion Alt. Optics"
|
||||
icon_state = "xion_alt_optics"
|
||||
models_allowed = list("Xion Manufacturing Group alt.")
|
||||
models_allowed = list("Xion Manufacturing Group alt.")
|
||||
|
||||
@@ -4,4 +4,4 @@
|
||||
|
||||
/datum/sprite_accessory/body_markings/kidan/outline_kid
|
||||
name = "Kidan Outline"
|
||||
icon_state = "outline"
|
||||
icon_state = "outline"
|
||||
|
||||
@@ -31,4 +31,4 @@
|
||||
|
||||
/datum/sprite_accessory/hair/kidan/kidan_tall_horns
|
||||
name = "Tall Horns"
|
||||
icon_state = "tall_horns"
|
||||
icon_state = "tall_horns"
|
||||
|
||||
@@ -53,4 +53,4 @@
|
||||
/datum/sprite_accessory/head_accessory/kidan/kidan_very_short
|
||||
name = "Very Short"
|
||||
icon_state = "very_short"
|
||||
// End
|
||||
// End
|
||||
|
||||
@@ -29,4 +29,4 @@
|
||||
|
||||
/datum/sprite_accessory/hair/nucleation/nuc_neutron
|
||||
name = "Nucleation Neutron Bomb"
|
||||
icon_state = "neutron"
|
||||
icon_state = "neutron"
|
||||
|
||||
@@ -20,4 +20,4 @@
|
||||
|
||||
/datum/sprite_accessory/body_markings/tajara/patchy_taj
|
||||
name = "Tajaran Patches"
|
||||
icon_state = "patch"
|
||||
icon_state = "patch"
|
||||
|
||||
@@ -28,4 +28,4 @@
|
||||
|
||||
/datum/sprite_accessory/facial_hair/tajara/taj_smallstache
|
||||
name = "Tajara Smallstache"
|
||||
icon_state = "facial_smallstache"
|
||||
icon_state = "facial_smallstache"
|
||||
|
||||
@@ -78,4 +78,4 @@
|
||||
/datum/sprite_accessory/hair/tajara/taj_hair_fingercurl
|
||||
name = "Tajara Finger Curls"
|
||||
icon_state = "fingerwave"
|
||||
glasses_over = null
|
||||
glasses_over = null
|
||||
|
||||
@@ -41,4 +41,4 @@
|
||||
|
||||
/datum/sprite_accessory/body_markings/head/tajara/patchy_taj //Companion marking for Tajaran Patches.
|
||||
name = "Tajaran Patches Head"
|
||||
icon_state = "patch"
|
||||
icon_state = "patch"
|
||||
|
||||
@@ -2,4 +2,4 @@
|
||||
name = "Unathi Sharp Snout"
|
||||
species_allowed = list("Unathi")
|
||||
icon_state = "head_sharp"
|
||||
suffix = "sharp"
|
||||
suffix = "sharp"
|
||||
|
||||
@@ -16,4 +16,4 @@
|
||||
|
||||
/datum/sprite_accessory/body_markings/unathi/points_una
|
||||
name = "Unathi Points"
|
||||
icon_state = "points"
|
||||
icon_state = "points"
|
||||
|
||||
@@ -73,4 +73,4 @@
|
||||
/datum/sprite_accessory/facial_hair/unathi/una_spikes
|
||||
name = "Spikes"
|
||||
icon = 'icons/mob/sprite_accessories/unathi/unathi_hair.dmi'
|
||||
icon_state = "spikes_horns"
|
||||
icon_state = "spikes_horns"
|
||||
|
||||
@@ -51,4 +51,4 @@
|
||||
|
||||
/datum/sprite_accessory/head_accessory/unathi/spikes
|
||||
name = "Spikes"
|
||||
icon_state = "spikes_horns"
|
||||
icon_state = "spikes_horns"
|
||||
|
||||
@@ -16,4 +16,4 @@
|
||||
|
||||
/datum/sprite_accessory/body_markings/tattoo/vox/tiger_body_vox
|
||||
name = "Vox Tiger-stripe Tattoo"
|
||||
icon_state = "tiger"
|
||||
icon_state = "tiger"
|
||||
|
||||
@@ -17,4 +17,4 @@
|
||||
|
||||
/datum/sprite_accessory/facial_hair/vox/vox_beard
|
||||
name = "Vox Quill Beard"
|
||||
icon_state = "beard"
|
||||
icon_state = "beard"
|
||||
|
||||
@@ -12,4 +12,4 @@
|
||||
|
||||
/datum/sprite_accessory/body_markings/tail/vox/vox_stripe
|
||||
name = "Vox Tail Stripe"
|
||||
icon_state = "stripe"
|
||||
icon_state = "stripe"
|
||||
|
||||
+1
-1
@@ -54,4 +54,4 @@
|
||||
|
||||
/datum/sprite_accessory/head_accessory/vulpkanin/vulp_slash
|
||||
name = "Slash"
|
||||
icon_state = "slash"
|
||||
icon_state = "slash"
|
||||
|
||||
@@ -32,4 +32,4 @@
|
||||
|
||||
/datum/sprite_accessory/body_markings/head/vulpkanin/points_sharp_vulp //Companion marking for Vulpkanin Points Sharp.
|
||||
name = "Vulpkanin Points Head 2"
|
||||
icon_state = "points_sharp"
|
||||
icon_state = "points_sharp"
|
||||
|
||||
@@ -28,4 +28,4 @@
|
||||
/datum/sprite_accessory/body_markings/tail/vulpkanin/vulp_hybrid_silverf
|
||||
name = "Vulpkanin Bushy Straight Tail Black Fade White Tip"
|
||||
tails_allowed = list("Straight Bushy Tail")
|
||||
icon_state = "sbsilverfade"
|
||||
icon_state = "sbsilverfade"
|
||||
|
||||
@@ -5,4 +5,4 @@
|
||||
|
||||
/datum/sprite_accessory/hair/wryn/wry_antennae_default
|
||||
name = "Antennae"
|
||||
icon_state = "antennae"
|
||||
icon_state = "antennae"
|
||||
|
||||
Reference in New Issue
Block a user