diff --git a/code/game/gamemodes/antagspawner.dm b/code/game/gamemodes/antagspawner.dm index d27e32c6492..384234d9ad8 100644 --- a/code/game/gamemodes/antagspawner.dm +++ b/code/game/gamemodes/antagspawner.dm @@ -63,7 +63,6 @@ obj/item/weapon/antag_spawner/borg_tele/spawn_antag(client/C, turf/T) S.set_up(4, 1, src) S.start() var/mob/living/silicon/robot/H = new /mob/living/silicon/robot/syndicate(T) - C.prefs.copy_to(H) H.key = C.key var/newname = sanitizeSafe(input(H,"Enter a name, or leave blank for the default name.", "Name change","") as text, MAX_NAME_LEN) if (newname != "") diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 18d91394c33..d3a53bd4202 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -186,7 +186,7 @@ item_state = "usiki_cane" contained_sprite = 1 -/obj/item/weapon/cane/fluff/uski_cane/attack_self(mob/user as mob) +/obj/item/weapon/cane/fluff/usiki_cane/attack_self(mob/user as mob) if(user.get_species() == "Unathi") user << "This cane has the words 'A new and better life' carved into one side in basic, and on the other side in Sinta'Unathi." else diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm index 90e679c63b6..85f4a4a4501 100644 --- a/code/modules/projectiles/guns/projectile/revolver.dm +++ b/code/modules/projectiles/guns/projectile/revolver.dm @@ -16,8 +16,7 @@ set category = "Object" chamber_offset = 0 - usr.visible_message("\The [usr] spins the cylinder of \the [src]!", \ - "You hear something metallic spin and click.") + usr.visible_message("\The [usr] spins the cylinder of \the [src]!", "You spin the cylinder of \the [src]!", "You hear something metallic spin and click.") playsound(src.loc, 'sound/weapons/revolver_spin.ogg', 100, 1) loaded = shuffle(loaded) if(rand(1,max_shells) > loaded.len) diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 67f65c59a32..a442296cda5 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/maps/exodus-1.dmm b/maps/exodus-1.dmm index dd978ab2172..3304e797186 100644 --- a/maps/exodus-1.dmm +++ b/maps/exodus-1.dmm @@ -142,8 +142,8 @@ "acL" = (/obj/structure/table/standard,/obj/item/bodybag/cryobag{pixel_x = 6},/obj/item/weapon/storage/firstaid/regular{pixel_x = 5; pixel_y = 5},/turf/simulated/floor{dir = 5; icon_state = "blue"},/area/security/main) "acM" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/syringe/inaprovaline,/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_x = -2; pixel_y = 5},/obj/item/weapon/reagent_containers/syringe/inaprovaline{pixel_y = 10},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/turf/simulated/floor{dir = 1; icon_state = "blue"},/area/security/main) "acN" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 8},/obj/structure/cable/green{d2 = 2; icon_state = "0-2"},/obj/structure/cable/green,/turf/simulated/floor/plating,/area/security/main) -"acO" = (/obj/machinery/computer/secure_data,/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/security/main) -"acP" = (/obj/machinery/computer/security,/turf/simulated/floor{dir = 8; icon_state = "redcorner"},/area/security/main) +"acO" = (/obj/machinery/computer/secure_data,/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/security/main) +"acP" = (/obj/machinery/computer/security,/turf/simulated/floor{dir = 8; icon_state = "bluecorner"},/area/security/main) "acQ" = (/obj/machinery/newscaster{pixel_y = 32},/turf/simulated/floor,/area/security/main) "acR" = (/obj/machinery/computer/station_alert/security,/turf/simulated/floor,/area/security/main) "acS" = (/turf/simulated/floor,/area/security/main)