Skip to content

Commit

Permalink
Merge branch 'rank_name' of https://github.com/PhantornRU/Paradise-Re…
Browse files Browse the repository at this point in the history
…make-SS220 into rank_name
  • Loading branch information
PhantornRU committed Jan 20, 2024
2 parents 8c56891 + c204dcc commit e47ecf9
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
8 changes: 0 additions & 8 deletions modular_ss220/ranks/_ranks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,3 @@
desc = "Добавление рангов и погонов зависимых от наигранных часов игрока."
author = "PhantomRU"

/datum/modpack/ranks/pre_initialize()
. = ..()

/datum/modpack/ranks/initialize()
. = ..()

/datum/modpack/ranks/post_initialize()
. = ..()
6 changes: 3 additions & 3 deletions modular_ss220/ranks/code/accessory.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,17 @@
icon = 'modular_ss220/ranks/icons/clothing/attachments.dmi'
icon_override = 'modular_ss220/ranks/icons/clothing/mob/attachments_overlay.dmi'
icon_state = "holobadge"
item_state = "" //no inhands
item_state = "" // No inhands
item_color = "holobadge"
slot_flags = SLOT_FLAG_TIE
w_class = WEIGHT_CLASS_TINY
slot = ACCESSORY_SLOT_DECOR
allow_duplicates = FALSE // Allow accessories of the same type.
allow_duplicates = FALSE // Allow accessories of the same type.
var/datum/mind/owner
var/saved_real_name
var/list/exp_types
var/add_job_req_exp = FALSE
var/list/rank_exp_order_dict // Rank and exp map hours from which it will be awarded
var/list/rank_exp_order_dict // Rank and exp map hours from which it will be awarded

/obj/item/clothing/accessory/rank/Initialize(mapload)
. = ..()
Expand Down

0 comments on commit e47ecf9

Please sign in to comment.