diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm index bc4e66b90b3..68fa5ccb0e5 100644 --- a/code/game/objects/items/weapons/cards_ids.dm +++ b/code/game/objects/items/weapons/cards_ids.dm @@ -880,11 +880,11 @@ registered_name = "HoP" icon_state = "HoP" access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, - ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, - ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, - ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, - ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, - ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) + ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, + ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, + ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, + ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, + ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) /obj/item/card/id/hos name = "Head of Security ID" @@ -926,33 +926,33 @@ registered_name = "NTRep" icon_state = "ntrep" access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, - ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, - ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, - ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, - ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, - ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_NTREP) + ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, + ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, + ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, + ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, + ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_NTREP) /obj/item/card/id/blueshield name = "Blueshield ID" registered_name = "Blueshield" icon_state = "blueshield" access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, - ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, - ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, - ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, - ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, - ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_BLUESHIELD) + ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, + ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, + ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, + ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, + ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_BLUESHIELD) /obj/item/card/id/magistrate name = "Magistrate ID" registered_name = "Magistrate" icon_state = "magistrate" access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, - ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, - ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, - ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, - ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, - ACCESS_CLOWN, ACCESS_MIME, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAGISTRATE) + ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, + ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, + ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, + ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, + ACCESS_CLOWN, ACCESS_MIME, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAGISTRATE) /obj/item/card/id/assistant name = "Assistant ID" diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index f5b68ca0f55..ecae702cf17 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -283,10 +283,10 @@ return ..() /obj/structure/alien/weeds/process() - check_counter++ - if(check_counter >= 5) - spread() - check_counter = 0 + check_counter++ + if(check_counter >= 5) + spread() + check_counter = 0 /obj/structure/alien/weeds/proc/clear_wall_weed() if(wall_weed && !QDELETED(wall_weed)) diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index 7d37cb7c8b1..c38d2c2e25c 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -3,8 +3,8 @@ endWhen = 900 var/list/spawned_mobs = list( - /mob/living/simple_animal/hostile/carp = 95, - /mob/living/simple_animal/hostile/carp/megacarp = 5) + /mob/living/simple_animal/hostile/carp = 95, + /mob/living/simple_animal/hostile/carp/megacarp = 5) /datum/event/carp_migration/setup() announceWhen = rand(40, 60) diff --git a/code/modules/martial_arts/cqc.dm b/code/modules/martial_arts/cqc.dm index 3e130860e92..44a3f1434f9 100644 --- a/code/modules/martial_arts/cqc.dm +++ b/code/modules/martial_arts/cqc.dm @@ -65,7 +65,7 @@ else playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 10, 1, -1) D.visible_message("[A] [picked_hit_type] [D]!", \ - "[A] [picked_hit_type] you!") + "[A] [picked_hit_type] you!") add_attack_logs(A, D, "Melee attacked with martial-art [src] : [picked_hit_type]", ATKLOG_ALL) if(IS_HORIZONTAL(A) && !IS_HORIZONTAL(D)) D.visible_message("[A] leg sweeps [D]!", \ diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index 9b3f6ce5817..915d9ecfe96 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -434,13 +434,13 @@ qdel(slot) /mob/living/carbon/human/proc/quick_equip_item(slot_item) // puts things in belt or bag - var/obj/item/thing = get_active_hand() - var/obj/item/storage/equipped_item = get_item_by_slot(slot_item) - if(ismecha(loc) || HAS_TRAIT(src, TRAIT_HANDS_BLOCKED)) - return - if(!istype(equipped_item)) // We also let you equip things like this - equip_to_slot_if_possible(thing, slot_item) - return - if(thing && equipped_item.can_be_inserted(thing)) // put thing in belt or bag - equipped_item.handle_item_insertion(thing) - playsound(loc, "rustle", 50, 1, -5) + var/obj/item/thing = get_active_hand() + var/obj/item/storage/equipped_item = get_item_by_slot(slot_item) + if(ismecha(loc) || HAS_TRAIT(src, TRAIT_HANDS_BLOCKED)) + return + if(!istype(equipped_item)) // We also let you equip things like this + equip_to_slot_if_possible(thing, slot_item) + return + if(thing && equipped_item.can_be_inserted(thing)) // put thing in belt or bag + equipped_item.handle_item_insertion(thing) + playsound(loc, "rustle", 50, 1, -5) diff --git a/code/modules/reagents/chemistry/reagents/misc.dm b/code/modules/reagents/chemistry/reagents/misc.dm index e112fce4017..2edebe6450a 100644 --- a/code/modules/reagents/chemistry/reagents/misc.dm +++ b/code/modules/reagents/chemistry/reagents/misc.dm @@ -333,9 +333,9 @@ return ..() /datum/reagent/colorful_reagent/reaction_mob(mob/living/simple_animal/M, method=REAGENT_TOUCH, volume) - if(isanimal(M)) - M.color = pick(GLOB.random_color_list) - ..() + if(isanimal(M)) + M.color = pick(GLOB.random_color_list) + ..() /datum/reagent/colorful_reagent/reaction_obj(obj/O, volume) O.color = pick(GLOB.random_color_list) diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index 2ca06bde494..81c63791db4 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -312,11 +312,11 @@ resistance_flags = FLAMMABLE /obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot) - ..() - if(slot == slot_head && reagents.total_volume) - to_chat(user, "[src]'s contents spill all over you!") - reagents.reaction(user, REAGENT_TOUCH) - reagents.clear_reagents() + ..() + if(slot == slot_head && reagents.total_volume) + to_chat(user, "[src]'s contents spill all over you!") + reagents.reaction(user, REAGENT_TOUCH) + reagents.clear_reagents() /obj/item/reagent_containers/glass/bucket/attackby(obj/D, mob/user, params) if(istype(D, /obj/item/mop)) diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm index 5f5369eb20c..c8f55f6647c 100644 --- a/code/modules/shuttle/on_move.dm +++ b/code/modules/shuttle/on_move.dm @@ -11,12 +11,12 @@ return 1 /obj/effect/landmark/shuttle_import/onShuttleMove() - // Used for marking where to preview/load shuttles - return 0 + // Used for marking where to preview/load shuttles + return 0 /obj/docking_port/onShuttleMove() - // Stationary ports shouldn't move, mobile ones move themselves - return 0 + // Stationary ports shouldn't move, mobile ones move themselves + return 0 /obj/machinery/door/airlock/onShuttleMove() . = ..() @@ -33,20 +33,20 @@ INVOKE_ASYNC(src, PROC_REF(lock)) /mob/onShuttleMove(turf/oldT, turf/T1, rotation) - if(!move_on_shuttle) - return 0 - . = ..() - if(!.) - return - if(!client) - return + if(!move_on_shuttle) + return 0 + . = ..() + if(!.) + return + if(!client) + return - if(buckled) - shake_camera(src, 2, 1) // turn it down a bit come on - else - shake_camera(src, 7, 1) + if(buckled) + shake_camera(src, 2, 1) // turn it down a bit come on + else + shake_camera(src, 7, 1) - update_parallax_contents() + update_parallax_contents() /mob/living/carbon/onShuttleMove() . = ..() diff --git a/code/modules/space_management/level_check.dm b/code/modules/space_management/level_check.dm index c49843cd7ea..acc2d5c504a 100644 --- a/code/modules/space_management/level_check.dm +++ b/code/modules/space_management/level_check.dm @@ -1,7 +1,7 @@ /proc/is_on_level_name(atom/A,name) - var/datum/space_level/S = GLOB.space_manager.get_zlev_by_name(name) - return A.z == S.zpos + var/datum/space_level/S = GLOB.space_manager.get_zlev_by_name(name) + return A.z == S.zpos // For expansion later /proc/atoms_share_level(atom/A, atom/B) - return A && B && A.z == B.z + return A && B && A.z == B.z diff --git a/code/modules/supply/supply_packs/pack_medical.dm b/code/modules/supply/supply_packs/pack_medical.dm index 3ecea66f6d7..a9c216bcb34 100644 --- a/code/modules/supply/supply_packs/pack_medical.dm +++ b/code/modules/supply/supply_packs/pack_medical.dm @@ -22,9 +22,9 @@ /obj/item/reagent_containers/iv_bag/salglu, /obj/item/storage/box/beakers, /obj/item/storage/box/syringes, - /obj/item/storage/box/bodybags, - /obj/item/storage/box/iv_bags, - /obj/item/vending_refill/medical) + /obj/item/storage/box/bodybags, + /obj/item/storage/box/iv_bags, + /obj/item/vending_refill/medical) cost = 400 containertype = /obj/structure/closet/crate/medical containername = "medical supplies crate" diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 6fa711e6180..b572bb0e762 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -87,7 +87,7 @@ receive_damage(7, 1) /obj/item/organ/internal/replaced(mob/living/carbon/human/target) - insert(target) + insert(target) /obj/item/organ/internal/item_action_slot_check(slot, mob/user) return diff --git a/code/modules/unit_tests/spawn_humans.dm b/code/modules/unit_tests/spawn_humans.dm index ae1f4961b02..dd6dac92840 100644 --- a/code/modules/unit_tests/spawn_humans.dm +++ b/code/modules/unit_tests/spawn_humans.dm @@ -1,8 +1,8 @@ /datum/unit_test/spawn_humans/Run() - var/locs = block(run_loc_bottom_left, run_loc_top_right) + var/locs = block(run_loc_bottom_left, run_loc_top_right) - for(var/I in 1 to 5) - new /mob/living/carbon/human(pick(locs)) + for(var/I in 1 to 5) + new /mob/living/carbon/human(pick(locs)) // There is a 5 second delay here so that all the items on the humans have time to initialize and spawn - sleep(50) + sleep(50) diff --git a/code/modules/vehicle/ambulance.dm b/code/modules/vehicle/ambulance.dm index e5d089c7fe9..3d30f9c4907 100644 --- a/code/modules/vehicle/ambulance.dm +++ b/code/modules/vehicle/ambulance.dm @@ -49,18 +49,18 @@ /datum/looping_sound/ambulance_alarm - start_length = 0 - mid_sounds = list('sound/items/weeoo1.ogg' = 1) - mid_length = 14 - volume = 100 + start_length = 0 + mid_sounds = list('sound/items/weeoo1.ogg' = 1) + mid_length = 14 + volume = 100 /obj/vehicle/ambulance/post_buckle_mob(mob/living/M) - . = ..() - if(has_buckled_mobs()) - AA.Grant(M) - else - AA.Remove(M) + . = ..() + if(has_buckled_mobs()) + AA.Grant(M) + else + AA.Remove(M) /obj/vehicle/ambulance/post_unbuckle_mob(mob/living/M) AA.Remove(M)