diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm.rej b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm.rej deleted file mode 100644 index 4ba00d1798..0000000000 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm (rejected hunks) -@@ -213,7 +213,7 @@ - "ee" = (/obj/machinery/door/airlock/highsecurity{name = "Secure Storage"; req_access_txt = "200"},/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 4},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) - "ef" = (/obj/machinery/atmospherics/pipe/simple/supplymain/hidden{icon_state = "intact"; dir = 10},/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) - "eg" = (/obj/structure/cable/yellow{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) --"eh" = (/obj/structure/table,/obj/item/weapon/storage/backpack/dufflebag/sec{contents = newlist(/obj/item/weapon/scalpel,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/surgical_drapes,/obj/item/clothing/mask/surgical); desc = "A large duffle bag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; name = "duffle bag"; pixel_y = 5},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{cell_type = 5000; dir = 4; name = "Armory APC"; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) -+"eh" = (/obj/structure/table,/obj/item/weapon/storage/backpack/dufflebag/sec{contents = newlist(/obj/item/weapon/scalpel,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/surgical_drapes,/obj/item/clothing/mask/surgical); desc = "A large dufflebag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; name = "dufflebag"; pixel_y = 5},/obj/structure/cable/yellow{d2 = 8; icon_state = "0-8"},/obj/machinery/power/apc{cell_type = 5000; dir = 4; name = "Armory APC"; pixel_x = 24; pixel_y = 0},/turf/open/floor/plasteel/black{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/armory) - "ei" = (/obj/structure/dresser,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) - "ej" = (/obj/structure/table/wood,/obj/item/device/flashlight/lamp,/obj/machinery/atmospherics/components/unary/vent_scrubber{dir = 4; on = 1},/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) - "ek" = (/obj/structure/bed,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/item/weapon/bedsheet,/turf/open/floor/wood{baseturf = /turf/open/floor/plating/asteroid/airless},/area/ruin/deepstorage/dorm) diff --git a/_maps/map_files/Cerestation/cerestation.dmm.rej b/_maps/map_files/Cerestation/cerestation.dmm.rej deleted file mode 100644 index 4c3d6676c0..0000000000 --- a/_maps/map_files/Cerestation/cerestation.dmm.rej +++ /dev/null @@ -1,19 +0,0 @@ -diff a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm (rejected hunks) -@@ -101529,7 +109389,7 @@ cpo - cqk - cri - cqk --dky -+dkx - ctm - cua - cKv -@@ -101786,7 +109646,7 @@ cpo - cql - crj - csf --dkz -+dkx - ctn - cub - cuu diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej b/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej deleted file mode 100644 index 5f4ca8b829..0000000000 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm.rej +++ /dev/null @@ -1,23 +0,0 @@ -diff a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm (rejected hunks) -@@ -15614,20 +15614,12 @@ - /turf/open/floor/plating, - /area/maintenance/starboard/fore) - "aHZ" = ( --/obj/structure/table/wood, - /obj/machinery/airalarm{ - dir = 4; - icon_state = "alarm0"; - pixel_x = -22 - }, --/obj/item/weapon/storage/crayons{ -- pixel_x = 3; -- pixel_y = 3 -- }, --/obj/item/weapon/reagent_containers/food/snacks/pie/cream{ -- pixel_x = -3; -- pixel_y = -3 -- }, -+/obj/structure/closet/crate/wooden/toy, - /turf/open/floor/plasteel/redblue, - /area/crew_quarters/theatre) - "aIa" = ( diff --git a/code/__HELPERS/unsorted.dm.rej b/code/__HELPERS/unsorted.dm.rej deleted file mode 100644 index d8ac1b978b..0000000000 --- a/code/__HELPERS/unsorted.dm.rej +++ /dev/null @@ -1,13 +0,0 @@ -diff a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm (rejected hunks) -@@ -1422,6 +1422,7 @@ var/valid_HTTPSGet = FALSE - fdel(temp_file) - - #define UNTIL(X) while(!(X)) stoplag() -- -+/* - /proc/to_chat(target, message) -- target << message -\ No newline at end of file -+ target << message -+ */ -\ No newline at end of file diff --git a/code/datums/holocall.dm.rej b/code/datums/holocall.dm.rej deleted file mode 100644 index 08110adedc..0000000000 --- a/code/datums/holocall.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/datums/holocall.dm b/code/datums/holocall.dm (rejected hunks) -@@ -42,6 +43,8 @@ - - //cleans up ALL references :) - /datum/holocall/Destroy() -+ QDEL_NULL(hangup) -+ - var/user_good = !QDELETED(user) - if(user_good) - user.reset_perspective() diff --git a/code/game/gamemodes/cult/cult_comms.dm.rej b/code/game/gamemodes/cult/cult_comms.dm.rej deleted file mode 100644 index 32d4b882e3..0000000000 --- a/code/game/gamemodes/cult/cult_comms.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/game/gamemodes/cult/cult_comms.dm b/code/game/gamemodes/cult/cult_comms.dm (rejected hunks) -@@ -171,7 +171,7 @@ - return 0 - if(cooldown > world.time) - if(!CM.active) -- owner << "You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can mark another target!" -+ to_chat(owner, "You need to wait [round((cooldown - world.time) * 0.1)] seconds before you can mark another target!") - return 0 - return ..() - diff --git a/code/game/gamemodes/gang/recaller.dm.rej b/code/game/gamemodes/gang/recaller.dm.rej deleted file mode 100644 index 31ef014f69..0000000000 --- a/code/game/gamemodes/gang/recaller.dm.rej +++ /dev/null @@ -1,53 +0,0 @@ -diff a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm (rejected hunks) -@@ -170,35 +170,35 @@ - - gang.message_gangtools("[usr] is attempting to recall the emergency shuttle.") - recalling = 1 -- to_chat(loc, "\icon[src]Generating shuttle recall order with codes retrieved from last call signal...") -+ to_chat(loc, "[bicon(src)]Generating shuttle recall order with codes retrieved from last call signal...") - - sleep(rand(100,300)) - - if(SSshuttle.emergency.mode != SHUTTLE_CALL) //Shuttle can only be recalled when it's moving to the station -- to_chat(user, "\icon[src]Emergency shuttle cannot be recalled at this time.") -+ to_chat(user, "[bicon(src)]Emergency shuttle cannot be recalled at this time.") - recalling = 0 - return 0 -- to_chat(loc, "\icon[src]Shuttle recall order generated. Accessing station long-range communication arrays...") -+ to_chat(loc, "[bicon(src)]Shuttle recall order generated. Accessing station long-range communication arrays...") - - sleep(rand(100,300)) - - if(!gang.dom_attempts) -- to_chat(user, "\icon[src]Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts.") -+ to_chat(user, "[bicon(src)]Error: Unable to access communication arrays. Firewall has logged our signature and is blocking all further attempts.") - recalling = 0 - return 0 - - var/turf/userturf = get_turf(user) - if(userturf.z != 1) //Shuttle can only be recalled while on station -- to_chat(user, "\icon[src]Error: Device out of range of station communication arrays.") -+ to_chat(user, "[bicon(src)]Error: Device out of range of station communication arrays.") - recalling = 0 - return 0 - var/datum/station_state/end_state = new /datum/station_state() - end_state.count() - if((100 * start_state.score(end_state)) < 80) //Shuttle cannot be recalled if the station is too damaged -- to_chat(user, "\icon[src]Error: Station communication systems compromised. Unable to establish connection.") -+ to_chat(user, "[bicon(src)]Error: Station communication systems compromised. Unable to establish connection.") - recalling = 0 - return 0 -- to_chat(loc, "\icon[src]Comm arrays accessed. Broadcasting recall signal...") -+ to_chat(loc, "[bicon(src)]Comm arrays accessed. Broadcasting recall signal...") - - sleep(rand(100,300)) - -@@ -210,7 +210,7 @@ - if(SSshuttle.cancelEvac(user)) - return 1 - -- to_chat(loc, "\icon[src]No response recieved. Emergency shuttle cannot be recalled at this time.") -+ to_chat(loc, "[bicon(src)]No response recieved. Emergency shuttle cannot be recalled at this time.") - return 0 - - /obj/item/device/gangtool/proc/can_use(mob/living/carbon/human/user) diff --git a/code/game/machinery/computer/message.dm.rej b/code/game/machinery/computer/message.dm.rej deleted file mode 100644 index bd4065af39..0000000000 --- a/code/game/machinery/computer/message.dm.rej +++ /dev/null @@ -1,27 +0,0 @@ -diff a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm (rejected hunks) -@@ -413,10 +413,10 @@ - customrecepient.tnote += "← From [customsender] ([customjob]):
[custommessage]
" - if (!customrecepient.silent) - playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1) -- customrecepient.audible_message("\icon[customrecepient] *[customrecepient.ttone]*", null, 3) -+ customrecepient.audible_message("[bicon(customrecepient)] *[customrecepient.ttone]*", null, 3) - if( customrecepient.loc && ishuman(customrecepient.loc) ) - var/mob/living/carbon/human/H = customrecepient.loc -- to_chat(H, "\icon[customrecepient] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)") -+ to_chat(H, "[bicon(customrecepient)] Message from [customsender] ([customjob]), \"[custommessage]\" (Reply)") - log_pda("[usr]/([usr.ckey]) (PDA: [customsender]) sent \"[custommessage]\" to [customrecepient.owner]") - customrecepient.cut_overlays() - customrecepient.add_overlay(image('icons/obj/pda.dmi', "pda-r")) -@@ -426,10 +426,10 @@ - customrecepient.tnote += "← From [PDARec.owner] ([customjob]):
[custommessage]
" - if (!customrecepient.silent) - playsound(customrecepient.loc, 'sound/machines/twobeep.ogg', 50, 1) -- customrecepient.audible_message("\icon[customrecepient] *[customrecepient.ttone]*", null, 3) -+ customrecepient.audible_message("[bicon(customrecepient)] *[customrecepient.ttone]*", null, 3) - if( customrecepient.loc && ishuman(customrecepient.loc) ) - var/mob/living/carbon/human/H = customrecepient.loc -- to_chat(H, "\icon[customrecepient] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)") -+ to_chat(H, "[bicon(customrecepient)] Message from [PDARec.owner] ([customjob]), \"[custommessage]\" (Reply)") - log_pda("[usr]/([usr.ckey]) (PDA: [PDARec.owner]) sent \"[custommessage]\" to [customrecepient.owner]") - customrecepient.cut_overlays() - customrecepient.add_overlay(image('icons/obj/pda.dmi', "pda-r")) diff --git a/code/game/machinery/telecomms/broadcasting.dm.rej b/code/game/machinery/telecomms/broadcasting.dm.rej deleted file mode 100644 index af933e1dbc..0000000000 --- a/code/game/machinery/telecomms/broadcasting.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/game/machinery/telecomms/broadcasting.dm b/code/game/machinery/telecomms/broadcasting.dm (rejected hunks) -@@ -316,7 +316,7 @@ - // Create a radio headset for the sole purpose of using its icon - var/obj/item/device/radio/headset/radio = new - -- var/part_b = " \icon[radio]\[[freq_text]\][part_b_extra] " -+ var/part_b = " [bicon(radio)]\[[freq_text]\][part_b_extra] " - var/part_c = "" - - if (display_freq==SYND_FREQ) diff --git a/code/game/objects/items/devices/PDA/PDA.dm.rej b/code/game/objects/items/devices/PDA/PDA.dm.rej deleted file mode 100644 index 0a2c8ce6c6..0000000000 --- a/code/game/objects/items/devices/PDA/PDA.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm (rejected hunks) -@@ -630,7 +630,7 @@ var/global/list/obj/item/device/pda/PDAs = list() - L = get(src, /mob/living/silicon) - - if(L && L.stat != UNCONSCIOUS) -- to_chat(L, "\icon[src] Message from [source.owner] ([source.ownjob]), \"[msg.message]\"[msg.get_photo_ref()] (Reply)") -+ to_chat(L, "[bicon(src)] Message from [source.owner] ([source.ownjob]), \"[msg.message]\"[msg.get_photo_ref()] (Reply)") - - update_icon() - add_overlay(image(icon, icon_alert)) diff --git a/code/game/objects/items/weapons/cards_ids.dm.rej b/code/game/objects/items/weapons/cards_ids.dm.rej deleted file mode 100644 index 6e4e3faa35..0000000000 --- a/code/game/objects/items/weapons/cards_ids.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm (rejected hunks) -@@ -86,7 +86,7 @@ - var/dorm = 0 // determines if this ID has claimed a dorm already - - /obj/item/weapon/card/id/attack_self(mob/user) -- user.visible_message("[user] shows you: \icon[src] [src.name].", \ -+ user.visible_message("[user] shows you: [bicon(src)] [src.name].", \ - "You show \the [src.name].") - src.add_fingerprint(user) - return diff --git a/code/modules/admin/verbs/pray.dm.rej b/code/modules/admin/verbs/pray.dm.rej deleted file mode 100644 index bc98860cfd..0000000000 --- a/code/modules/admin/verbs/pray.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm (rejected hunks) -@@ -33,7 +33,7 @@ - prayer_type = "CULTIST PRAYER" - deity = "Nar-Sie" - -- msg = "\icon[cross][prayer_type][deity ? " (to [deity])" : ""]: [ADMIN_FULLMONTY(src)] [ADMIN_SC(src)] [ADMIN_SMITE(src)]: [msg]" -+ msg = "[bicon(cross)][prayer_type][deity ? " (to [deity])" : ""]: [ADMIN_FULLMONTY(src)] [ADMIN_SC(src)] [ADMIN_SMITE(src)]: [msg]" - - for(var/client/C in admins) - if(C.prefs.chat_toggles & CHAT_PRAYER) diff --git a/code/modules/cargo/exports/large_objects.dm.rej b/code/modules/cargo/exports/large_objects.dm.rej deleted file mode 100644 index 333f6aeacf..0000000000 --- a/code/modules/cargo/exports/large_objects.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/cargo/exports/large_objects.dm b/code/modules/cargo/exports/large_objects.dm (rejected hunks) -@@ -6,7 +6,7 @@ - k_elasticity = 0 - unit_name = "crate" - export_types = list(/obj/structure/closet/crate) -- exclude_types = list(/obj/structure/closet/crate/large) -+ exclude_types = list(/obj/structure/closet/crate/large, /obj/structure/closet/crate/wooden) - - /datum/export/large/crate/total_printout() // That's why a goddamn metal crate costs that much. - . = ..() diff --git a/code/modules/client/asset_cache.dm.rej b/code/modules/client/asset_cache.dm.rej deleted file mode 100644 index d6d6f8c738..0000000000 --- a/code/modules/client/asset_cache.dm.rej +++ /dev/null @@ -1,21 +0,0 @@ -diff a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm (rejected hunks) -@@ -279,19 +279,6 @@ GLOBAL_LIST_EMPTY(asset_datums) - "changelog.css" = 'html/changelog.css' - ) - --/datum/asset/simple/chat -- assets = list( -- "jquery.min.js" = 'code/modules/html_interface/js/jquery.min.js', -- "json2.min.js" = 'goon/browserassets/js/json2.min.js', -- "browserOutput.js" = 'goon/browserassets/js/browserOutput.js', -- "fontawesome-webfont.eot" = 'tgui/assets/fonts/fontawesome-webfont.eot', -- "fontawesome-webfont.svg" = 'tgui/assets/fonts/fontawesome-webfont.svg', -- "fontawesome-webfont.ttf" = 'tgui/assets/fonts/fontawesome-webfont.ttf', -- "fontawesome-webfont.woff" = 'tgui/assets/fonts/fontawesome-webfont.woff', -- "font-awesome.css" = 'goon/browserassets/css/font-awesome.css', -- "browserOutput.css" = 'goon/browserassets/css/browserOutput.css' -- ) -- - //Registers HTML Interface assets. - /datum/asset/HTML_interface/register() - for(var/path in typesof(/datum/html_interface)) diff --git a/code/modules/client/client_procs.dm.rej b/code/modules/client/client_procs.dm.rej deleted file mode 100644 index 78981beb46..0000000000 --- a/code/modules/client/client_procs.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm (rejected hunks) -@@ -196,6 +203,8 @@ var/next_external_rsc = 0 - - . = ..() //calls mob.Login() - -+ chatOutput.start() -+ - connection_time = world.time - connection_realtime = world.realtime - connection_timeofday = world.timeofday diff --git a/code/modules/goonchat/browserOutput.dm.rej b/code/modules/goonchat/browserOutput.dm.rej deleted file mode 100644 index 1ac5a9bb0e..0000000000 --- a/code/modules/goonchat/browserOutput.dm.rej +++ /dev/null @@ -1,51 +0,0 @@ -diff a/code/modules/goonchat/browserOutput.dm b/code/modules/goonchat/browserOutput.dm (rejected hunks) -@@ -32,7 +32,7 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic - alert(owner.mob, "Updated chat window does not exist. If you are using a custom skin file please allow the game to update.") - return - -- if(winget(owner, "browseroutput", "is-disabled") == "false") //Already setup -+ if(winget(owner, "browseroutput", "is-visible") == "true") //Already setup - doneLoading() - - else //Not setup -@@ -90,7 +90,10 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic - - testing("Chat loaded for [owner.ckey]") - loaded = TRUE -- winset(owner, "browseroutput", "is-disabled=false") -+ winset(owner, "output", "is-disabled=true;is-visible=false") -+ winset(owner, "browseroutput", "is-disabled=false;is-visible=true") -+ -+ - for(var/message in messageQueue) - to_chat(owner, message) - -@@ -228,7 +231,7 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic - targets = target - if(!targets.len) - return -- -+ var/original_message = message - //Some macros remain in the string even after parsing and fuck up the eventual output - message = replacetext(message, "\improper", "") - message = replacetext(message, "\proper", "") -@@ -241,14 +244,16 @@ GLOBAL_DATUM_INIT(iconCache, /savefile, new("data/iconCache.sav")) //Cache of ic - - if (!C) - continue -- -+ - if(!C.chatOutput || C.chatOutput.broken) // A player who hasn't updated his skin file. -- C << message -+ C << original_message - return TRUE -- -+ - if(!C.chatOutput.loaded) - //Client sucks at loading things, put their messages in a queue - C.chatOutput.messageQueue += message -+ //But also send it to their output window since that shows until goonchat loads -+ C << original_message - return - - // url_encode it TWICE, this way any UTF-8 characters are able to be decoded by the Javascript. diff --git a/code/modules/mob/living/carbon/human/human_defense.dm.rej b/code/modules/mob/living/carbon/human/human_defense.dm.rej deleted file mode 100644 index e5c19e638e..0000000000 --- a/code/modules/mob/living/carbon/human/human_defense.dm.rej +++ /dev/null @@ -1,14 +0,0 @@ -diff a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm (rejected hunks) -@@ -681,10 +681,10 @@ - status += "numb" - if(status == "") - status = "OK" -- to_chat(src, "\t [status == "OK" ? "\blue" : "\red"] Your [LB.name] is [status].") -+ to_chat(src, "\t Your [LB.name] is [status].") - - for(var/obj/item/I in LB.embedded_objects) -- to_chat(src, "\t \red There is \a [I] embedded in your [LB.name]!") -+ to_chat(src, "\t There is \a [I] embedded in your [LB.name]!") - - for(var/t in missing) - to_chat(src, "Your [parse_zone(t)] is missing!") diff --git a/code/modules/mob/living/silicon/ai/examine.dm.rej b/code/modules/mob/living/silicon/ai/examine.dm.rej deleted file mode 100644 index 57060219e7..0000000000 --- a/code/modules/mob/living/silicon/ai/examine.dm.rej +++ /dev/null @@ -1,8 +0,0 @@ -diff a/code/modules/mob/living/silicon/ai/examine.dm b/code/modules/mob/living/silicon/ai/examine.dm (rejected hunks) -@@ -1,5 +1,5 @@ - /mob/living/silicon/ai/examine(mob/user) -- var/msg = "*---------*\nThis is \icon[src] [src]!\n" -+ var/msg = "*---------*\nThis is [bicon(src)] [src]!\n" - if (src.stat == DEAD) - msg += "It appears to be powered-down.\n" - else diff --git a/code/modules/uplink/uplink_item.dm.rej b/code/modules/uplink/uplink_item.dm.rej deleted file mode 100644 index 8fed701f74..0000000000 --- a/code/modules/uplink/uplink_item.dm.rej +++ /dev/null @@ -1 +0,0 @@ -poop \ No newline at end of file diff --git a/code/world.dm.rej b/code/world.dm.rej deleted file mode 100644 index 56a1ec077d..0000000000 --- a/code/world.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/world.dm b/code/world.dm (rejected hunks) -@@ -198,7 +198,7 @@ - #define CHAT_PULLR 64 //defined in preferences.dm, but not available here at compilation time - for(var/client/C in GLOB.clients) - if(C.prefs && (C.prefs.chat_toggles & CHAT_PULLR)) -- C << "PR: [announcement]" -+ to_chat(C, "PR: [announcement]") - #undef CHAT_PULLR - - #define WORLD_REBOOT(X) log_world("World rebooted at [time_stamp()]"); ..(X); return; diff --git a/tgstation.dme.rej b/tgstation.dme.rej deleted file mode 100644 index bb6a0eac6a..0000000000 --- a/tgstation.dme.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/tgstation.dme b/tgstation.dme (rejected hunks) -@@ -215,6 +215,7 @@ - #include "code\datums\dog_fashion.dm" - #include "code\datums\emotes.dm" - #include "code\datums\forced_movement.dm" -+#include "code\datums\holocall.dm" - #include "code\datums\hud.dm" - #include "code\datums\map_config.dm" - #include "code\datums\martial.dm"