shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

im not crazy but this commit breaks 90% of the game

Browse Source
This commit is contained in:
Timothy Teakettle
2021-05-05 18:11:05 +01:00
parent 1664459b14
commit ba71bb944a
9 changed files with 29 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/client/preferences.dm
+2 -6
View File
@@ -529,7 +529,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
if(length(features[marking_type]))
dat += "<table>"
var/list/markings = features[marking_type]
for(var/list/marking_list in markings)
var/list/reverse_markings = reverseList(markings)
for(var/list/marking_list in reverse_markings)
var/marking_index = markings.Find(marking_list) // consider changing loop to go through indexes over lists instead of using Find here
var/actual_name = GLOB.bodypart_names[num2text(marking_list[1])] // get the actual name from the bitflag representing the part the marking is applied to
var/color_marking_dat = ""
@@ -2446,11 +2447,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
for(var/path in marking_list)
var/datum/sprite_accessory/S = marking_list[path]
if(istype(S))
// gross copypasta here because mam markings arent a subtype of regular markings despite one containing the other ???
if(istype(S, /datum/sprite_accessory/body_markings))
var/datum/sprite_accessory/body_markings/marking = S
if(!(limb_value in marking.covered_limbs))
continue
if(istype(S, /datum/sprite_accessory/mam_body_markings))
var/datum/sprite_accessory/mam_body_markings/marking = S
if(!(limb_value in marking.covered_limbs))