diff --git a/code/game/objects/effects/alien/aliens.dm b/code/game/objects/effects/alien/aliens.dm index d4c5f57c66..2807dbb4d9 100644 --- a/code/game/objects/effects/alien/aliens.dm +++ b/code/game/objects/effects/alien/aliens.dm @@ -289,8 +289,5 @@ if(0 to 1) visible_message("[src.target] begins to crumble under the acid!") spawn(rand(150, 200)) tick() -<<<<<<< HEAD -======= //Xenomorph Effect egg removed, replaced with Structure Egg. ->>>>>>> 860fad8a75... Merge pull request #15043 from ItsSelis/spell-fixes-v2 diff --git a/code/game/objects/structures/salvageable.dm b/code/game/objects/structures/salvageable.dm index 0689df880a..7153dbca4d 100644 --- a/code/game/objects/structures/salvageable.dm +++ b/code/game/objects/structures/salvageable.dm @@ -400,9 +400,6 @@ /obj/item/weapon/computer_hardware/card_slot = 40, /obj/item/weapon/computer_hardware/network_card/advanced = 40 ) -<<<<<<< HEAD -======= - /obj/structure/salvageable/slotmachine1 name = "broken slot machine" @@ -429,4 +426,3 @@ /obj/item/weapon/stock_parts/capacitor = 60, /obj/item/weapon/computer_hardware/network_card/advanced = 40 ) ->>>>>>> 860fad8a75... Merge pull request #15043 from ItsSelis/spell-fixes-v2 diff --git a/code/modules/catalogue/catalogue_data.dm b/code/modules/catalogue/catalogue_data.dm index 3a0613b708..06ec601b7f 100644 --- a/code/modules/catalogue/catalogue_data.dm +++ b/code/modules/catalogue/catalogue_data.dm @@ -139,11 +139,7 @@ GLOBAL_DATUM_INIT(catalogue_data, /datum/category_collection/catalogue, new)

\ Humanity is the primary driving force for rapid space expansion, owing to their strong, expansionist central \ government and opportunistic Trans-Stellar Corporations. The prejudices of the 21st century have mostly \ -<<<<<<< HEAD - given way to bitter divides on the most important issue of the times� technological expansionism, \ -======= given way to bitter divides on the most important issue of the times- technological expansionism, \ ->>>>>>> 860fad8a75... Merge pull request #15043 from ItsSelis/spell-fixes-v2 with the major human factions squabbling over their approach to technology in the face of a \ looming singularity.\

\ @@ -174,11 +170,7 @@ GLOBAL_DATUM_INIT(catalogue_data, /datum/category_collection/catalogue, new) desc = "The Unathi are a species of large reptilian humanoids hailing from Moghes, in the \ Uueoa-Esa binary star system. Most Unathi live in a semi-rigid clan system, and clan \ enclaves dot the surface of their homeworld. Proud and long-lived, Unathi of all \ -<<<<<<< HEAD - walks of life display a tendency towards perfectionism, and mastery of one�s craft \ -======= walks of life display a tendency towards perfectionism, and mastery of one's craft \ ->>>>>>> 860fad8a75... Merge pull request #15043 from ItsSelis/spell-fixes-v2 is greatly respected among them. Despite the aggressive nature of their contact, \ Unathi seem willing, if not eager, to reconcile with humanity, though mutual \ distrust runs rampant among individuals of both groups." @@ -189,11 +181,7 @@ GLOBAL_DATUM_INIT(catalogue_data, /datum/category_collection/catalogue, new) desc = "Tajaran are a race of humanoid mammalian aliens from Meralar, the fourth planet \ of the Rarkajar star system. Thickly furred and protected from cold, they thrive on \ their subartic planet, where the only terran temperate areas spread across the \ -<<<<<<< HEAD - equator and �tropical belt.�\ -======= equator and \"tropical belt.\"\ ->>>>>>> 860fad8a75... Merge pull request #15043 from ItsSelis/spell-fixes-v2

