diff --git a/code/controllers/subsystem/ticker.dm.rej b/code/controllers/subsystem/ticker.dm.rej deleted file mode 100644 index 5b12e61f52..0000000000 --- a/code/controllers/subsystem/ticker.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm (rejected hunks) -@@ -60,7 +60,7 @@ SUBSYSTEM_DEF(ticker) - var/list/round_start_events - - /datum/controller/subsystem/ticker/Initialize(timeofday) -- var/list/music = file2list(ROUND_START_MUSIC_LIST, "\n") -+ var/list/music = world.file2list(ROUND_START_MUSIC_LIST, "\n") - login_music = pick(music) - - if(!GLOB.syndicate_code_phrase) diff --git a/code/datums/helper_datums/getrev.dm.rej b/code/datums/helper_datums/getrev.dm.rej deleted file mode 100644 index f4e397e03a..0000000000 --- a/code/datums/helper_datums/getrev.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm (rejected hunks) -@@ -8,7 +8,7 @@ - /datum/getrev/New() - var/head_file = return_file_text(".git/logs/HEAD") - if(SERVERTOOLS && fexists("..\\prtestjob.lk")) -- var/list/tmp = file2list("..\\prtestjob.lk") -+ var/list/tmp = world.file2list("..\\prtestjob.lk") - for(var/I in tmp) - if(I) - testmerge |= I diff --git a/code/modules/mob/living/carbon/human/species.dm.rej b/code/modules/mob/living/carbon/human/species.dm.rej deleted file mode 100644 index fdbf73f505..0000000000 --- a/code/modules/mob/living/carbon/human/species.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm (rejected hunks) -@@ -115,7 +115,7 @@ - var/obj/item/thing = C.get_item_by_slot(slot_id) - if(thing && (!thing.species_exception || !is_type_in_list(src,thing.species_exception))) - C.dropItemToGround(thing) -- -+ - // this needs to be FIRST because qdel calls update_body which checks if we have DIGITIGRADE legs or not and if not then removes DIGITIGRADE from species_traits - if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Digitigrade Legs") - species_traits += DIGITIGRADE diff --git a/code/modules/mob/mob.dm.rej b/code/modules/mob/mob.dm.rej deleted file mode 100644 index 949371a0ad..0000000000 --- a/code/modules/mob/mob.dm.rej +++ /dev/null @@ -1,11 +0,0 @@ -diff a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm (rejected hunks) -@@ -28,6 +28,9 @@ - GLOB.living_mob_list += src - prepare_huds() - can_ride_typecache = typecacheof(can_ride_typecache) -+ for(var/v in GLOB.active_alternate_appearances) -+ var/datum/atom_hud/alternate_appearance/AA = v -+ AA.onNewMob(src) - ..() - - /atom/proc/prepare_huds()