diff --git a/code/modules/clothing/spacesuits/rig/modules/specific/device.dm b/code/modules/clothing/spacesuits/rig/modules/specific/device.dm index ddf6fcbcb1..8df730c90d 100644 --- a/code/modules/clothing/spacesuits/rig/modules/specific/device.dm +++ b/code/modules/clothing/spacesuits/rig/modules/specific/device.dm @@ -7,7 +7,7 @@ disruptive = 0 var/device_type - var/obj/item + var/obj/item/device /obj/item/rig_module/device/New() ..() diff --git a/code/modules/entrepreneur/entrepreneur_items.dm b/code/modules/entrepreneur/entrepreneur_items.dm index 2492b0ab35..bc81f49b9c 100644 --- a/code/modules/entrepreneur/entrepreneur_items.dm +++ b/code/modules/entrepreneur/entrepreneur_items.dm @@ -525,9 +525,4 @@ desc = "A kit containing everything that a stylist needs." icon = 'icons/obj/entrepreneur.dmi' icon_state = "stylist" -<<<<<<< HEAD starts_with = list(/obj/item/makeover, /obj/item/lipstick/random, /obj/item/nailpolish, /obj/item/nailpolish_remover, /obj/item/haircomb, /obj/item/clothing/head/hairnet, /obj/item/ticket_printer/train) - -======= - starts_with = list(/obj/item/makeover, /obj/item/lipstick/random, /obj/item/nailpolish, /obj/item/nailpolish_remover, /obj/item/haircomb, /obj/item/clothing/head/hairnet, /obj/item/ticket_printer/train) ->>>>>>> master diff --git a/code/modules/events/event_dynamic.dm b/code/modules/events/event_dynamic.dm index f60aea4135..eebc7bd57c 100644 --- a/code/modules/events/event_dynamic.dm +++ b/code/modules/events/event_dynamic.dm @@ -197,33 +197,18 @@ var/list/event_last_fired = list() if(istype(M, /mob/living/silicon/robot)) var/mob/living/silicon/robot/R = M if(R.module) -<<<<<<< HEAD - if(istype(R.module, /obj/item/robot_module/robot/engineering)) - active_with_role["Engineer"]++ - else if(istype(R.module, /obj/item/robot_module/robot/security)) -======= if(istype(R.module, /obj/item/robot_module/robot/engineering)) active_with_role[JOB_ENGINEER]++ else if(istype(R.module, /obj/item/robot_module/robot/security)) ->>>>>>> master active_with_role["Security"]++ else if(istype(R.module, /obj/item/robot_module/robot/medical)) active_with_role["Medical"]++ -<<<<<<< HEAD - else if(istype(R.module, /obj/item/robot_module/robot/research)) - active_with_role["Scientist"]++ - else if(istype(R.module, /obj/item/robot_module/robot/janitor)) - active_with_role["Janitor"]++ - else if(istype(R.module, /obj/item/robot_module/robot/clerical/butler)) - active_with_role["Botanist"]++ -======= else if(istype(R.module, /obj/item/robot_module/robot/research)) active_with_role[JOB_SCIENTIST]++ else if(istype(R.module, /obj/item/robot_module/robot/janitor)) active_with_role[JOB_JANITOR]++ else if(istype(R.module, /obj/item/robot_module/robot/clerical/butler)) active_with_role[JOB_BOTANIST]++ ->>>>>>> master if(M.mind.assigned_role in SSjob.get_job_titles_in_department(DEPARTMENT_ENGINEERING)) active_with_role[JOB_ENGINEER]++ diff --git a/code/modules/food/food/drinks.dm b/code/modules/food/food/drinks.dm index 76a15704e7..317cb18e2a 100644 --- a/code/modules/food/food/drinks.dm +++ b/code/modules/food/food/drinks.dm @@ -482,15 +482,10 @@ /obj/item/reagent_containers/food/drinks/teapot/on_reagent_change() ..() -<<<<<<< HEAD -/obj/item/reagent_containers/food/drinks/flask - name = "\improper Site Manager's flask" - desc = "A metal flask belonging to the Site Manager" -======= /obj/item/reagent_containers/food/drinks/flask name = "\improper " + JOB_SITE_MANAGER + "'s flask" desc = "A metal flask belonging to the " + JOB_SITE_MANAGER ->>>>>>> master + icon_state = "flask" volume = 60 center_of_mass = list("x"=17, "y"=7) @@ -508,13 +503,8 @@ desc = "A flask with a Lithium Atom symbol on it." icon_state = "lithiumflask" -<<<<<<< HEAD -/obj/item/reagent_containers/food/drinks/flask/detflask - name = "\improper Detective's flask" -======= /obj/item/reagent_containers/food/drinks/flask/detflask name = "\improper " + JOB_DETECTIVE + "'s flask" ->>>>>>> master desc = "A metal flask with a leather band and golden badge belonging to the detective." icon_state = "detflask" volume = 60 diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm index b14abdb4b9..31a73694f1 100644 --- a/code/modules/food/food/snacks.dm +++ b/code/modules/food/food/snacks.dm @@ -1347,13 +1347,8 @@ . = ..() reagents.add_reagent("protein", 8) -<<<<<<< HEAD -/obj/item/reagent_containers/food/snacks/clownburger - name = "Clown Burger" -======= /obj/item/reagent_containers/food/snacks/clownburger name = JOB_CLOWN + " Burger" ->>>>>>> master desc = "This tastes funny..." icon_state = "clownburger" filling_color = "#FF00FF" @@ -1363,13 +1358,8 @@ bitesize = 2 -<<<<<<< HEAD -/obj/item/reagent_containers/food/snacks/mimeburger - name = "Mime Burger" -======= /obj/item/reagent_containers/food/snacks/mimeburger name = JOB_MIME + " Burger" ->>>>>>> master desc = "Its taste defies language." icon_state = "mimeburger" filling_color = "#FFFFFF" @@ -2467,13 +2457,8 @@ reagents.add_reagent("blood", 10) reagents.add_reagent("water", 5) -<<<<<<< HEAD -/obj/item/reagent_containers/food/snacks/clownstears - name = "Clown's Tears" -======= /obj/item/reagent_containers/food/snacks/clownstears name = JOB_CLOWN + "'s Tears" ->>>>>>> master desc = "Not very funny." icon_state = "clownstears" filling_color = "#C4FBFF" diff --git a/code/modules/mining/shelter_atoms_vr.dm b/code/modules/mining/shelter_atoms_vr.dm index e428ff0956..1458bbd535 100644 --- a/code/modules/mining/shelter_atoms_vr.dm +++ b/code/modules/mining/shelter_atoms_vr.dm @@ -124,17 +124,6 @@ GLOBAL_LIST_EMPTY(unique_deployable) desc = "A cozy cabin; crammed into a survival capsule." template_id = "shelter_cab" -<<<<<<< HEAD -/obj/item/survivalcapsule/dropship - name = "dropship surfluid shelter capsule" - desc = "A military dropship in a capsule. Contains everything an assault squad would need, minus the squad itself. This capsule is significantly larger than most. There's a license for use printed on the bottom." - template_id = "shelter_zeta" - unique_id = "shelter_6" - is_ship = TRUE - w_class = ITEMSIZE_SMALL - -======= ->>>>>>> master //Custom Shelter Capsules /obj/item/survivalcapsule/tabiranth name = "silver-trimmed surfluid shelter capsule" diff --git a/code/modules/mob/living/carbon/brain/robot.dm b/code/modules/mob/living/carbon/brain/robot.dm index e5f94cf2ca..0ca5d2fcf0 100644 --- a/code/modules/mob/living/carbon/brain/robot.dm +++ b/code/modules/mob/living/carbon/brain/robot.dm @@ -19,10 +19,5 @@ to_chat(brainmob, "You feel slightly disoriented. That's normal when you're little more than a complex circuit.") return -<<<<<<< HEAD /obj/item/mmi/digital/robot/attack_self(mob/user as mob) return //This object is technically a brain, and should not be dumping brains out of itself like its parent object does. -======= -/obj/item/mmi/digital/robot/attack_self(mob/user as mob) - return //This object is technically a brain, and should not be dumping brains out of itself like its parent object does. ->>>>>>> master diff --git a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm index 2fea0f7166..7beb027663 100644 --- a/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm +++ b/code/modules/mob/living/carbon/human/ai_controlled/ai_controlled.dm @@ -24,21 +24,12 @@ var/to_wear_suit = /obj/item/clothing/suit/armor/material/makeshift/glass var/to_wear_gloves = /obj/item/clothing/gloves/ring/material/platinum var/to_wear_shoes = /obj/item/clothing/shoes/galoshes -<<<<<<< HEAD - var/to_wear_belt = /obj/item/storage/belt/utility/full - var/to_wear_l_pocket = /obj/item/soap - var/to_wear_r_pocket = /obj/item/pda - var/to_wear_back = /obj/item/storage/backpack - var/to_wear_id_type = /obj/item/card/id - var/to_wear_id_job = "Assistant" -======= var/to_wear_belt = /obj/item/storage/belt/utility/full var/to_wear_l_pocket = /obj/item/soap var/to_wear_r_pocket = /obj/item/pda var/to_wear_back = /obj/item/storage/backpack var/to_wear_id_type = /obj/item/card/id var/to_wear_id_job = JOB_ALT_ASSISTANT ->>>>>>> master var/to_wear_l_hand = null var/to_wear_r_hand = /obj/item/melee/baton diff --git a/code/modules/mob/living/silicon/robot/robot_modules/station.dm b/code/modules/mob/living/silicon/robot/robot_modules/station.dm index 73b494abfe..9e5bb60b93 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/station.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/station.dm @@ -595,13 +595,8 @@ var/global/list/robot_modules = list( ) pto_type = PTO_CIVILIAN -<<<<<<< HEAD -/obj/item/robot_module/robot/clerical/butler - channels = list("Service" = 1) -======= /obj/item/robot_module/robot/clerical/butler channels = list(CHANNEL_SERVICE = 1) ->>>>>>> master /obj/item/robot_module/robot/clerical/butler name = "service robot module" @@ -677,16 +672,6 @@ var/global/list/robot_modules = list( /obj/item/robot_module/robot/miner/create_equipment(var/mob/living/silicon/robot/robot) ..() src.modules += new /obj/item/borg/sight/material(src) -<<<<<<< HEAD - src.modules += new /obj/item/tool/wrench/cyborg(src) - src.modules += new /obj/item/tool/screwdriver/cyborg(src) - src.modules += new /obj/item/storage/bag/ore(src) - src.modules += new /obj/item/pickaxe/borgdrill(src) - src.modules += new /obj/item/storage/bag/sheetsnatcher/borg(src) - src.modules += new /obj/item/gripper/miner(src) - src.modules += new /obj/item/mining_scanner(src) - src.emag += new /obj/item/kinetic_crusher/machete/dagger(src) -======= src.modules += new /obj/item/tool/wrench/cyborg(src) src.modules += new /obj/item/tool/screwdriver/cyborg(src) src.modules += new /obj/item/storage/bag/ore(src) @@ -696,7 +681,6 @@ var/global/list/robot_modules = list( src.modules += new /obj/item/mining_scanner(src) src.modules += new /obj/item/card/id/cargo/miner/borg(src) src.emag += new /obj/item/kinetic_crusher/machete/dagger(src) ->>>>>>> master src.modules += new /obj/item/dogborg/sleeper/compactor/supply(src) src.emag += new /obj/item/dogborg/pounce(src) diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index 31eaa4187d..05c2c4cd3b 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -170,21 +170,12 @@ O.key = key O.loc = loc -<<<<<<< HEAD - O.job = "Cyborg" - if(O.mind.assigned_role == "Cyborg") - if(O.mind.role_alt_title == "Robot") - O.mmi = new /obj/item/mmi/digital/posibrain(O) - else if(O.mind.role_alt_title == "Drone") - O.mmi = new /obj/item/mmi/digital/robot(O) -======= O.job = JOB_CYBORG if(O.mind.assigned_role == JOB_CYBORG) if(O.mind.role_alt_title == JOB_ALT_ROBOT) O.mmi = new /obj/item/mmi/digital/posibrain(O) else if(O.mind.role_alt_title == JOB_ALT_DRONE) O.mmi = new /obj/item/mmi/digital/robot(O) ->>>>>>> master else O.mmi = new /obj/item/mmi(O) diff --git a/code/modules/modular_computers/file_system/programs/research/email_administration.dm b/code/modules/modular_computers/file_system/programs/research/email_administration.dm index 3ca6ac0d1c..77297ef041 100644 --- a/code/modules/modular_computers/file_system/programs/research/email_administration.dm +++ b/code/modules/modular_computers/file_system/programs/research/email_administration.dm @@ -66,13 +66,8 @@ return TRUE // High security - can only be operated when the user has an ID with access on them. -<<<<<<< HEAD - var/obj/item/card/id/I = usr.GetIdCard() - if(!istype(I) || !(access_network in I.access)) -======= var/obj/item/card/id/I = usr.GetIdCard() if(!istype(I) || !(access_network in I.GetAccess())) ->>>>>>> master return TRUE switch(action) diff --git a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm index 5b525ba0a3..ee35f6d0d6 100644 --- a/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm +++ b/code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm @@ -72,13 +72,8 @@ var/warrant_uid = 0 // The following actions will only be possible if the user has an ID with security access equipped. This is in line with modular computer framework's authentication methods, // which also use RFID scanning to allow or disallow access to some functions. Anyone can view warrants, editing requires ID. This also prevents situations where you show a tablet // to someone who is to be arrested, which allows them to change the stuff there. -<<<<<<< HEAD - var/obj/item/card/id/I = usr.GetIdCard() - if(!istype(I) || !I.registered_name || !(access_security in I.access)) -======= var/obj/item/card/id/I = usr.GetIdCard() if(!istype(I) || !I.registered_name || !(access_security in I.GetAccess())) ->>>>>>> master to_chat(usr, "Authentication error: Unable to locate ID with appropriate access to allow this operation.") return diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm index 8b07a71d5c..66904ef7eb 100644 --- a/code/modules/paperwork/folders.dm +++ b/code/modules/paperwork/folders.dm @@ -25,13 +25,8 @@ desc = "A white folder." icon_state = "folder_white" -<<<<<<< HEAD -/obj/item/folder/blue_captain - desc = "A blue folder with Site Manager markings." -======= /obj/item/folder/blue_captain desc = "A blue folder with " + JOB_SITE_MANAGER + " markings." ->>>>>>> master icon_state = "folder_captain" /obj/item/folder/blue_hop diff --git a/code/modules/persistence/noticeboard.dm b/code/modules/persistence/noticeboard.dm index facd7a223f..a94855ba1c 100644 --- a/code/modules/persistence/noticeboard.dm +++ b/code/modules/persistence/noticeboard.dm @@ -82,13 +82,8 @@ visible_message("[user] has dismantled [src]!") dismantle() return -<<<<<<< HEAD - else if(istype(I, /obj/item/paper) || istype(I, /obj/item/photo)) - if(jobban_isbanned(user, "Graffiti")) -======= else if(istype(I, /obj/item/paper) || istype(I, /obj/item/photo)) if(jobban_isbanned(user, JOB_GRAFFITI)) ->>>>>>> master to_chat(user, "You are banned from leaving persistent information across rounds.") else if(LAZYLEN(notices) < max_notices && user.unEquip(I, src)) diff --git a/code/modules/projectiles/guns/toy.dm b/code/modules/projectiles/guns/toy.dm index b9b13fc83c..c61b899ecf 100644 --- a/code/modules/projectiles/guns/toy.dm +++ b/code/modules/projectiles/guns/toy.dm @@ -215,15 +215,9 @@ /* * Cyborg */ -<<<<<<< HEAD -/obj/item/gun/projectile/cyborgtoy - name = "\improper Donk-Soft Cyborg Blaster" - desc = "Donk-Soft Cyborg Blaster! It's Donk or Don't! Adult supervision required. Use to toggle between battle and cleanup mode." -======= /obj/item/gun/projectile/cyborgtoy name = "\improper Donk-Soft " + JOB_CYBORG + " Blaster" desc = "Donk-Soft " + JOB_CYBORG + " Blaster! It's Donk or Don't! Adult supervision required. Use to toggle between battle and cleanup mode." ->>>>>>> master icon = 'icons/obj/gun_toy.dmi' icon_state = "smg" caliber = "foam" diff --git a/code/modules/security levels/keycard authentication.dm b/code/modules/security levels/keycard authentication.dm index 8d7fd9808e..c4b3317cd1 100644 --- a/code/modules/security levels/keycard authentication.dm +++ b/code/modules/security levels/keycard authentication.dm @@ -30,15 +30,9 @@ if(stat & (NOPOWER|BROKEN)) to_chat(user, "This device is not powered.") return -<<<<<<< HEAD - if(istype(W,/obj/item/card/id)) - var/obj/item/card/id/ID = W - if(access_keycard_auth in ID.access) -======= if(istype(W,/obj/item/card/id)) var/obj/item/card/id/ID = W if(access_keycard_auth in ID.GetAccess()) ->>>>>>> master if(active == 1) //This is not the device that made the initial request. It is the device confirming the request. if(event_source) diff --git a/code/modules/shieldgen/shield_capacitor.dm b/code/modules/shieldgen/shield_capacitor.dm index 2f1020f3a9..eb65e2f4f7 100644 --- a/code/modules/shieldgen/shield_capacitor.dm +++ b/code/modules/shieldgen/shield_capacitor.dm @@ -38,15 +38,9 @@ /obj/machinery/shield_capacitor/attackby(obj/item/W, mob/user) -<<<<<<< HEAD - if(istype(W, /obj/item/card/id)) - var/obj/item/card/id/C = W - if((access_captain in C.access) || (access_security in C.access) || (access_engine in C.access)) -======= if(istype(W, /obj/item/card/id)) var/obj/item/card/id/C = W if((access_captain in C.GetAccess()) || (access_security in C.GetAccess()) || (access_engine in C.GetAccess())) ->>>>>>> master src.locked = !src.locked to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]") updateDialog() diff --git a/code/modules/shieldgen/shield_gen.dm b/code/modules/shieldgen/shield_gen.dm index 05c2513026..e3a4392a00 100644 --- a/code/modules/shieldgen/shield_gen.dm +++ b/code/modules/shieldgen/shield_gen.dm @@ -58,15 +58,9 @@ s.start() /obj/machinery/shield_gen/attackby(obj/item/W, mob/user) -<<<<<<< HEAD - if(istype(W, /obj/item/card/id)) - var/obj/item/card/id/C = W - if((access_captain in C.access) || (access_security in C.access) || (access_engine in C.access)) -======= if(istype(W, /obj/item/card/id)) var/obj/item/card/id/C = W if((access_captain in C.GetAccess()) || (access_security in C.GetAccess()) || (access_engine in C.GetAccess())) ->>>>>>> master src.locked = !src.locked to_chat(user, "Controls are now [src.locked ? "locked." : "unlocked."]") updateDialog() diff --git a/code/modules/shuttles/shuttle_specops.dm b/code/modules/shuttles/shuttle_specops.dm index 8085837f5e..45129080ff 100644 --- a/code/modules/shuttles/shuttle_specops.dm +++ b/code/modules/shuttles/shuttle_specops.dm @@ -20,13 +20,8 @@ /datum/shuttle/autodock/ferry/specops/New() ..() -<<<<<<< HEAD - announcer = new /obj/item/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. - announcer.config(list("Response Team" = 0)) -======= announcer = new /obj/item/radio/intercom(null)//We need a fake AI to announce some stuff below. Otherwise it will be wonky. announcer.config(list(CHANNEL_RESPONSE_TEAM = 0)) ->>>>>>> master /datum/shuttle/autodock/ferry/specops/proc/radio_announce(var/message) if(announcer)