\ With their own share of bloody wars and great technological advances, the Tajaran are a \ proud kind. They fiercely believe they belong among the stars and consider themselves \ @@ -285,19 +273,11 @@ GLOBAL_DATUM_INIT(catalogue_data, /datum/category_collection/catalogue, new) desc = "A Positronic being, often an Android, Gynoid, or Robot, is an individual with a positronic brain, \ manufactured and fostered amongst organic life Positronic brains enjoy the same legal status as a humans, \ although discrimination is still common, are considered sapient on all accounts, and can be considered \ -<<<<<<< HEAD - the �synthetic species�. Half-developed and half-discovered in the 2280�s by a black lab studying alien \ - artifacts, the first positronic brain was an inch-wide cube of palladium-iridium alloy, nano-etched with \ - billions upon billions of conduits and connections. Upon activation, hard-booted by way of an emitter \ - laser, the brain issued a single sentence before the neural pathways collapsed and it became an inert \ - lump of platinum: �What is my purpose?�." -======= the \"synthetic species\". Half-developed and half-discovered in the 2280's by a black lab studying alien \ artifacts, the first positronic brain was an inch-wide cube of palladium-iridium alloy, nano-etched with \ billions upon billions of conduits and connections. Upon activation, hard-booted by way of an emitter \ laser, the brain issued a single sentence before the neural pathways collapsed and it became an inert \ lump of platinum: \"What is my purpose?\"." ->>>>>>> 860fad8a75... Merge pull request #15043 from ItsSelis/spell-fixes-v2 value = CATALOGUER_REWARD_TRIVIAL /datum/category_item/catalogue/technology/cyborgs diff --git a/code/modules/food/food/thecake.dm b/code/modules/food/food/thecake.dm index 793846c914..413aa611c9 100644 --- a/code/modules/food/food/thecake.dm +++ b/code/modules/food/food/thecake.dm @@ -173,12 +173,8 @@ /obj/item/weapon/reagent_containers/food/snacks/chaoscakeslice name = "The Chaos Cake Slice" -<<<<<<< HEAD - desc = "A slice from The Chaos Cake, it pulses weirdly, as if angry to be seperated from the whole" - icon = 'icons/obj/food_ch.dmi' //CHOMP Add to appease runtimes, I think, even thought this damn file is not enabled??? -======= desc = "A slice from The Chaos Cake, it pulses weirdly, as if angry to be separated from the whole" ->>>>>>> 860fad8a75... Merge pull request #15043 from ItsSelis/spell-fixes-v2 + icon = 'icons/obj/food_ch.dmi' //CHOMP Add to appease runtimes, I think, even thought this damn file is not enabled??? icon_state = "chaoscake_slice-1" center_of_mass = list("x"=16, "y"=10) diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm index b50e2552a6..8a5883cdaf 100644 --- a/code/modules/integrated_electronics/subtypes/manipulation.dm +++ b/code/modules/integrated_electronics/subtypes/manipulation.dm @@ -204,7 +204,6 @@ pre_attached_grenade_type = /obj/item/weapon/grenade/explosive origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 3, TECH_COMBAT = 10) spawn_flags = null // Used for world initializing, see the #defines above. -<<<<<<< HEAD //CHOMPADDITION: Size Circuit /obj/item/integrated_circuit/manipulation/Size @@ -234,5 +233,3 @@ if(target && istype(target,/mob/living/)) target.resize(size/100) activate_pin(2) -======= ->>>>>>> 860fad8a75... Merge pull request #15043 from ItsSelis/spell-fixes-v2 diff --git a/code/modules/lore_codex/robutt_data/main_robutts.dm b/code/modules/lore_codex/robutt_data/main_robutts.dm index aa95574b36..eb77f03a5b 100644 --- a/code/modules/lore_codex/robutt_data/main_robutts.dm +++ b/code/modules/lore_codex/robutt_data/main_robutts.dm @@ -1,10 +1,6 @@ /datum/lore/codex/category/main_robutts // The top-level categories for the robot guide name = "Index" -<<<<<<< HEAD - data = "Temporary death, emancipation, and even basic body migration can be a stressful period in anyone's life. The prosthetics market is complicated, and many corporations view misleading or outright decieving potential clients as \"part of the game\". This Buyer's Guide was compiled in 2542 to serve as an easy reference to the most popular prosthetics available, with consideration paid to every use-case and price point. This is our 12th edition, and much has changed in the field of prosthetics since we first set out. We hope you find the information in this guide helpful." -======= data = "Temporary death, emancipation, and even basic body migration can be a stressful period in anyone's life. The prosthetics market is complicated, and many corporations view misleading or outright deceiving potential clients as \"part of the game\". This Buyer's Guide was compiled in 2302 to serve as an easy reference to the most popular prosthetics available, with consideration paid to every use-case and price point. This is our 12th edition, and much has changed in the field of prosthetics since we first set out. We hope you find the information in this guide helpful." ->>>>>>> 860fad8a75... Merge pull request #15043 from ItsSelis/spell-fixes-v2 children = list( /datum/lore/codex/category/pros_by_brand, /datum/lore/codex/category/other_information,